Merge lp:~nik90/ubuntu-clock-app/2-fix-one-time-alarm into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Automatically calculate the new alarm time of a one-time alarm that has gone off and is re-enabled by the user. Fixes lp 1413027

Now when the user re-enables a one-time alarm that has gone off, clock app automatically calculates the correct alarm time and changes it correctly for the user instead of just saying that the alarm time has passed.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:189
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/601/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/767
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/767/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/601/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good! Thanks!

review: Approve

[lp:~nik90/ubuntu-clock-app/2-fix-one-time-alarm]

190. By Nekhelesh Ramananthan on 2015-01-21

Updated if logic to take into account another use case. Thnx riccardo!

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:190
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/603/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/779
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/779/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/603/rebuild

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/2-fix-one-time-alarm]

191. By Nekhelesh Ramananthan on 2015-01-21

Tried a different logic using getTime()

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:191
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/604/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/781
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/781/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/604/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Lgtm, thanks for this fix, I love it :D

review: Approve

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2014-11-19 14:56:42 +0000
+++ app/alarm/AlarmDelegate.qml	2015-01-21 18:43:53 +0000
@@ -94,6 +94,25 @@
             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 currentTime = new Date()
+
+                    var twentyfourHours = 86400000 // 1000 * 60 * 60 * 24
+                    var tomorrow = currentTime
+                    tomorrow.setDate(tomorrow.getDate() + 1)
+                    alarmData.daysOfWeek = alarmUtils.get_alarm_day(tomorrow.getDay())
+
+                    if (alarmData.date.getTime() - currentTime.getTime() > twentyfourHours) {
+                        alarmData.daysOfWeek = alarmUtils.get_alarm_day(currentTime.getDay())
+                    }
+                }
+
                 alarmData.save()
             }
         }

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-21 00:17:46 +0000
+++ debian/changelog	2015-01-21 18:43:53 +0000
@@ -30,6 +30,8 @@
   * 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)
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second