Merge lp:~rpadovani/ubuntu-calendar-app/1321695 into lp:ubuntu-calendar-app

[Riccardo Padovani]

Added eventid property to app url

I added the eventid property to app url, so the app can be launched directly on the page of the event with id eventid.

As soon as indicators implement this, I'll update the MR to reflect the name of their property

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:278
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/473/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2749
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2749/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/286
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/307
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/31

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/473/rebuild

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

57 + pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":eventid,"model": eventModel});

EventDetails required Event and not Event Id, so we need to fetch event from event id, before we push EventDetails on stack.

You can use code like below,

            eventModel.onItemsFetched.connect( function(id,fetchedItems){
                if(requestId === id && fetchedItems.length > 0) {
                    var event = fetchedItems[0];
                    pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event,"model": eventModel});
                }
            });
            var requestId = eventModel.fetchItems([eventId]);

review: Needs Fixing

[lp:~rpadovani/ubuntu-calendar-app/1321695]

279. By Riccardo Padovani on 2014-05-22

Updated the function to open the event page

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:279
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/489/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2796
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2796/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/333
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/333/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/323
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/47

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/489/rebuild

review: Approve (continuous-integration)

[Michał Karnicki (karni)]

Is there anything blocking this MP? :)

[Kunal Parmar (pkunal-parmar)]

> Is there anything blocking this MP? :)

When last I tested, logic for fetching Item from itemid was not working. so event details page is not getting loaded with correct image.

So we still need to investigate it further. I will check issue further and update.

[Michał Karnicki (karni)]

Thank you, Kunal!

[Kunal Parmar (pkunal-parmar)]

17 + *
18 + *
19 + * Open an existing event
20 + * Keyword: eventid (provisional)
21 + *
22 + * It takes a id of an event and open that event on full page
23 */

We better use Argument element, it makes parsing so easier.

         Argument {
            name: "eventid"
            required: false
            valueNames: ["EVENT_ID"]
        }

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

46 +
47 + if (eventidpattern.test(url))
48 + eventid = url.match(/eventid=(\w+)/)[0].replace("eventid=", '');
49 }

once we use Argument, we will not need this code

[Kunal Parmar (pkunal-parmar)]

56 + else if (eventid) {
57 + eventModel.onItemsFetched.connect( function(id,fetchedItems){
58 + if(requestId === id && fetchedItems.length > 0) {
59 + var event = fetchedItems[0];
60 + pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event,"model": eventModel});
61 + }
62 + });
63 + var requestId = eventModel.fetchItems([eventId]);
64 + } // End of else if (eventid)

And this code, I think should be moved to initialization of model, as we are not sure if model is in working condition here.

        EventListModel{
            id: eventModel
            //This model is just for newevent
            //so we dont need any update
            autoUpdate: false

            Component.onCompleted: {
                if ( args.values.eventid ) {
                    var requestId = "";
                    eventModel.onItemsFetched.connect( function(id,fetchedItems) {
                        if( requestId === id && fetchedItems.length > 0 ) {
                            var event = fetchedItems[0];
                            pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event,"model": eventModel});
                        }
                    });
                    requestId = eventModel.fetchItems([args.values.eventid]);
                }
            }
        }

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

One note,
when I tested above code with non recurring event, it seems to work just fine.

But if we use recurrent event, then EDS is not able to fetch event.

[Kunal Parmar (pkunal-parmar)]

I pasted my code here.

http://pastebin.ubuntu.com/7605554/

let me know if you need further help

[lp:~rpadovani/ubuntu-calendar-app/1321695]

280. By Riccardo Padovani on 2014-06-07

Working implementation following Kunal guidelines

[Riccardo Padovani (rpadovani)]

Wow Kunal, thanks for your awesome work!
I updated the code, let me know if it's ok now :-)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:280
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/537/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/463
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/463/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/371
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/95

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/537/rebuild

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

it looks good now,

But it looks like we dont need following variable any more can you remove it

56 + property var eventid: null;

review: Needs Fixing

[lp:~rpadovani/ubuntu-calendar-app/1321695]

281. By Riccardo Padovani on 2014-06-09

Removed unused var

[Riccardo Padovani (rpadovani)]

Yap, thanks, sorry for the distraction!

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:281
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/538/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/466
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/466/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/372
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/96

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/538/rebuild

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Looks good now. Thanks.

review: Approve

=== modified file 'calendar.qml'
--- calendar.qml	2014-06-05 19:19:36 +0000
+++ calendar.qml	2014-06-09 10:49:02 +0000
@@ -18,7 +18,7 @@
         // Due to bug #1231558 you have to pass arguments BEFORE app:
         // qmlscene calendar:///new-event calendar.qml
 
-        defaultArgument.help: i18n.tr("Calendar app accept three arguments: --starttime, --endtime and --newevet. They will be managed by system. See the source for a full comment about them");
+        defaultArgument.help: i18n.tr("Calendar app accept four arguments: --starttime, --endtime, --newevent and --eventid. They will be managed by system. See the source for a full comment about them");
         //defaultArgument.required: false;
         defaultArgument.valueNames: ["URL"]
 
@@ -45,7 +45,18 @@
          * If newevent isn't set and startime is set, its value is used to choose the right view.
          * If neither of precendet flags are set, endtime is ignored.
          * It accepts an integer value of the number of seconds since UNIX epoch in the UTC timezone.
+         *
+         *
+         * Open an existing event
+         * Keyword: eventid (provisional)
+         *
+         * It takes a id of an event and open that event on full page
          */
+        Argument {
+            name: "eventid"
+            required: false
+            valueNames: ["EVENT_ID"]
+        }
     }
 
     objectName: "calendar"
@@ -84,6 +95,19 @@
             //This model is just for newevent
             //so we dont need any update
             autoUpdate: false
+
+            Component.onCompleted: {
+                if (args.values.eventid) {
+                    var requestId = "";
+                    eventModel.onItemsFetched.connect( function(id,fetchedItems) {
+                        if( requestId === id && fetchedItems.length > 0 ) {
+                            var event = fetchedItems[0];
+                            pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event,"model": eventModel});
+                        }
+                    });
+                    requestId = eventModel.fetchItems([args.values.eventid]);
+                }
+            }
         }
 
         Tabs{