ubuntu-touch-coreapps-reviewers team mailing list archive

[Nekhelesh Ramananthan <krnekhelesh@xxxxxxxxx>]

Nekhelesh Ramananthan has proposed merging lp:~ubuntu-clock-dev/ubuntu-clock-app/fix-clock-bug-1551307 into lp:ubuntu-clock-app.

Commit message:
Fixed alarm passed label being shown in the alarm description of one-time alarms

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
  Bug #1551307 in Ubuntu Clock App: "One-time alarms which rang show "Alarm Passed" in the description"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1551307

For more details, see:
https://code.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/fix-clock-bug-1551307/+merge/287493

Fixed bug 1551307
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~ubuntu-clock-dev/ubuntu-clock-app/fix-clock-bug-1551307 into lp:ubuntu-clock-app.

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2016-02-25 22:16:54 +0000
+++ app/alarm/AlarmDelegate.qml	2016-02-29 16:23:18 +0000
@@ -25,7 +25,8 @@
     property var localTime
     property bool showAlarmFrequency
     property string alarmOccurrence: type === Alarm.Repeating ? alarmUtils.format_day_string(daysOfWeek, type)
-                                                              : alarmUtils.get_time_to_alarm(model.date, localTime)
+                                                              : model.enabled ? alarmUtils.get_time_to_alarm(model.date, localTime)
+                                                                              : ""
 
     onShowAlarmFrequencyChanged: {
         if (type === Alarm.Repeating && model.enabled) {

=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml	2016-02-25 22:16:54 +0000
+++ app/alarm/AlarmUtils.qml	2016-02-29 16:23:18 +0000
@@ -66,8 +66,9 @@
         // even with different timezones (eg. during daylight saving change)
         var totalTime = get_utc_time(alarmDate) - get_utc_time(currentDateTime);
 
+        // Alarm has passed
         if(totalTime < 0) {
-            return i18n.tr("Alarm Passed")
+            return ""
         }
 
         var timeObject = _split_time(totalTime);

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-29 12:09:02 +0000
+++ debian/changelog	2016-02-29 16:23:18 +0000
@@ -27,6 +27,7 @@
   * Migrated all page head to the new PageHeader (LP: #1550991)
   * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
   * Fixed colors being broken with OTA-10 SDK (LP: #1550716)
+  * Fixed alarm passed label being shown in the alarm description (LP: #1551307)
 
  -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>  Wed, 30 Dec 2015 01:43:24 +0100