Merge lp:~renatofilho/ubuntu-calendar-app/fix-1439049 into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Accept 'calendar://*' url as argument on app startup.

This is necessary because url-dispatcher calls the app with uri as an argument if the app is not opened yet.

you need silo 049 to test this:

https://requests.ci-train.ubuntu.com/#/ticket/1123

[lp:~renatofilho/ubuntu-calendar-app/fix-1439049]

783. By Renato Araujo Oliveira Filho on 2016-03-17

Trunk merged.

784. By Renato Araujo Oliveira Filho on 2016-03-18

Accept 'startdate' in the uri handler.

785. By Renato Araujo Oliveira Filho on 2016-03-18

Trunk merged.

786. By Renato Araujo Oliveira Filho on 2016-03-21

Handle 'startTime' arg on uri.

Make sure that the app opens on day view with the 'startTime' visible when app is called from uri handler.

[Nekhelesh Ramananthan (nik90)]

On testing on the device, I found that clicking the event in the indicator opens the calendar app in the Day View (nice!) rather than the month/year/week view. It also nicely positions the hours close to the event. However it does not show the event details page which is critical to fixing this bug.

review: Needs Fixing

[Arthur Mello (artmello)]

Added some diff comments

review: Needs Fixing

[lp:~renatofilho/ubuntu-calendar-app/fix-1439049]

787. By Renato Araujo Oliveira Filho on 2016-03-22

Removed debug message.
Fixed function name typo.

[Renato Araujo Oliveira Filho (renatofilho)]

> On testing on the device, I found that clicking the event in the indicator
> opens the calendar app in the Day View (nice!) rather than the month/year/week
> view. It also nicely positions the hours close to the event. However it does
> not show the event details page which is critical to fixing this bug.

yes we know that, unfortunately we do not have a API necessary to do this right now. (There is no way to fetch for a specific recurrence). As short term solution we will open the day view page in the event time.

[Renato Araujo Oliveira Filho (renatofilho)]

> Added some diff comments
fixed.

[Nekhelesh Ramananthan (nik90)]

> > On testing on the device, I found that clicking the event in the indicator
> > opens the calendar app in the Day View (nice!) rather than the
> month/year/week
> > view. It also nicely positions the hours close to the event. However it does
> > not show the event details page which is critical to fixing this bug.
>
> yes we know that, unfortunately we do not have a API necessary to do this
> right now. (There is no way to fetch for a specific recurrence). As short term
> solution we will open the day view page in the event time.

Based on that reasoning, the MP lgtm.

[Nekhelesh Ramananthan (nik90)]

> > On testing on the device, I found that clicking the event in the indicator
> > opens the calendar app in the Day View (nice!) rather than the
> month/year/week
> > view. It also nicely positions the hours close to the event. However it does
> > not show the event details page which is critical to fixing this bug.
>
> yes we know that, unfortunately we do not have a API necessary to do this
> right now. (There is no way to fetch for a specific recurrence). As short term
> solution we will open the day view page in the event time.

Based on that reasoning, the MP lgtm.

[Nekhelesh Ramananthan (nik90)]

review: Approve

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'calendar.qml'
--- calendar.qml	2016-03-17 17:45:21 +0000
+++ calendar.qml	2016-03-22 19:00:24 +0000
@@ -31,6 +31,29 @@
     property int reminderDefaultValue: 900;
     readonly property bool syncInProgress: commonHeaderActions.syncInProgress
 
+    function handleUri(uri)
+    {
+        if(uri !== undefined && uri !== "") {
+            var commands = uri.split("://")[1].split("=");
+            if(commands[0].toLowerCase() === "eventid") {
+                // calendar://eventid=??
+                if( eventModel ) {
+                    // qtorganizer:eds::<event-id>
+                    var eventId = commands[1];
+                    var prefix = "qtorganizer:eds::";
+                    if (eventId.indexOf(prefix) < 0)
+                        eventId  = prefix + eventId;
+
+                    eventModel.showEventFromId(eventId);
+                }
+            } else if (commands[0].toLowerCase() === "startdate") {
+                var date = new Date(commands[1])
+                // this will be handled by Tabs.component.completed
+                tabs.starttime = date.getTime()
+            }
+        }
+    }
+
     // Work-around until this branch lands:
     // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
     //property bool windowActive: typeof window != 'undefined'
@@ -100,21 +123,11 @@
     Connections {
         target: UriHandler
         onOpened: {
-            var uri = uris[0]
-            if(uri !== undefined && uri !== "") {
-                var commands = uri.split("://")[1].split("=");
-                if(commands[0].toLowerCase() === "eventid") {
-                    // calendar://eventid=??
-                    if( eventModel ) {
-                        // qtorganizer:eds::<event-id>
-                        var eventId = commands[1];
-                        var prefix = "qtorganizer:eds::";
-                        if (eventId.indexOf(prefix) < 0)
-                            eventId  = prefix + eventId;
-
-                        eventModel.showEventFromId(eventId);
-                    }
-                }
+            handleUri(uris[0])
+            if (tabs.starttime !== -1) {
+                tabs.currentDay = new Date(tabs.starttime);
+                tabs.selectedTabIndex = dayTab.index
+                tabs.starttime = -1
             }
         }
     }
@@ -240,11 +253,16 @@
                 var requestId = "";
                 var callbackFunc = function(id,fetchedItems) {
                     if( requestId === id && fetchedItems.length > 0 ) {
-                        pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":fetchedItems[0],"model": eventModel});
+                        var event = fetchedItems[0]
+                        var currentPage = tabs.selectedTab.page.item
+                        if (currentPage.showDate) {
+                            currentPage.showDate(event.startDateTime)
+                        }
+
+                        pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event,"model": eventModel});
                     }
                     eventModel.onItemsFetched.disconnect( callbackFunc );
                 }
-
                 eventModel.onItemsFetched.connect( callbackFunc );
                 requestId = eventModel.fetchItems(eventId);
             }
@@ -282,8 +300,8 @@
 
             // Arguments on startup
             property bool newevent: false;
-            property int starttime: -1;
-            property int endtime: -1;
+            property real starttime: -1;
+            property real endtime: -1;
             property string eventId;
 
             //WORKAROUND: The new header api does not work with tabs check bug: #1539759
@@ -380,14 +398,20 @@
                 var starttimepattern = new RegExp ("starttime=\\d+");
                 var endtimepattern = new RegExp ("endtime=\\d+");
                 var eventIdpattern = new RegExp ("eventId=.*")
+                var urlpattern = new RegExp("calendar://.*")
+
+                if (urlpattern.test(url)) {
+                    handleUri(url)
+                    return
+                }
 
                 newevent = newevenpattern.test(url);
 
                 if (starttimepattern.test(url))
-                    starttime = url.match(/starttime=(\d+)/)[1];
+                    starttime = parseInt(url.match(/starttime=(\d+)/)[1]);
 
                 if (endtimepattern.test(url))
-                    endtime = url.match(/endtime=(\d+)/)[1];
+                    endtime = parseInt(url.match(/endtime=(\d+)/)[1]);
 
                 if (eventIdpattern.test(url))
                     eventId = url.match(/eventId=(.*)/)[1];
@@ -396,20 +420,17 @@
             Component.onCompleted: {
                 // If an url has been set
                 if (args.defaultArgument.at(0)) {
+                    tabs.currentDay = new Date()
                     parseArguments(args.defaultArgument.at(0))
-                    tabs.currentDay = new Date()
                     // If newevent has been called on startup
                     if (newevent) {
                         timer.running = true;
                     }
                     else if (starttime !== -1) { // If no newevent has been setted, but starttime
-                        var startTime = parseInt(starttime);
-                        tabs.currentDay = new Date(startTime);
-
+                        tabs.currentDay = new Date(tabs.starttime);
                         // If also endtime has been settend
                         if (endtime !== -1) {
-                            var endTime = parseInt(endtime);
-                            tabs.selectedTabIndex = calculateDifferenceStarttimeEndtime(startTime, endTime);
+                            tabs.selectedTabIndex = calculateDifferenceStarttimeEndtime(tabs.startTime, tabs.endTime);
                         }
                         else {
                             // If no endtime has been setted, open the starttime date in day view
@@ -432,6 +453,9 @@
                 else {
                     tabs.selectedTabIndex = settings.defaultViewIndex;
                 }
+                tabs.starttime = -1
+                tabs.endtime = -1
+                tabs.eventId = ""
                 tabs.isReady = true
                 // WORKAROUND: Due the missing feature on SDK, they can not detect if
                 // there is a mouse attached to device or not. And this will cause the
@@ -575,6 +599,11 @@
         YearView {
             readonly property bool tabSelected: tabs.selectedTabIndex === yearTab.index
 
+            function showDate(date)
+            {
+                refreshCurrentYear(date.getFullYear())
+            }
+
             reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabSelected
@@ -597,7 +626,7 @@
 
             onTabSelectedChanged: {
                 if (tabSelected) {
-                    refreshCurrentYear(tabs.currentDay.getFullYear())
+                    showDate(tabs.currentDay)
                 }
             }
         }
@@ -609,6 +638,14 @@
         MonthView {
             readonly property bool tabSelected: tabs.selectedTabIndex === monthTab.index
 
+            function showDate(date)
+            {
+                anchorDate = new Date(date.getFullYear(),
+                                      date.getMonth(),
+                                      1,
+                                      0, 0, 0)
+            }
+
             reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabSelected
@@ -632,10 +669,7 @@
 
             onTabSelectedChanged: {
                     if (tabSelected) {
-                        anchorDate = new Date(tabs.currentDay.getFullYear(),
-                                              tabs.currentDay.getMonth(),
-                                              1,
-                                              0, 0, 0)
+                        showDate(tabs.currentDay)
                     }
             }
         }
@@ -647,6 +681,18 @@
         WeekView {
             readonly property bool tabSelected: tabs.selectedTab === weekTab
 
+            function showDate(date)
+            {
+                var dateGoTo = new Date(date)
+                if (!anchorDate ||
+                    (dateGoTo.getFullYear() != anchorDate.getFullYear()) ||
+                    (dateGoTo.getMonth() != anchorDate.getMonth()) ||
+                    (dateGoTo.getDate() != anchorDate.getDate())) {
+                    anchorDate = new Date(dateGoTo)
+                }
+                delayScrollToDate(dateGoTo)
+            }
+
             reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabSelected
@@ -674,16 +720,7 @@
 
             onTabSelectedChanged: {
                 if (tabSelected) {
-                    // 'tabs.currntDay' can change after set 'anchorDate' to avoid that
-                    // create a copy of the current value
-                    var tabDate = new Date(tabs.currentDay)
-                    if (!anchorDate ||
-                        (tabs.currentDay.getFullYear() != anchorDate.getFullYear()) ||
-                        (tabs.currentDay.getMonth() != anchorDate.getMonth()) ||
-                        (tabs.currentDay.getDate() != anchorDate.getDate())) {
-                        anchorDate = new Date(tabDate)
-                    }
-                    delayScrollToDate(tabDate)
+                    showDate(tabs.currentDay)
                 }
             }
         }
@@ -695,6 +732,18 @@
         DayView {
             readonly property bool tabSelected: tabs.selectedTabIndex === dayTab.index
 
+            function showDate(date)
+            {
+                var dateGoTo = new Date(date)
+                if (!anchorDate ||
+                    (dateGoTo.getFullYear() != anchorDate.getFullYear()) ||
+                    (dateGoTo.getMonth() != anchorDate.getMonth()) ||
+                    (dateGoTo.getDate() != anchorDate.getDate())) {
+                    anchorDate = new Date(dateGoTo)
+                }
+                delayScrollToDate(dateGoTo)
+            }
+
             reminderValue: mainView.reminderDefaultValue
             model: eventModel.isReady ? eventModel : null
             bootomEdgeEnabled: tabSelected
@@ -714,16 +763,7 @@
 
             onTabSelectedChanged: {
                 if (tabSelected) {
-                    // 'tabs.currntDay' can change after set 'anchorDate' to avoid that
-                    // create a copy of the current value
-                    var tabDate = new Date(tabs.currentDay)
-                    if (!anchorDate ||
-                        (tabs.currentDay.getFullYear() != anchorDate.getFullYear()) ||
-                        (tabs.currentDay.getMonth() != anchorDate.getMonth()) ||
-                        (tabs.currentDay.getDate() != anchorDate.getDate())) {
-                        anchorDate = new Date(tabDate)
-                    }
-                    delayScrollToDate(tabDate)
+                    showDate(tabs.currentDay)
                 }
             }
         }