ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-order-fix into lp:ubuntu-clock-app with lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-australia-display-fix as a prerequisite.

Commit message:
Order alarm list according the time of occurrence and do not enable alarms
which was passed (LP: #1505522)

Requested reviews:
  Victor Thompson (vthompson)
  Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot): continuous-integration
Related bugs:
  Bug #1505522 in Ubuntu Clock App: "It is not possible to disable alarm which was passed"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1505522

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-order-fix/+merge/274269

Order alarm list according the time of occurrence and do not enable alarms
which was passed (LP: #1505522)
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2015-08-17 18:28:28 +0000
+++ app/alarm/AlarmDelegate.qml	2015-10-13 15:06:27 +0000
@@ -137,11 +137,11 @@
                 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.
+                 Calculate the alarm time if it is a one-time alarm.
+                 It is important to keep the alarm list in order of occurence (also for disabled alarms).
+                 Repeating alarms do this automatically.
                 */
-                if(checked && type === Alarm.OneTime) {
+                if(type === Alarm.OneTime) {
                     alarmData.daysOfWeek = Alarm.AutoDetect
                     var now = new Date()
                     if (alarmData.date.getHours()*60+alarmData.date.getMinutes() <= now.getHours()*60+now.getMinutes()) {

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-13 15:06:26 +0000
+++ debian/changelog	2015-10-13 15:06:27 +0000
@@ -17,6 +17,8 @@
   * Fix Daylight Saving Time issues (LP: #1437805)
   * Fix time for second location wrong after daylight saving started (LP: #1457523)
   * Fix digital time display for English Australia locale (LP: #1384739)
+  * Order alarm list according the time of occurrence and do not enable alarms 
+    which was passed (LP: #1505522)
 
  -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>  Wed, 02 Sep 2015 15:16:29 +0200