ubuntu-touch-coreapps-reviewers team mailing list archive

[Renato Araujo Oliveira Filho <renato.filho@xxxxxxxxxxxxx>]

Renato Araujo Oliveira Filho has proposed merging lp:~renatofilho/ubuntu-calendar-app/fix-event-creation into lp:ubuntu-calendar-app.

Commit message:
Fixed new event bottom edge page to allow choose repeater and reminders.

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)

For more details, see:
https://code.launchpad.net/~renatofilho/ubuntu-calendar-app/fix-event-creation/+merge/288326
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~renatofilho/ubuntu-calendar-app/fix-event-creation into lp:ubuntu-calendar-app.

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2016-01-29 14:47:31 +0000
+++ EventRepetition.qml	2016-03-07 17:59:02 +0000
@@ -207,7 +207,7 @@
                                 (checked) ? weekDays.push(index) : weekDays.splice(weekDays.indexOf(index),1);
                         }
                         checked:{
-                            (weekDays.length === 0 && index === eventRoot.date.getDay() && isEdit === false) ? true : false;
+                            (weekDays.length === 0 && eventRoot.date && (index === eventRoot.date.getDay()) && !isEdit) ? true : false;
                         }
 
                     }

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-03-03 21:42:08 +0000
+++ NewEvent.qml	2016-03-07 17:59:02 +0000
@@ -30,6 +30,9 @@
     id: root
     objectName: 'newEventPage'
 
+    // WORKAROUND: allow us to push pages over bottom edge element
+    property var bottomEdgePageStack: null
+
     property var date;
     property alias allDay: allDayEventCheckbox.checked
 
@@ -684,7 +687,13 @@
                 visible: (event != undefined) && (event.itemType === Type.Event)
                 text: i18n.tr("Repeats")
                 subText: (event != undefined) && (event.itemType === Type.Event) ? rule === null ? Defines.recurrenceLabel[0] : eventUtils.getRecurrenceString(rule) : ""
-                onClicked: pageStack.push(Qt.resolvedUrl("EventRepetition.qml"),{"eventRoot": root,"isEdit":isEdit});
+                onClicked: {
+                    var stack = pageStack
+                    if (!stack)
+                        stack = bottomEdgePageStack
+
+                    stack.push(Qt.resolvedUrl("EventRepetition.qml"),{"eventRoot": root,"isEdit":isEdit});
+                }
             }
 
             ListItems.ThinDivider {
@@ -717,11 +726,17 @@
 
                 }
 
-                onClicked: pageStack.push(Qt.resolvedUrl("EventReminder.qml"),
-                                          {"visualReminder": visualReminder,
-                                              "audibleReminder": audibleReminder,
-                                              "reminderModel": reminderModel,
-                                              "eventTitle": titleEdit.text})
+                onClicked:{
+                    var stack = pageStack
+                    if (!stack)
+                        stack = bottomEdgePageStack
+
+                    stack.push(Qt.resolvedUrl("EventReminder.qml"),
+                                              {"visualReminder": visualReminder,
+                                               "audibleReminder": audibleReminder,
+                                               "reminderModel": reminderModel,
+                                               "eventTitle": titleEdit.text})
+                }
             }
 
             ListItems.ThinDivider {}

=== modified file 'NewEventBottomEdge.qml'
--- NewEventBottomEdge.qml	2016-02-25 19:36:28 +0000
+++ NewEventBottomEdge.qml	2016-03-07 17:59:02 +0000
@@ -99,6 +99,7 @@
             active: bottomEdge.status === BottomEdge.Committed
             visible: (bottomEdge.status !== BottomEdge.Hidden)
             onCanceled: bottomEdge.collapse()
+            bottomEdgePageStack: bottomEdge.pageStack
             onEventAdded: {
                 bottomEdge.collapse()
                 bottomEdge.eventCreated(event)

=== modified file 'PageWithBottomEdge.qml'
--- PageWithBottomEdge.qml	2016-02-25 19:36:28 +0000
+++ PageWithBottomEdge.qml	2016-03-07 17:59:02 +0000
@@ -37,7 +37,7 @@
     NewEventBottomEdge {
         id: bottomEdge
 
-        pageStack: tabs
+        pageStack: root.pageStack
         onOpened: root.bottomEdgeCommitStarted()
         onEventCreated: root.eventCreated(event)
     }