Merge lp:~nik90/ubuntu-clock-app/3-fix-alarm-refresh-ui into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Refresh the alarm page ui whenever clock app gains focus to ensure that the alarm switch status is updated properly after the user dismisses an alarm notification.

Refresh the alarm page ui whenever clock app gains focus to ensure that the alarm switch status is updated properly after the user dismisses an alarm notification.

I also added 2 manual test cases to ensure this bug doesn't appear again in the future.

Regression Potential: Minimal since the code change affects only the alarm page UI code and would be visible immediately.

Unmerged revisions

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2014-11-19 14:56:42 +0000
+++ app/alarm/AlarmDelegate.qml	2015-01-21 02:37:04 +0000
@@ -94,6 +94,18 @@
             if (checked !== model.enabled) {
                 var alarmData = model
                 alarmData.enabled = checked
+
+                /*
+                 Calculate the new alarm time if it is a one-time alarm and has
+                 gone-off and the user is re-enabling the alarm. Repeating
+                 alarms do this automatically.
+                */
+                if(checked && type === Alarm.OneTime && alarmData.date < new Date()) {
+                    var tomorrow = new Date()
+                    tomorrow.setDate(tomorrow.getDate() + 1)
+                    alarmData.daysOfWeek = alarmUtils.get_alarm_day(tomorrow.getDay())
+                }
+
                 alarmData.save()
             }
         }

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-11-04 15:58:05 +0000
+++ app/clock/ClockPage.qml	2015-01-21 02:37:04 +0000
@@ -36,6 +36,9 @@
     // Property to keep track of the clock time
     property var clockTime: new Date()
 
+    // Property to keep track of app cold start status
+    property alias isColdStart: clock.isColdStart
+
     property var alarmModel
 
     flickable: null

=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml	2014-10-10 19:58:49 +0000
+++ app/clock/MainClock.qml	2015-01-21 02:37:04 +0000
@@ -23,6 +23,9 @@
 Clock {
     id: mainClock
 
+    // Property to keep track of the cold start status of the app
+    property bool isColdStart: true
+
     fontSize: units.dp(62)
     periodFontSize: units.dp(12)
     innerCircleWidth: units.gu(23)
@@ -98,6 +101,7 @@
         target: digitalModeLoader.item
         onAnimationComplete: {
             alarmModelLoader.source = Qt.resolvedUrl("../alarm/AlarmModelComponent.qml")
+            isColdStart = false
         }
     }
 
@@ -105,6 +109,7 @@
         target: analogModeLoader.item
         onAnimationComplete: {
             alarmModelLoader.source = Qt.resolvedUrl("../alarm/AlarmModelComponent.qml")
+            isColdStart = false
         }
     }
 }

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2014-10-28 10:54:45 +0000
+++ app/ubuntu-clock-app.qml	2015-01-21 02:37:04 +0000
@@ -86,6 +86,14 @@
 
     onApplicationStateChanged: {
         localTimeSource.update()
+        /*
+         Reload the alarm model when the clock app gains focus to refresh
+         the alarm page UI in the case of alarm notifications.
+        */
+        if(applicationState && !clockPage.isColdStart) {
+            alarmModelLoader.source = ""
+            alarmModelLoader.source = Qt.resolvedUrl("alarm/AlarmModelComponent.qml")
+        }
     }
 
     PageStack {

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-19 14:51:35 +0000
+++ debian/changelog	2015-01-21 02:37:04 +0000
@@ -29,6 +29,10 @@
   * Added manual test to check disabling of alarms.
   * Fixed alarm string not being translatable (LP: #1380248)
   * Fixed the incorrect overriding of alarm delegate model value.
+  * Fixed qml tests broken in vivid due to listitem behaviour change.
+  * Fixed one-time alarms not being able to be re-enabled using the alarm switch
+    after they have gone off once (LP: #1413027)
+  * OneTime alarms are not automatically dismissed after they are triggered (LP: #1362341)
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second

=== modified file 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu'
--- tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu	2014-10-25 13:31:26 +0000
+++ tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu	2015-01-21 02:37:04 +0000
@@ -156,3 +156,51 @@
         The alarm switch should be colorless to indicate it is disabled.
     5. Wait for the time to pass the alarm time.
         The alarm should not ring since it was disabled.
+
+id: alarm/refresh-one-alarm
+plugin: manual
+depends: alarm/trigger-alarm
+estimated_duration: 120
+_summary: Test the alarm page refresh issue
+_description:
+    This test checks if the alarm listview refreshes appropriately when clock app gains focus.
+    1. Launch the clock app.
+        Clock app opens showing the current local time.
+    2. Swipe the bottom edge to open the alarms page.
+        Alarms page should appear showing a list of alarm. If empty then you should see a
+        message being displayed that "No saved alarms".
+    3. Press the plus icon to create a new one-time alarm. Change the alarm time to ring in the next
+       minute. Do not change any other options. Save Alarm.
+        The saved alarm should be displayed in the alarms page.
+    4. Wait for the time to pass the alarm time.
+        The alarm should ring at the time set in the previous step.
+    5. Press "Ok" to dismiss the alarm
+        The alarm should be dismissed.
+    6. Check the status of the one-time alarm you just dismissed.
+        The one-time alarm must be disabled since it was triggered and dismissed by the user.
+
+id: alarm/refresh-recurring-alarm
+plugin: manual
+depends: alarm/trigger-alarm
+estimated_duration: 120
+_summary: Test the alarm switch disable issue
+_description:
+    This test checks if the recurring alarm switches stays enabled after dismissing the alarm.
+    1. Launch the clock app.
+        Clock app opens showing the current local time.
+    2. Swipe the bottom edge to open the alarms page.
+        Alarms page should appear showing a list of alarm. If empty then you should see a
+        message being displayed that "No saved alarms".
+    3. Press the plus icon to create a new recurring alarm. Change the alarm time to ring in the next
+       minute and set it to repeat on 2-3 days (including today). Save Alarm.
+        The saved alarm should be displayed in the alarms page.
+    4. Wait for the time to pass the alarm time.
+        The alarm should ring at the time set in the previous step.
+    5. Press "Ok" to dismiss the alarm
+        The alarm should be dismissed.
+    6. Check the status of the recurring alarm you just dismissed.
+        The recurring alarm must not be disabled after it was triggered and dismissed by the user since
+        it is a recurring alarm.
+    7. Check the recurring alarm in the datetime indicator.
+        Indicator datetime should update and show the next occurance day of the recurring alarm you dismissed.
+

=== modified file 'tests/unit/tst_alarmRepeat.qml'
--- tests/unit/tst_alarmRepeat.qml	2014-10-05 21:23:09 +0000
+++ tests/unit/tst_alarmRepeat.qml	2015-01-21 02:37:04 +0000
@@ -112,12 +112,12 @@
 
             tryCompare(_alarm, "type", Alarm.OneTime, 3000, "Alarm type is not OneTime by default")
 
-            var dayListItem = findChild(alarmRepeatPageLoader.item, "alarmDay"+3)
+            var randomDaySwitch = findChild(alarmRepeatPageLoader.item, "daySwitch"+3)
 
-            mouseClick(dayListItem, centerOf(dayListItem).x, centerOf(dayListItem).y)
+            mouseClick(randomDaySwitch, centerOf(randomDaySwitch).x, centerOf(randomDaySwitch).y)
             tryCompare(_alarm, "type", Alarm.Repeating, 3000, "Alarm type did not change to Repeating despite enabling a switch")
 
-            mouseClick(dayListItem, centerOf(dayListItem).x, centerOf(dayListItem).y)
+            mouseClick(randomDaySwitch, centerOf(randomDaySwitch).x, centerOf(randomDaySwitch).y)
             tryCompare(_alarm, "type", Alarm.OneTime, 3000, "Alarm type is not OneTime despite all switches disabled")
         }
 
@@ -129,11 +129,10 @@
             waitForRendering(alarmRepeatPageLoader.item);
 
             for(var i=0; i<repeater.count; i++) {
-                var dayListItem = findChild(alarmRepeatPageLoader.item, "alarmDayHolder"+i)
                 var currentDaySwitch = findChild(alarmRepeatPageLoader.item, "daySwitch"+i)
 
                 if(!currentDaySwitch.checked) {
-                    mouseClick(dayListItem, centerOf(dayListItem).x, centerOf(dayListItem).y)
+                    mouseClick(currentDaySwitch, centerOf(currentDaySwitch).x, centerOf(currentDaySwitch).y)
                 }
             }