Merge lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1563316 into lp:ubuntu-calendar-app

[Arthur Mello]

Change Event Bubble style depending if user is attending the event following design spec

Change Event Bubble style depending if user is attending the event following design spec

Testing
=======
Import from google account events with different attendee status (Yes/Maybe/No) both for future and past end times. Make sure that the event bubble is updated as expected

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

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

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

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1563316]

810. By Arthur Mello on 2016-03-29

Fix when requesting owner status for local events

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

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

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

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1563316]

811. By Arthur Mello on 2016-03-30

Fix calendar canvas unittest

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

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

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

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1563316]

812. By Arthur Mello on 2016-03-30

Merge with trunk

813. By Arthur Mello on 2016-03-30

Add unit test

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

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

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

review: Approve (continuous-integration)

[lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-fix_1563316]

814. By Arthur Mello on 2016-03-31

Add border with same color as collection for unaswered events

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

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

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

great job.

review: Approve

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2016-03-28 18:14:09 +0000
+++ EventBubble.qml	2016-03-31 19:20:26 +0000
@@ -38,7 +38,14 @@
     property Flickable flickable;
     property bool isEventBubble: true
     property real minimumHeight: units.gu(4)
+
+    // Event bubble style
+    property alias titleText: eventTitle.text
+    property alias titleColor: eventTitle.color
     property alias strikeoutTitle: eventTitle.font.strikeout
+    property alias backgroundColor: bg.color
+    property alias backgroundOpacity: bg.opacity
+    property color borderColor: "white"
 
     readonly property bool isSingleLine: (infoBubble.height < (minimumHeight * 2))
     readonly property real startTimeInMinutes: event ? CanlendarCanvas.minutesSince(infoBubble.anchorDate, event.startDateTime) : 0.0
@@ -52,10 +59,10 @@
     Connections {
         target: model
         ignoreUnknownSignals: true
-        onCollectionsChanged: assignBgColor()
+        onCollectionsChanged: updateEventBubbleStyle()
     }
 
-    function assignBgColor() {
+    function updateEventBubbleStyle() {
         if (model && event ) {
             var collection = model.collection( event.collectionId );
             var now = new Date();
@@ -64,15 +71,35 @@
                 endDateTime = event.startDateTime;
             }
 
+            updateTitle()
+
+            //Accepted events: Solid collection color with white text.
+            infoBubble.backgroundColor = collection.color
+            infoBubble.backgroundOpacity = 1
+            infoBubble.titleColor = "white";
+            infoBubble.strikeoutTitle = false;
+            infoBubble.borderColor = "white";
+
             if( endDateTime >= now) {
-                bg.color = collection.color
-
-                if( getOwnersStatus(collection) === EventAttendee.StatusDeclined ) {
+                var ownersStatus = getOwnersStatus(collection);
+                if (ownersStatus === EventAttendee.StatusDeclined) {
+                    // Declined events: As per accepted events with strike-through text.
                     infoBubble.strikeoutTitle = true;
+
+                } else if (ownersStatus === EventAttendee.StatusTentative) {
+                    //Maybe events: As per accepted events with ‘(?)’ placed before Event Title.
+                    infoBubble.titleText = "(?) " + infoBubble.titleText
+
+                } else if (ownersStatus !== EventAttendee.StatusAccepted) {
+                    //Unresponded events: Accepted event colours inverted (i.e. collection color text/ outline on white background).
+                    infoBubble.backgroundColor = "white"
+                    infoBubble.titleColor = collection.color;
+                    infoBubble.borderColor = collection.color;
+
                 }
             } else {
-                //if event is on past then add some white color to original color
-                bg.color = Qt.tint( collection.color, "#aaffffff" );
+                // Past events: As per accepted events, but at 75% transparency.
+                infoBubble.backgroundOpacity = 0.25
             }
         }
     }
@@ -89,6 +116,8 @@
                 }
             }
         }
+
+        return EventAttendee.StatusAccepted;
     }
 
     function updateTitle() {
@@ -106,12 +135,12 @@
 
             //there is space for two lines
             if (infoBubble.isSingleLine) {
-                eventTitle.text =  ("%1 %2").arg(timeString).arg(event.displayLabel);
+                infoBubble.titleText =  ("%1 %2").arg(timeString).arg(event.displayLabel);
             } else {
-                eventTitle.text =  ("%1\n%2").arg(timeString).arg(event.displayLabel);
+                infoBubble.titleText =  ("%1\n%2").arg(timeString).arg(event.displayLabel);
             }
         } else {
-            eventTitle.text = event.displayLabel
+            infoBubble.titleText = event.displayLabel
         }
     }
 
@@ -124,10 +153,9 @@
         height = Math.max(minimumHeight, durationInMinutes * parent.minuteHeight)
     }
 
-    onIsSingleLineChanged: updateTitle()
+    onIsSingleLineChanged: updateEventBubbleStyle()
     onEventChanged: {
-        assignBgColor()
-        updateTitle()
+        updateEventBubbleStyle()
         resize()
     }
 
@@ -146,7 +174,7 @@
     Rectangle{
         id: bg
         anchors.fill: parent
-        border.color: isLiveEditing ? "red" : "white"
+        border.color: isLiveEditing ? "red" : infoBubble.borderColor
     }
 
     Label {
@@ -158,7 +186,6 @@
         }
         clip: true
         fontSize: "small"
-        color: "White"
         font.bold: true
     }
 

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2016-03-22 13:52:25 +0000
+++ TimeLineBaseComponent.qml	2016-03-31 19:20:26 +0000
@@ -347,7 +347,7 @@
                                 onPositionChanged: {
                                     dropArea.modifyEventForDrag(drag)
                                     var eventBubble = drag.source;
-                                    eventBubble.assignBgColor();
+                                    eventBubble.updateEventBubbleStyle();
 
                                     if( eventBubble.y + eventBubble.height + units.gu(8) > timeLineView.contentY + timeLineView.height ) {
                                         var diff = Math.abs((eventBubble.y + eventBubble.height + units.gu(8))  -

=== modified file 'tests/unittests/tst_calendar_canvas.qml'
--- tests/unittests/tst_calendar_canvas.qml	2016-03-02 00:24:42 +0000
+++ tests/unittests/tst_calendar_canvas.qml	2016-03-31 19:20:26 +0000
@@ -639,34 +639,34 @@
         compare(eventsA.event.displayLabel, "Event at 14:15 until 15:15")
         compare(eventsA.y, 0)
         compare(eventsA.intersectionCount, 5)
-        fuzzyCompare(eventsA.width, 0.2, 0.1)
+        fuzzyCompare(eventsA.width, 0.3, 0.1)
 
         //"Event at 14:30 until 15:00"
         var eventsB = eventMap[1]
         compare(eventsB.event.displayLabel, "Event at 14:30 until 15:00")
         compare(eventsB.y, 1)
         compare(eventsB.intersectionCount, 5)
-        fuzzyCompare(eventsB.width, 0.2, 0.1)
+        fuzzyCompare(eventsB.width, 0.3, 0.1)
 
         //"Event at 14:45 until 15:45"
         var eventsC = eventMap[2]
         compare(eventsC.event.displayLabel, "Event at 14:45 until 15:45")
         compare(eventsC.y, 2)
         compare(eventsC.intersectionCount, 5)
-        fuzzyCompare(eventsC.width, 0.2, 0.1)
+        fuzzyCompare(eventsC.width, 0.3, 0.1)
 
         //"Event at 15:30 until 16:30"
         var eventsD = eventMap[3]
         compare(eventsD.event.displayLabel, "Event at 15:30 until 16:30")
         compare(eventsD.y, 0)
         compare(eventsD.intersectionCount, 5)
-        fuzzyCompare(eventsD.width, 0.2, 0.1)
+        fuzzyCompare(eventsD.width, 0.3, 0.1)
 
         //"Event at 15:30 until 16:30 (1)"
         var eventsE = eventMap[4]
         compare(eventsE.event.displayLabel, "Event at 15:30 until 16:30 (1)")
         compare(eventsE.y, 1)
         compare(eventsE.intersectionCount, 5)
-        fuzzyCompare(eventsE.width, 0.2, 0.1)
+        fuzzyCompare(eventsE.width, 0.3, 0.1)
     }
 }

=== added file 'tests/unittests/tst_event_bubble.qml'
--- tests/unittests/tst_event_bubble.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/tst_event_bubble.qml	2016-03-31 19:20:26 +0000
@@ -0,0 +1,208 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtOrganizer 5.0
+
+TestCase{
+    id: root
+    name: "Event Bubble tests"
+
+    property OrganizerModel model: null
+    property Collection collection: null
+    property Event event: null
+    property var eventBubble: null
+
+    Component {
+        id: modelComp
+
+        OrganizerModel {}
+    }
+
+    Component {
+        id: collectionComp
+
+        Collection {}
+    }
+
+    Component {
+        id: eventAttendeeComp
+
+        EventAttendee {}
+    }
+
+    Component {
+        id: eventComp
+
+        Event {}
+    }
+
+    function create_model_from_data(data)
+    {
+        return modelComp.createObject(root,
+                                      {"manager": data.manager,
+                                       "startPeriod": data.startPeriod,
+                                       "endPeriod": data.endPeriod,
+                                       "autoUpdate": data.autoUpdate})
+    }
+
+    function create_collection_from_data(data)
+    {
+        return collectionComp.createObject(root,
+                                           {"name": data.name,
+                                            "color": data.color})
+    }
+
+    function create_event_attendee_from_data(data)
+    {
+        return eventAttendeeComp.createObject(root,
+                                              {"emailAddress": data.emailAddress,
+                                               "participationStatus": data.participationStatus})
+    }
+
+    function create_event_from_data(data)
+    {
+        return eventComp.createObject(root,
+                                      {"collectionId": data.collectionId,
+                                       "allDay": data.allDay,
+                                       "displayLabel": data.label,
+                                       "startDateTime": data.startDate,
+                                       "endDateTime": data.endDate,
+                                       "attendees": data.attendees})
+    }
+
+    function create_event_bubble(event)
+    {
+        var component = Qt.createComponent(Qt.resolvedUrl("../../EventBubble.qml"))
+        if (component.status === Component.Ready)
+            return component.createObject(root, {"model": root.model, "event": event})
+
+        return null
+    }
+
+    function get_collection_id_by_name(model, name)
+    {
+        for (var i = 0 ; i < model.collections.length ; ++i) {
+            if (model.collections[i].name === name ) {
+                return model.collections[i].collectionId
+            }
+        }
+        return ""
+    }
+
+    function initTestCase()
+    {
+        var startPeriod = new Date(2016, 1, 1, 0, 0, 0, 0)
+        var endPeriod = new Date(2017, 1, 1, 0, 0, 0, 0)
+        var modelData = {"manager": "memory",
+                         "startPeriod": startPeriod,
+                         "endPeriod": endPeriod,
+                         "autoUpdate": true}
+        root.model = create_model_from_data(modelData) 
+
+        var collectionData = {"name": "[e-mail]",
+                              "color": "black" }
+        root.collection = create_collection_from_data(collectionData)
+        root.model.saveCollection(root.collection)
+    }
+
+    function init()
+    {
+        var collectionId = get_collection_id_by_name(root.model, root.collection.name)
+        var startDate = new Date(2016, 3, 28, 14, 0,0 )
+        var endDate = new Date(2016, 3, 28, 15, 0,0 )
+        var eventData = {"collectionId": collectionId,
+                         "label": "Sample Test Event",
+                         "allDay": false,
+                         "startDate": startDate,
+                         "endDate": endDate}
+        root.event = create_event_from_data(eventData)
+    }
+
+    function cleanup()
+    {
+        if (root.event) {
+            root.event.destroy()
+            root.event = null
+        }
+ 
+        if (root.eventBubble) {
+            root.eventBubble.destroy()
+            root.eventBubble = null
+        }
+    }
+
+    function test_visual_style_future_accepted_event()
+    {
+        var eventAttendeeData = {"emailAddress": root.collection.name,
+                                 "participationStatus": EventAttendee.StatusAccepted}
+ 
+        var eventAttendee = create_event_attendee_from_data(eventAttendeeData)
+        root.event.setDetail(eventAttendee)
+
+        eventBubble = create_event_bubble(root.event)
+        eventBubble.updateEventBubbleStyle()
+
+        compare(eventBubble.backgroundColor, root.collection.color)
+        compare(eventBubble.borderColor, "#ffffff")
+        compare(eventBubble.backgroundOpacity, 1.0)
+        compare(eventBubble.titleText, "Sample Test Event")
+        compare(eventBubble.titleColor, "#ffffff")
+        verify(!eventBubble.strikeoutTitle)
+    }
+
+    function test_visual_style_future_declined_event()
+    {
+        var eventAttendeeData = {"emailAddress": root.collection.name,
+                                 "participationStatus": EventAttendee.StatusDeclined}
+ 
+        var eventAttendee = create_event_attendee_from_data(eventAttendeeData)
+        root.event.setDetail(eventAttendee)
+
+        eventBubble = create_event_bubble(root.event)
+        eventBubble.updateEventBubbleStyle()
+
+        compare(eventBubble.backgroundColor, root.collection.color)
+        compare(eventBubble.borderColor, "#ffffff")
+        compare(eventBubble.backgroundOpacity, 1.0)
+        compare(eventBubble.titleText, "Sample Test Event")
+        compare(eventBubble.titleColor, "#ffffff")
+        verify(eventBubble.strikeoutTitle)
+    }
+
+    function test_visual_style_future_maybe_event()
+    {
+        var eventAttendeeData = {"emailAddress": root.collection.name,
+                                 "participationStatus": EventAttendee.StatusTentative}
+ 
+        var eventAttendee = create_event_attendee_from_data(eventAttendeeData)
+        root.event.setDetail(eventAttendee)
+
+        eventBubble = create_event_bubble(root.event)
+        eventBubble.updateEventBubbleStyle()
+
+        compare(eventBubble.backgroundColor, root.collection.color)
+        compare(eventBubble.borderColor, "#ffffff")
+        compare(eventBubble.backgroundOpacity, 1.0)
+        compare(eventBubble.titleText, "(?) Sample Test Event")
+        compare(eventBubble.titleColor, "#ffffff")
+        verify(!eventBubble.strikeoutTitle)
+    }
+
+    function test_visual_style_future_unknown_event()
+    {
+        var eventAttendeeData = {"emailAddress": root.collection.name,
+                                 "participationStatus": EventAttendee.StatusUnknown}
+ 
+        var eventAttendee = create_event_attendee_from_data(eventAttendeeData)
+        root.event.setDetail(eventAttendee)
+
+        eventBubble = create_event_bubble(root.event)
+        eventBubble.updateEventBubbleStyle()
+
+        compare(eventBubble.backgroundColor, "#ffffff")
+        compare(eventBubble.borderColor, root.collection.color)
+        compare(eventBubble.backgroundOpacity, 1.0)
+        compare(eventBubble.titleText, "Sample Test Event")
+        compare(eventBubble.titleColor, root.collection.color)
+        verify(!eventBubble.strikeoutTitle)
+    }
+}