Merge lp:~vthompson/ubuntu-calendar-app/fix-1311159-1311133 into lp:ubuntu-calendar-app

[Victor Thompson]

* Use date rounded up to nearest half hour
* Set TimePicker to the value in the field

* Use date rounded up to nearest half hour
* Set TimePicker to the value in the field

[Victor Thompson (vthompson)]

Currently I'm unable to directly verify this fix because of lp:1312480. I can't get trunk to run on the desktop either, at the moment.

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

FAILED: Continuous integration, rev:253
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/406/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2203
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/406
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/406
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/240

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:254
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/407/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2204
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/407
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/407
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/241

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

review: Needs Fixing (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me , i have tested it on desktop.

review: Approve

[Victor Thompson (vthompson)]

Now that I can run on the device (adding the fix for lp:1312480), it seems it doesn't work on my Nexus 4. I'll investigate.

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

PASSED: Continuous integration, rev:256
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/416/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2241
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/416
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/416
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/250

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

review: Approve (continuous-integration)

[lp:~vthompson/ubuntu-calendar-app/fix-1311159-1311133]

257. By Victor Thompson on 2014-04-27

Merge trunk

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

PASSED: Continuous integration, rev:257
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/417/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2252
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/417
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/417
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/251

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

This should be working now on both the desktop and the device.

[Mihir Soni (mihirsoni)]

Looks good to me Thanks.

review: Approve

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-04-25 00:17:55 +0000
+++ NewEvent.qml	2014-04-27 19:52:25 +0000
@@ -10,7 +10,7 @@
 
 Page {
     id: root
-    property var date: new Date();
+    property var date;
 
     property var event:null;
     property var model;
@@ -24,16 +24,17 @@
 
     Component.onCompleted: {
 
+        date = new Date()
         pageStack.header.visible = true;
 
         // If startDate is setted by argument we have to not change it
         if (typeof(startDate) === 'undefined')
-            startDate = new Date(date)
+            startDate = new Date(root.roundDate(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() + 30)
+            endDate = new Date(root.roundDate(date))
+            endDate.setMinutes(endDate.getMinutes() + 30)
         }
 
         if(event === null){
@@ -49,9 +50,6 @@
     //Data for Add events
     function addEvent() {
         event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
-        startDate = new Date(date)
-        endDate = new Date(date)
-        endDate.setMinutes( endDate.getMinutes() + 30)
 
         startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
         endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");
@@ -158,18 +156,13 @@
         }
     }
 
-    // Calucate default hour for start and end time on event
-    function hourForPickerFromDate(date) {
-        if(date.getMinutes() < 30)
-            return date.getHours()
-        return date.getHours() + 1
-    }
-
-    // Calucate default minute for start and end time on event
-    function minuteForPickerFromDate(date) {
-        if(date.getMinutes() < 30)
-            return 30
-        return 0
+    // Calucate default hour and minute for start and end time on event
+    function roundDate(date) {
+        var tempDate = new Date(date)
+        if(tempDate.getMinutes() < 30)
+            return tempDate.setMinutes(30)
+        tempDate.setMinutes(0)
+        return tempDate.setHours(tempDate.getHours() + 1)
     }
 
     width: parent.width
@@ -286,7 +279,7 @@
                             anchors.fill: parent
                             onClicked: {
                                 internal.clearFocus()
-                                var popupObj = PopupUtils.open(timePicker,root,{"hour": root.hourForPickerFromDate(startDate),"minute":root.minuteForPickerFromDate(startDate)});
+                                var popupObj = PopupUtils.open(timePicker,root,{"hour": startDate.getHours(),"minute":startDate.getMinutes()});
                                 popupObj.accepted.connect(function(startHour, startMinute) {
                                     var newDate = startDate;
                                     newDate.setHours(startHour, startMinute);
@@ -311,7 +304,7 @@
                             anchors.fill: parent
                             onClicked: {
                                 internal.clearFocus()
-                                var popupObj = PopupUtils.open(timePicker,root,{"hour": root.hourForPickerFromDate(endDate),"minute":root.minuteForPickerFromDate(endDate)});
+                                var popupObj = PopupUtils.open(timePicker,root,{"hour": endDate.getHours(),"minute":endDate.getMinutes()});
                                 popupObj.accepted.connect(function(startHour, startMinute) {
                                     var newDate = endDate;
                                     newDate.setHours(startHour, startMinute);