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

[Riccardo Padovani]

Fixed #1231136, add support for Arguments

Added support for three arguments:
--newevent, to open new event popup

If --newevent is set:
 --starttime, to set start time of new event
 --endtime, to set end time of new event. It has to be > of start time. If start time is not set, it's ignored

If --newevent is not set:
 --starttime, to open calendar in a precise day
 --endtime, to choose the view

If endtime - starttime > month, year view is open
If entdime - starttime > week, month view is open
If endtime - starttime > day, week view is open

--endtime and --starttime accept integer value of the number of seconds since UNIX epoch in the UTC timezone.

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

PASSED: Continuous integration, rev:123
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/87/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/507
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/87

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

Hello Riccardo,

Thanks for working on this! The big issue I see is that the calendar app itself needs to be the one to parse the URL, we don't do that externally. So the exec line needs to look something like:

Exec=qmlscene /usr/share/calendar-app/calendar.qml %u

So then the URL will get passed onto the application. The QUrl() branch provides some functions for dealing with URLs that should make this a bit easier.

Ted

review: Needs Fixing

[David Planella (dpm)]

Ted, could you point us to the QUrl() branch? Where does that live?

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

PASSED: Continuous integration, rev:124
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/96/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/568
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/96
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/96
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/96
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/96

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:125
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/97/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/570
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/97

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/98/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/571/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/98/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/98/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/98/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/98/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:127
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/103/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/589
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/103
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/103

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

Here are the docs on QUrl:

http://qt-project.org/doc/qt-5.0/qtcore/qurl.html

What you need your exec line to look like is something like this:

Exec=qmlscene /usr/share/calendar-app/calendar.qml %u

Then the actual call will be:

qmlscene /usr/share/calendar-app/calendar.qml calendar:///?starttime=20130913

So the only argument will be the URL itself, you can then use QUrl to help break that down into the values you need.

[Riccardo Padovani (rpadovani)]

I implemented it, but due to bug #1231558 we have to pass args before command:
qmlscene calendar:///?starttime=1234567889 /usr/share/calendar-app/calendar.qml

I implemented starttime and endtime with value as number of seconds since UNIX epoch in the UTC timezone.

https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1231558

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

FAILED: Continuous integration, rev:128
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/108/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/662
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/108
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/108
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/108
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/108

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:129
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/123/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/773
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/123

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:130
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/125/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/814
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/125

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

The desktop file and arguments comments look correct.

review: Approve

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

PASSED: Continuous integration, rev:134
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/138/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/884
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/138
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/138
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/138
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/138

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

I see that this MP is blocked awaiting my review.

The approach looks sane and the coding is fine; I'm happy enough to Approve on that level.

From an indicator-datetime perspective, I don't have much of substance to add to this review. The indicator doesn't know or care what the contents of the calendar:/// url are as long as it can be fetched from EDS and dispatched via url-dispatcher.

review: Approve

[Mihir Soni (mihirsoni)]

Riccardo , can you remove the changes in manifest.json , I don't know why everybody is facing this issue.

[Mihir Soni (mihirsoni)]

Thank you Riccardo ,

it looks fine to me

review: Approve

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

FAILED: Continuous integration, rev:135
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/154/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1109
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/154
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/154
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/154
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/154

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

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/53/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1112
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/53
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/53
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/53

review: Needs Fixing (continuous-integration)

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

136. By Riccardo Padovani on 2013-10-16

Fixed newEvent

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

PASSED: Continuous integration, rev:136
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/156/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1113
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/156
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/156
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/156
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/156

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

review: Approve (continuous-integration)

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2013-10-15 15:01:07 +0000
+++ NewEvent.qml	2013-10-16 14:15:26 +0000
@@ -10,17 +10,24 @@
     id: root
 
     property var date: new Date();
-    property var startDate: date
-    property var endDate: date
+    property var startDate;
+    property var endDate;
+
     property alias scrollY: flickable.contentY
 
     Component.onCompleted: {
+        // If startDate is setted by argument we have to not change it
+        if (typeof(startDate) === 'undefined')
+            startDate = new Date(date)
+
+        // If endDate is setted by argument we have to not change it
+        if (typeof(endDate) === 'undefined') {
+            endDate = new Date(date)
+            endDate.setMinutes( endDate.getMinutes() + 10)
+        }
+
         internal.eventModel = GlobalModel.gloablModel();
 
-        startDate = new Date(date)
-        endDate = new Date(date)
-        endDate.setMinutes( endDate.getMinutes() + 10)
-
         startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
         endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");
     }

=== modified file 'calendar-app.desktop'
--- calendar-app.desktop	2013-06-12 15:23:13 +0000
+++ calendar-app.desktop	2013-10-16 14:15:26 +0000
@@ -3,7 +3,7 @@
 Version=1.0
 Type=Application
 Terminal=false
-Exec=qmlscene /usr/share/calendar-app/calendar.qml
+Exec=qmlscene %u /usr/share/calendar-app/calendar.qml
 Icon=/usr/share/calendar-app/calendar64.png
 Name=Calendar
 X-Ubuntu-Touch=true

=== modified file 'calendar.qml'
--- calendar.qml	2013-10-15 15:01:07 +0000
+++ calendar.qml	2013-10-16 14:15:26 +0000
@@ -8,6 +8,46 @@
 MainView {
     id: mainView
 
+    // Argument during startup
+    Arguments {
+        id: args;
+
+        // Example of argument: calendar:///new-event
+
+        // IMPORTANT
+        // 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.required: false;
+        defaultArgument.valueNames: ["URL"]
+
+        /* ARGUMENTS on startup
+         * (no one is required)
+         *
+         * Create a new event
+         * Keyword: newevent
+         *
+         * Create a new event. If starttime or endtime are set they are used to set start and end time of the new event.
+         * It accepts no value.
+         *
+         *
+         * Choose the view
+         * Keyword: starttime
+         *
+         * If newevent has been called, starttime is the start time of event. Otherwise is the day on which app is focused on startup.
+         * It accepts an integer value of the number of seconds since UNIX epoch in the UTC timezone.
+         * 0 means today.
+         *
+         * Keyword: endtime
+         *
+         * If newevent is set it's the end time of the event, has to be > of starttime.
+         * 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.
+         */
+    }
+
     objectName: "calendar"
     applicationName: "com.ubuntu.calendar"
 
@@ -30,6 +70,11 @@
             property var currentDay: DateExt.today();
             property var globalModel;
 
+            // Arguments on startup
+            property bool newevent: false;
+            property int starttime: -1;
+            property int endtime: -1;
+
             onCurrentDayChanged: {
                 if( monthView.currentMonth !== undefined && !monthView.currentMonth.isSameDay(currentDay))
                     monthView.currentMonth = currentDay.midnight();
@@ -51,13 +96,111 @@
             }
 
             function newEvent() {
-                 PopupUtils.open(newEventComponent, tabPage, {"defaultDate": currentDay})
+                var startDate = new Date();
+                var endDate = new Date();
+                var startTime;
+                var endTime;
+
+                if (starttime === 0) { // startime 0 means now
+                    if (endtime !== -1) { // If also endtime has been invoked
+                        endTime = parseInt(endtime);
+                        if (endTime > startDate) // If endtime is after startime
+                            endDate = new Date(endTime);
+                    }
+                }
+                else if (starttime !== -1) { // If starttime has been invoked
+                    startTime = parseInt(starttime);
+                    startDate = new Date(startTime);
+                    if (endtime !== -1) { // If --endtime has been invoked
+                        endTime = parseInt(endtime);
+                        if (endTime > startDate)
+                            endDate = new Date(endTime);
+                    }
+                }
+                pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"startDate": startDate, "endDate": endDate});
+            }
+
+            // This function calculate the difference between --endtime and --starttime and choose the better view
+            function calculateDifferenceStarttimeEndtime(startTime, endTime) {
+                var minute = 60 * 1000;
+                var hour = 60 * minute;
+                var day = 24 * hour;
+                var month = 30 * day;
+
+                var difference = endTime - startTime;
+
+                if (difference > month)
+                    return 0;   // Year view
+                else if (difference > 7 * day)
+                    return 1;   // Month view}
+                else if (difference > day)
+                    return 2;   // Week view
+                else
+                    return 3;   // Day view
+            }
+
+            // This function parse the argument
+            function parseArguments(url) {
+                var newevenpattern= new RegExp ("newevent");
+                var starttimepattern = new RegExp ("starttime=\\d+");
+                var endtimepattern = new RegExp ("endtime=\\d+");
+
+                newevent = newevenpattern.test(url);
+
+                if (starttimepattern.test(url))
+                    starttime = url.match(/starttime=(\d+)/)[0].replace("starttime=", '');
+
+                if (endtimepattern.test(url))
+                    endtime = url.match(/endtime=(\d+)/)[0].replace("endtime=", '');
+
             }
 
             Component.onCompleted: {
+                // If an url has been set
+                if (args.defaultArgument.at(0)) {
+                    parseArguments(args.defaultArgument.at(0))
+                    tabPage.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);
+                        tabPage.currentDay = new Date(startTime);
+
+                        // If also endtime has been settend
+                        if (endtime !== -1) {
+                            var endTime = parseInt(endtime);
+                            tabs.selectedTabIndex = calculateDifferenceStarttimeEndtime(startTime, endTime);
+                        }
+                        else {
+                            // If no endtime has been setted, open the starttime date in day view
+                            tabs.selectedTabIndex = 3;
+                        }
+                    } // End of else if (starttime)
+                    else {
+                    	// Due to bug #1231558 {if (args.defaultArgument.at(0))} is always true
+                    	// After the fix we can delete this else
+                        tabs.selectedTabIndex= 1;
+                    }
+                } // End of if about args.values
+                else {
+                    tabs.selectedTabIndex= 1;
+                }
+
                 globalModel = GlobalModel.gloablModel();
                 setStartEndDateToModel();
-                tabs.selectedTabIndex = 1;
+            } // End of Component.onCompleted:
+
+            // This is for wait that the app is load when newEvent is invoked by argument
+            Timer {
+                id: timer
+                interval: 200;
+                running: false;
+                repeat: false
+                onTriggered: {
+                    tabPage.newEvent();
+                }
             }
 
             ToolbarItems {