Merge lp:~gary-wzl77/ubuntu-calendar-app/add_prefix into lp:ubuntu-calendar-app

[Gary.Wang]

Add prefix for event id parsing.

Add prefix for event id parsing.

For Bug #1474361,
Lost prefix for event id parsing results in calendar can't navigate to event details page.
If the dispatch url in event scope is "calendar:///qtorganizer:eds::system-calendar/eventId=%1", it's invalid.

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

PASSED: Continuous integration, rev:707
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1225/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/222

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

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:707
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/7/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/47/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:718
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/12/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/71/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/12/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:718
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1236/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/233

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

review: Approve (continuous-integration)

[Ethan Chang (ethan.chang)]

Test Result:
1. If Calendar app not opened
Tap Event and click open , it will open the calendar app but doesn't navigate to detail page

2. If Calendar app is opened
Tap Event and click open , it will navigate to detail page

[Alan Pope 🍺🐧🐱 🦄 (popey)]

@gary Is this still blocked on a fix in unity-scope_event?

[Gary.Wang (gary-wzl77)]

@Alan There is no need to make code change on unity-scope_event.
 I fix failed test case 2 that Ethan mentioned above in Revno: 719. Please review.
 Thanks.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:719
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/16/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/116/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/16/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:719
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1240/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/237/console

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

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:732
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/22/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/203/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/22/rebuild

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

looks fine to me

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/11/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1411/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:744
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/80/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/346/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/80/rebuild

review: Needs Fixing (continuous-integration)

[Gary.Wang (gary-wzl77)]

Looks like Jenkins issue:
DEBUG: jenkins job parameter [use_description_for_commit]: not found
....

[lp:~gary-wzl77/ubuntu-calendar-app/add_prefix]

744. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2016-01-18

Launchpad automatic translations update.

745. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2016-01-22

Launchpad automatic translations update.

746. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2016-01-27

Launchpad automatic translations update.

747. By Kunal Parmar on 2016-01-29

Build upon lp:~pkunal-parmar/ubuntu-calendar-app/Uitk1_3 by reducing the font size in headers.

Approved by Jenkins Bot, Dan Chapman .

748. By Evan McIntire on 2016-01-29

Fix a small typo in the readme (calendaar -> calendar).

Approved by Jenkins Bot, Niklas Wenzel, Alan Pope .

749. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2016-01-30

Launchpad automatic translations update.

750. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2016-02-01

Launchpad automatic translations update.

751. By Renato Araujo Oliveira Filho on 2016-02-02

Update to qtquick 2.4.

Approved by Jenkins Bot, Alan Pope .

752. By Renato Araujo Oliveira Filho on 2016-02-02

Simplify Tab loading, declaring individual components for each tab.
Make sure that year view is not loaded on app startup without request.

Approved by Jenkins Bot, Alan Pope .

753. By Kunal Parmar on 2016-02-02

resolves Bug #1476032. Fixes: https://bugs.launchpad.net/bugs/1369543, https://bugs.launchpad.net/bugs/1476032.

Approved by Jenkins Bot.

754. By Gary.Wang on 2016-02-03

Merge from trunk and optimized on argument query

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:754
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/995/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/542/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/995/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'calendar.qml'
--- calendar.qml	2016-02-02 01:55:55 +0000
+++ calendar.qml	2016-02-03 08:08:26 +0000
@@ -100,12 +100,17 @@
         target: UriHandler
         onOpened: {
             var uri = uris[0]
-            if(uri !== undefined && url != "") {
+            if(uri !== undefined && uri !== "") {
                 var commands = uri.split("://")[1].split("=");
                 if(commands[0].toLowerCase() === "eventid") {
                     // calendar://eventid=??
                     if( eventModel ) {
-                        eventModel.showEventFromId(commands[1]);
+                        var eventId = commands[1];
+                        var prefix = "qtorganizer:eds::system-calendar/";
+                        if (eventId.indexOf(prefix) < 0)
+                            eventId  = prefix + eventId;
+
+                        eventModel.showEventFromId(eventId);
                     }
                 }
             }
@@ -243,6 +248,7 @@
             property bool newevent: false;
             property int starttime: -1;
             property int endtime: -1;
+            property string eventId;
 
             //WORKAROUND: The new header api does not work with tabs check bug: #1539759
             property list<Action> tabsAction: [
@@ -337,14 +343,18 @@
                 var newevenpattern= new RegExp ("newevent");
                 var starttimepattern = new RegExp ("starttime=\\d+");
                 var endtimepattern = new RegExp ("endtime=\\d+");
+                var eventIdpattern = new RegExp ("eventId=.*")
 
                 newevent = newevenpattern.test(url);
 
                 if (starttimepattern.test(url))
-                    starttime = url.match(/starttime=(\d+)/)[0].replace("starttime=", '');
+                    starttime = url.match(/starttime=(\d+)/)[1];
 
                 if (endtimepattern.test(url))
-                    endtime = url.match(/endtime=(\d+)/)[0].replace("endtime=", '');
+                    endtime = url.match(/endtime=(\d+)/)[1];
+
+                if (eventIdpattern.test(url))
+                    eventId = url.match(/eventId=(.*)/)[1];
             }
 
             Component.onCompleted: {
@@ -370,6 +380,13 @@
                             tabs.selectedTabIndex = dayTab.index;
                         }
                     } // End of else if (starttime)
+                    else if (eventId !== "") {
+                        var prefix = "qtorganizer:eds::system-calendar/";
+                        if (eventId.indexOf(prefix) < 0)
+                            eventId  = prefix + eventId;
+
+                        eventModel.showEventFromId(eventId);
+                    }
                     else {
                         // Due to bug #1231558 {if (args.defaultArgument.at(0))} is always true
                         // After the fix we can delete this else