Merge lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_default_reminder into lp:ubuntu-calendar-app

[Arthur Mello]

Fix default reminder displayed at new event view

Fix default reminder displayed at new event view

[Renato Araujo Oliveira Filho (renatofilho)]

It is failing to edit event with no reminder:

1 - Create a event with no-reminder
2 - Save event and go back to the view
3 - Open the same event (event details will show it as no-reminder)
4 - Edit it

Expected:
The Reminder combo shows "no reminder"

Current:
The Reminder compo shows "15 minutes"

review: Needs Fixing

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_default_reminder]

783. By Arthur Mello on 2016-03-17

Merge with trunk

784. By Arthur Mello on 2016-03-17

Fix reminder text whe editing an event

785. By Arthur Mello on 2016-03-17

Fix reminder value label after changing it at new event page

[Renato Araujo Oliveira Filho (renatofilho)]

looks good.

review: Approve

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-03-17 01:47:49 +0000
+++ NewEvent.qml	2016-03-17 21:05:47 +0000
@@ -73,6 +73,11 @@
         root.canceled()
     }
 
+    function updateEventInfo(date, allDay) {
+        updateEventDate(date, allDay)
+        eventReminder.reminderValue = root.reminderValue
+    }
+
     function updateEventDate(date, allDay) {
         root.startDate = undefined
         root.endDate = undefined
@@ -252,6 +257,8 @@
     VisualReminder{
         id: visualReminder
         secondsBeforeStart: root.reminderValue
+
+        onSecondsBeforeStartChanged: eventReminder.reminderValue = visualReminder.secondsBeforeStart
     }
     AudibleReminder{
         id: audibleReminder
@@ -708,26 +715,32 @@
                 id:eventReminder
                 objectName  : "eventReminder"
 
+                property int reminderValue: -1
+
+                onReminderValueChanged: updateReminderLabel()
+
                 anchors.left:parent.left
                 showDivider: false
                 progression: true
                 text: i18n.tr("Reminder")
 
+                function updateReminderLabel() {
+                    if (eventReminder.reminderValue !== -1) {
+                        for (var i=0; i<reminderModel.count; i++) {
+                            if (reminderModel.get(i).value === eventReminder.reminderValue) {
+                                eventReminder.subText = reminderModel.get(i).label
+                                return
+                            }
+                        }
+                    } else {
+                        eventReminder.subText = reminderModel.get(0).label
+                        return
+                    }
+                }
+
                 RemindersModel {
                     id: reminderModel
-                }
-
-                subText:{
-                    if(visualReminder.secondsBeforeStart !== -1) {
-                        for( var i=0; i<reminderModel.count; i++ ) {
-                            if(visualReminder.secondsBeforeStart === reminderModel.get(i).value) {
-                                return reminderModel.get(i).label
-                            }
-                        }
-                    } else {
-                        return reminderModel.get(0).label
-                    }
-
+                    onLoaded: eventReminder.updateReminderLabel()
                 }
 
                 onClicked:{

=== modified file 'NewEventBottomEdge.qml'
--- NewEventBottomEdge.qml	2016-03-14 14:30:16 +0000
+++ NewEventBottomEdge.qml	2016-03-17 21:05:47 +0000
@@ -39,7 +39,7 @@
 
     function updateNewEventDate(date, allDay)
     {
-        _realPage.updateEventDate(date, allDay)
+        _realPage.updateEventInfo(date, allDay)
     }
 
     hint {