Merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

[Bartosz Kosiorek]

Fix race condition, which cause wrong alarm caption (LP: #1530000)

Fix race condition, which cause wrong alarm caption (LP: #1530000)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:429
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/27/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/282/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/27/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:430
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/28/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/283/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/28/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

* What is a "rat condition"? Could you clarify please and fix the applicable commit/change logs as applicable?
* Please remove the extra asterisk in the changelog.
* Could you add specific steps to reproduce to the bug report?

review: Needs Fixing

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:431
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/29/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/284/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/29/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:432
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/30/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/285/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/30/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

1. I added inline comments. Generally we shouldn't process alarm when (model.status !== Alarm.Ready)
In most cases changing model.status to Alarm.Ready is fast. But in rare cases, Alarm will be parsed faster when it is not ready. It is causing "Alarm disabled" issue.
2. Thanks done
3. I have added description to bug report

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:433
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/31/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/300/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/31/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:434
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/99/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/371/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/99/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:435
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/102/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/374/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/102/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:436
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/114/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/388/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/114/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/853/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1572/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/clock-app-autolanding/255/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1575/console

review: Needs Fixing (continuous-integration)

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix]

437. By Bartosz Kosiorek on 2016-02-02

Merge with trunk

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:437
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/991/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/538/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/991/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2015-12-11 02:13:16 +0000
+++ app/alarm/AlarmDelegate.qml	2016-02-02 23:46:24 +0000
@@ -56,7 +56,7 @@
 
             color: UbuntuColors.midAubergine
             fontSize: "x-large"
-            text: Qt.formatTime(date)
+            text: Qt.formatTime(model.date)
         }
 
         RowLayout {
@@ -85,11 +85,10 @@
 
                 fontSize: "small"
                 Layout.fillWidth: true
-                visible: !(type === Alarm.OneTime && !model.enabled)
+                visible: ((type === Alarm.Repeating) || model.enabled) && (model.status === Alarm.Ready)
                 elide: Text.ElideRight
-                text: type === Alarm.Repeating ? alarmUtils.format_day_string(daysOfWeek, type)
-                                               : model.enabled ? alarmUtils.get_time_to_alarm(model.date, localTime)
-                                                               : "Alarm Disabled"
+                text: type === Alarm.Repeating ? alarmUtils.format_day_string(daysOfWeek, type) :
+                                                 alarmUtils.get_time_to_alarm(model.date, localTime)
 
                 function animateTextChange() {
                     textChangeAnimation.start()
@@ -124,6 +123,7 @@
     Switch {
         id: alarmStatus
         objectName: "listAlarmStatus" + index
+        checked: model.enabled && (model.status === Alarm.Ready)
 
         anchors {
             right: parent.right
@@ -133,48 +133,26 @@
 
         onCheckedChanged: {
             if (checked !== model.enabled) {
-                var alarmData = model
-                alarmData.enabled = checked
-
                 /*
                  Calculate the alarm time if it is a one-time alarm.
                  Repeating alarms do this automatically.
                 */
                 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()) {
-                        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)
-                    }
-                }
-
-                alarmData.save()
-            }
-        }
-
-        Connections {
-            target: model
-            onStatusChanged: {
-                /*
-                 Update switch value only when the alarm save() operation
-                 is complete to avoid switching it back.
-                */
-                if (model.status === Alarm.Ready) {
-                    alarmStatus.checked = model.enabled;
-
-                    if (!alarmStatus.checked && type === Alarm.Repeating) {
-                        alarmSubtitle.text = alarmUtils.format_day_string(daysOfWeek, type)
-                    }
-                }
-            }
-        }
-
-        /*
-         Assign switch value only once at startup. After this, the switch will
-         be updated after the alarm save() operations only.
-        */
-        Component.onCompleted: alarmStatus.checked = model.enabled
+                    var date = new Date()
+                    date.setHours(model.date.getHours(), model.date.getMinutes(), 0)
+
+                    model.daysOfWeek = Alarm.AutoDetect
+                    if (date < new Date()) {
+                        var tomorrow = new Date()
+                        tomorrow.setDate(tomorrow.getDate() + 1)
+                        model.daysOfWeek = alarmUtils.get_alarm_day(tomorrow.getDay())
+                    }
+                    model.date = date
+
+                }
+                model.enabled = checked
+                model.save()
+            }
+        }
     }
 }

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-19 01:29:52 +0000
+++ debian/changelog	2016-02-02 23:46:24 +0000
@@ -3,12 +3,13 @@
   [ Bartosz Kosiorek ]
   * Fix alarm difference time description, during DST change (LP: #1510694)
   * Move to use the new SDK components v1.3 (LP: #1508363)
-  * Fix continously move the alarm volume slider to the desired value (LP: #1492584)  
+  * Fix continously move the alarm volume slider to the desired value (LP: #1492584)
+  * Fix wrong alarm caption which appears during high load (LP: #1530000)
 
   [ Andrew Hayzen ]
   * Fixes for various autopilot issues (LP: #1535488)
 
- -- Bartosz Kosiorek <[e-mail]>  Wed, 16 Dec 2015 22:44:49 +0100
+ -- Bartosz Kosiorek <[e-mail]>  Wed, 30 Dec 2015 01:43:24 +0100
 
 ubuntu-clock-app (3.6)  vivid; urgency=medium