Merge lp:~renatofilho/ubuntu-calendar-app/keep-event-size into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Make sure that event keep the same size when changing the start date.

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

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/keep-event-size]

783. By Renato Araujo Oliveira Filho on 2016-03-28

Trunk merged.

784. By Renato Araujo Oliveira Filho on 2016-03-28

Update NewEvent to handle null end time.

785. By Renato Araujo Oliveira Filho on 2016-03-28

created unit test for new event page.

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

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

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

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

in line comment

review: Needs Fixing

[lp:~renatofilho/ubuntu-calendar-app/keep-event-size]

786. By Renato Araujo Oliveira Filho on 2016-03-28

Typo fixed.

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

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/ubuntu-calendar-app/keep-event-size]

787. By Renato Araujo Oliveira Filho on 2016-03-28

Trunk merged.

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

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

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

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2016-03-23 18:53:48 +0000
+++ NewEvent.qml	2016-03-28 21:19:15 +0000
@@ -25,6 +25,7 @@
 import Ubuntu.Components.Pickers 1.0
 import QtOrganizer 5.0
 import "Defines.js" as Defines
+import "dateExt.js" as DateExt
 
 Page {
     id: root
@@ -35,18 +36,22 @@
 
     property var date;
     property alias allDay: allDayEventCheckbox.checked
+    property int eventSize: -1
 
     property var event:null;
     property var rule :null;
     property var model:null;
 
-    property var startDate;
-    property var endDate;
+    property alias startDate: startDateTimeInput.dateTime
+    property alias endDate: endDateTimeInput.dateTime
     property alias reminderValue: eventReminder.reminderValue
 
     property alias scrollY: flickable.contentY
     property bool isEdit: false
 
+    readonly property int millisecsInADay: 86400000
+    readonly property int millisecsInAnHour: 3600000
+
     signal eventAdded(var event);
     signal eventDeleted(var event);
     signal canceled()
@@ -78,8 +83,6 @@
     }
 
     function updateEventDate(date, allDay) {
-        root.startDate = undefined
-        root.endDate = undefined
         setDate(date)
         root.allDay = allDay
     }
@@ -94,18 +97,9 @@
             date.setHours(newDate.getHours(), newDate.getMinutes());
         }
 
-        // If startDate is setted by argument we have to not change it
-        //Set the nearest current time.
-        if (typeof(startDate) === 'undefined')
-            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(root.roundDate(date))
-            endDate.setMinutes(endDate.getMinutes() + 30)
-            endTimeInput.text = Qt.formatDateTime(endDate, Qt.locale().timeFormat(Locale.ShortFormat));
-        }
-
+        startDate = new Date(root.roundDate(date))
+        var enDateValue = new Date(root.roundDate(date))
+        endDate = enDateValue.addMinutes(60)
     }
 
     function selectCalendar(collectionId) {
@@ -140,9 +134,19 @@
             titleEdit.text = e.displayLabel;
         }
 
+        allDayEventCheckbox.checked = e.allDay;
+
+        var eventEndDate = e.endDateTime
+        if (!eventEndDate || isNaN(eventEndDate.getTime()))
+            eventEndDate = new Date(startDate)
+
         if (e.allDay) {
             allDayEventCheckbox.checked = true
-            endDate = new Date(e.endDateTime).addDays(-1);
+            endDate = new Date(eventEndDate).addDays(-1);
+            eventSize = DateExt.daysBetween(startDate, eventEndDate) * root.millisecsInADay
+        } else {
+            endDate = eventEndDate
+            eventSize = (eventEndDate.getTime() - startDate.getTime())
         }
 
         if(e.location) {
@@ -153,7 +157,6 @@
             messageEdit.text = e.description;
         }
 
-        allDayEventCheckbox.checked = e.allDay;
         var index = 0;
 
         if( e.itemType === Type.Event ) {
@@ -309,33 +312,6 @@
     }
 
     Keys.onEscapePressed: root.cancel()
-    onStartDateChanged: {
-        if (!startDate)
-            return
-
-        startDateTimeInput.dateTime = startDate;
-
-        // set time forward to one hour
-        var time_forward = 3600000;
-
-        if (isEdit && event !== null) {
-            time_forward = event.endDateTime - event.startDateTime;
-        }
-        adjustEndDateToStartDate(time_forward);
-    }
-
-    onEndDateChanged: {
-        if (!root.endDate || isNaN(root.endDate.getTime())) {
-            if (root.startDate) {
-                endDateTimeInput.dateTime = root.startDate;
-            }
-        } else {
-            if (root.endDate) {
-                endDateTimeInput.dateTime = root.endDate;
-            }
-        }
-    }
-
     header: PageHeader {
         id: pageHeader
 
@@ -442,6 +418,8 @@
 
             NewEventTimePicker{
                 id: startDateTimeInput
+                objectName: "startDateTimeInput"
+
                 header: i18n.tr("From")
                 showTimePicker: !allDayEventCheckbox.checked
                 anchors {
@@ -450,11 +428,14 @@
                 }
                 onDateTimeChanged: {
                     startDate = dateTime;
+                    endDateTimeInput.dateTime = new Date(startDate.getTime() + root.eventSize)
                 }
             }
 
             NewEventTimePicker{
                 id: endDateTimeInput
+                objectName: "endDateTimeInput"
+
                 header: i18n.tr("To")
                 showTimePicker: !allDayEventCheckbox.checked
                 anchors {
@@ -462,7 +443,17 @@
                     right: parent.right
                 }
                 onDateTimeChanged: {
+                    if (dateTime.getTime() < startDate.getTime()) {
+                        root.eventSize = root.allDay ? 0 : root.millisecsInAnHour
+                        dateTime = new Date(startDate.getTime() + root.eventSize)
+                        return
+                    }
+
                     endDate = dateTime;
+                    if (allDay)
+                        root.eventSize = endDate.midnight().getTime() - startDate.midnight().getTime()
+                    else
+                        root.eventSize = endDate.getTime() - startDate.getTime()
                 }
             }
 
@@ -479,6 +470,12 @@
                     objectName: "allDayEventCheckbox"
                     id: allDayEventCheckbox
                     checked: false
+                    onCheckedChanged: {
+                        if (checked)
+                            root.eventSize = Math.max(endDate.midnight().getTime() - startDate.midnight().getTime(), 0)
+                        else
+                            root.eventSize = Math.max(endDate.getTime() - startDate.getTime(), root.millisecsInAnHour)
+                    }
                 }
             }
 
@@ -570,7 +567,7 @@
                     }
 
                     containerHeight: itemHeight * 4
-                    model: root.model.getWritableAndSelectedCollections();
+                    model: root.model ? root.model.getWritableAndSelectedCollections() : []
 
                     delegate: OptionSelectorDelegate{
                         text: modelData.name

=== modified file 'dateExt.js'
--- dateExt.js	2016-03-02 19:55:52 +0000
+++ dateExt.js	2016-03-28 21:19:15 +0000
@@ -60,19 +60,19 @@
 }
 
 Date.prototype.addDays = function(days) {
+    var date = new Date(this)
     if (days === 0)
-        return this
+        return date
 
-    var date = new Date(this)
     date.setDate(date.getDate() + days);
     return date
 }
 
 Date.prototype.addMinutes = function(minutes) {
+    var date = new Date(this)
     if (minutes === 0)
-        return this
+        return date
 
-    var date = new Date(this)
     date.setMinutes(date.getMinutes() + minutes);
     return date
 }

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2014-01-28 16:51:15 +0000
+++ tests/unittests/CMakeLists.txt	2016-03-28 21:19:15 +0000
@@ -3,6 +3,6 @@
 file(GLOB TESTS tst_*.qml)
 foreach(TEST ${TESTS})
     get_filename_component(NAME ${TEST} NAME_WE)
-    add_test(${NAME} ${QMLTESTRUNNER} -input ${TEST})
+    add_test(${NAME} ${QMLTESTRUNNER} -import ${CMAKE_SOURCE_DIR} -input ${TEST})
     set_tests_properties(${NAME} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 endforeach(TEST)

=== added file 'tests/unittests/tst_new_event.qml'
--- tests/unittests/tst_new_event.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/tst_new_event.qml	2016-03-28 21:19:15 +0000
@@ -0,0 +1,169 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtOrganizer 5.0
+
+TestCase{
+    id: root
+    name: "New Event tests"
+
+    property var newEventPage: null
+
+    Component {
+        id: eventComp
+
+        Event {
+        }
+    }
+
+    function create_event_from_data(data)
+    {
+        return eventComp.createObject(root,
+                                      {'allDay': data.allDay,
+                                       'displayLabel': data.label,
+                                       'startDateTime': data.startDate,
+                                       'endDateTime': data.endDate})
+    }
+
+    function create_new_event_page(event)
+    {
+        var component = Qt.createComponent(Qt.resolvedUrl("../../NewEvent.qml"))
+        if (component.status === Component.Ready)
+            return component.createObject(root, {"event": event})
+
+        return null
+    }
+
+    function init()
+    {
+
+    }
+
+    function cleanup()
+    {
+        if (newEventPage) {
+            newEventPage.destroy()
+            newEventPage = null
+        }
+    }
+
+    function test_new_event_title()
+    {
+        newEventPage = create_new_event_page(null)
+        compare(newEventPage.header.title, "New Event")
+    }
+
+    function test_edit_event_details()
+    {
+        var startDate = new Date(2016, 3, 28, 14, 0,0 )
+        var endDate = new Date(2016, 3, 28, 15, 0,0 )
+        var eventData = {"label": 'test_event_details',
+                         "allDay": false,
+                         "startDate": startDate,
+                         "endDate": endDate }
+        var event = create_event_from_data(eventData)
+        newEventPage = create_new_event_page(event)
+
+        compare(newEventPage.header.title, "Edit Event")
+        compare(newEventPage.startDate, startDate)
+        compare(newEventPage.endDate, endDate)
+    }
+
+    function test_change_start_date()
+    {
+        var startDate = new Date(2016, 3, 28, 14, 0,0 )
+        var endDate = new Date(2016, 3, 28, 15, 0,0 )
+        var eventData = {"label": 'test_event_details',
+                         "allDay": false,
+                         "startDate": startDate,
+                         "endDate": endDate }
+        var event = create_event_from_data(eventData)
+        newEventPage = create_new_event_page(event)
+
+        compare(newEventPage.eventSize, 3600000) // 1h
+
+        //Move start date 1h foward
+        var startDatePicker = findChild(newEventPage, "startDateTimeInput")
+        startDatePicker.dateTime = new Date(2016, 3, 28, 15, 0,0 )
+        compare(newEventPage.eventSize, 3600000) // 1h
+        compare(newEventPage.endDate, new Date(2016, 3, 28, 16, 0,0 ))
+
+        //Move start date 3h backward
+        startDatePicker.dateTime = new Date(2016, 3, 28, 12, 0,0 )
+        compare(newEventPage.eventSize, 3600000) // 1h
+        compare(newEventPage.endDate, new Date(2016, 3, 28, 13, 0,0 ))
+    }
+
+    function test_change_end_date()
+    {
+        var startDate = new Date(2016, 3, 28, 14, 0,0 )
+        var endDate = new Date(2016, 3, 28, 15, 0,0 )
+        var eventData = {"label": 'test_event_details',
+                         "allDay": false,
+                         "startDate": startDate,
+                         "endDate": endDate }
+        var event = create_event_from_data(eventData)
+        newEventPage = create_new_event_page(event)
+
+        // Move end date 30 min backward
+        var endDatePicker = findChild(newEventPage, "endDateTimeInput")
+        endDatePicker.dateTime = new Date(2016, 3, 28, 14, 30,0 )
+        compare(newEventPage.eventSize, 1800000) // 30 min
+
+        // Move start date 1h foward
+        var startDatePicker = findChild(newEventPage, "startDateTimeInput")
+        startDatePicker.dateTime = new Date(2016, 3, 28, 15, 0,0 )
+        compare(newEventPage.eventSize, 1800000) // 30 min
+        compare(newEventPage.endDate, new Date(2016, 3, 28, 15, 30,0 ))
+    }
+
+    function test_change_start_date_for_all_day()
+    {
+        var startDate = new Date(2016, 3, 28, 0, 0,0 )
+        var endDate = new Date(2016, 3, 28, 0, 0,0 )
+        var eventData = {"label": 'test_event_details',
+                         "allDay": true,
+                         "startDate": startDate,
+                         "endDate": endDate }
+        var event = create_event_from_data(eventData)
+        newEventPage = create_new_event_page(event)
+
+        compare(newEventPage.eventSize, 0) // 1 day
+
+        // Move start date 1 day foward
+        var startDatePicker = findChild(newEventPage, "startDateTimeInput")
+        startDatePicker.dateTime = new Date(2016, 3, 29, 0, 0,0)
+
+        // end date should move 1 day
+        compare(newEventPage.endDate, new Date(2016, 3, 29, 0, 0,0 ))
+
+        // Move end date 1 day foward
+        var endDatePicker = findChild(newEventPage, "endDateTimeInput")
+        endDatePicker.dateTime = new Date(2016, 3, 30, 0, 0,0)
+
+        // start date should not change
+        compare(newEventPage.startDate, new Date(2016, 3, 29, 0, 0,0 ))
+        // event size should increase
+        compare(newEventPage.eventSize, 86400000) // 2 days
+
+        // Move start date 1 day foward
+        startDatePicker.dateTime = new Date(2016, 3, 30, 0, 0,0)
+
+        // end date should move 2 day
+        compare(newEventPage.endDate, new Date(2016, 3, 31, 0, 0,0 ))
+    }
+
+    function test_events_with_null_end_date()
+    {
+        var startDate = new Date(2016, 3, 28, 15, 0,0 )
+        var eventData = {"label": 'test_event_details',
+                         "allDay": false,
+                         "startDate": startDate,
+                         "endDate": null }
+        var event = create_event_from_data(eventData)
+        newEventPage = create_new_event_page(event)
+
+        compare(newEventPage.eventSize, 0)
+        compare(newEventPage.startDate, new Date(2016, 3, 28, 15, 0,0 ))
+        compare(newEventPage.endDate, new Date(2016, 3, 28, 15, 0,0 ))
+    }
+}