Merge lp:~themeles/ubuntu-clock-app/bugfix-1442518 into lp:ubuntu-clock-app

[themeles]

Fixes alarms after midnight being incorrectly enabled for the next day.

This MP should fix alarms after midnight being incorrectly enabled for the next day. This fix was possible due to the help of nik90. Thnx!

Steps to test
1. Open clock app and create an alarm for 10:00 AM and disable it.
2. Close clock app
3. Set time manually to sometime after midnight like 01:10 AM using the system settings app and date to tomorrow or the date after.
4. Open clock app
5. Try enabling the alarms which were disabled in the first step.

The alarms should be schedule for that day 10:00 AM instead of the next day since it is past midnight.

[lp:~themeles/ubuntu-clock-app/bugfix-1442518]

278. By themeles on 2015-06-14

[themeles]
Fixes alarms after midnight being incorrectly enabled for the next day.

279. By themeles on 2015-06-14

Varaibles now and currentTime were the same. Just using now.

[Nekhelesh Ramananthan (nik90)]

Couple minor typos (I'm being nitpicky now)
- The debian changelog entry should include the bug number..so please append (LP: #1442518) to the end of that sentence.

- var now=new Date() should be var now = new Date() to maintain consistency

- Please leave gaps between the arguments in alarmData.date = new Date(now.getFullYear(),now.getMonth(),now.getDate()+1,alarmData.date.getHours(),alarmData.date.getMinutes(),0,0)

it should look like

alarmData.date = new Date(now.getFullYear(), now.getMonth(), now.getDate()+1, alarmData.date.getHours(), alarmData.date.getMinutes(), 0, 0)

This will improve clarity

review: Needs Fixing

[lp:~themeles/ubuntu-clock-app/bugfix-1442518]

280. By themeles on 2015-06-14

correcting minor typos
Fixes alarms after midnight being incorrectly enabled for the next day. (LP: #1442518)

[Nekhelesh Ramananthan (nik90)]

lgtm! Let's test this for a few days before top-approving and merging.

review: Approve

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

PASSED: Continuous integration, rev:276
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/665/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/11
        deb: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/11/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

After 2 days of testing, this patch works as expected. Top approving now.

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2015-01-22 00:11:57 +0000
+++ app/alarm/AlarmDelegate.qml	2015-06-14 17:16:36 +0000
@@ -100,14 +100,13 @@
                  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()
-                    alarmData.daysOfWeek = alarmUtils.get_alarm_day(currentTime.getDay())
-
-                    if (alarmData.date.getTime() <= currentTime.getTime()) {
-                        var tomorrow = currentTime
-                        tomorrow.setDate(tomorrow.getDate() + 1)
-                        alarmData.daysOfWeek = alarmUtils.get_alarm_day(tomorrow.getDay())
+                if(checked && type === Alarm.OneTime) {
+                    alarmData.daysOfWeek = Alarm.AutoDetect
+                    var now = new Date()
+                    if (alarmData.date.getHours()*60+alarmData.date.getMinutes() <= now.getHours()*60+now.getMinutes()) {
+                        alarmData.date = new Date(now.getFullYear(), now.getMonth(), now.getDate()+1, alarmData.date.getHours(), alarmData.date.getMinutes(), 0, 0)
+                    } else {
+                        alarmData.date = new Date(now.getFullYear(), now.getMonth(), now.getDate(), alarmData.date.getHours(), alarmData.date.getMinutes(), 0, 0)
                     }
                 }
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-26 14:40:39 +0000
+++ debian/changelog	2015-06-14 17:16:36 +0000
@@ -22,7 +22,10 @@
     location access (LP: #1393827)
   * Increased date font size (LP: #1432736)
   * Fixed empty state component width warnings
-  
+
+  [themeles]  
+  * Fixes alarms after midnight being incorrectly enabled for the next day. (LP: #1442518)
+
   [Penk Chen]
   * Fixed DigitalMode time being empty in chineese locale (LP: #1458808)
 

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-05-26 14:38:54 +0000
+++ po/com.ubuntu.clock.pot	2015-06-14 17:16:36 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-26 14:38+0000\n"
+"POT-Creation-Date: 2015-06-14 16:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"