Merge lp:~twstd-dev/ubuntu-calendar-app/1359306 into lp:ubuntu-calendar-app

[twstd]

A fix for bug #1359306

Just a quick fix for a request #1359306

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

FAILED: Continuous integration, rev:423
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/724/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1770/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1770/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/282

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:423
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/734/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1838
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/292

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

review: Needs Fixing (continuous-integration)

[Mihir Soni (mihirsoni)]

Works great.

Thanks for the MR.

[Mihir Soni (mihirsoni)]

This branch needs merge from trunk.

review: Needs Fixing

[lp:~twstd-dev/ubuntu-calendar-app/1359306]

424. By twstd on 2014-09-06

Merge with the main branch

425. By twstd on 2014-09-06

Add empty line back

[twstd (twstd-dev)]

Updated

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

PASSED: Continuous integration, rev:425
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/776/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/231
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/334

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Thanks.

review: Approve

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-08-28 23:10:33 +0000
+++ NewEvent.qml	2014-09-06 16:27:49 +0000
@@ -45,6 +45,7 @@
     onStartDateChanged: {
         startDateInput.text = Qt.formatDateTime(startDate, "dd MMM yyyy");
         startTimeInput.text = Qt.formatDateTime(startDate, "hh:mm");
+        adjustEndDateToStartDate()
     }
 
     onEndDateChanged: {
@@ -325,7 +326,14 @@
         return tempDate.setHours(tempDate.getHours() + 1)
     }
 
+    function adjustEndDateToStartDate() {
+        // set time forward to one hour
+        var time_forward = 3600000;
+        endDate = new Date( startDate.getTime() + time_forward );
+    }
+
     ScrollAnimation{id:scrollAnimation}
+
     function scrollOnExpand(Self,Container,Target,Margin,Visible)
     {
         // Self is needed for "onXxxxxChange" triggers. OnExpansionCompleted however can just write "true".