Merge lp:~pkunal-parmar/ubuntu-calendar-app/DeclinedEvents into lp:ubuntu-calendar-app

[Kunal Parmar]

Bug #1371871
Calendar events where I'm marked as not going should be detected and displayed differently in the views

Bug #1371871
Calendar events where I'm marked as not going should be detected and displayed differently in the views

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

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

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me !
Thank you

review: Approve

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2014-10-21 15:16:26 +0000
+++ EventBubble.qml	2014-10-24 13:23:34 +0000
@@ -69,11 +69,29 @@
             var collection = model.collection( event.collectionId );
             var now = new Date();
             if( event.endDateTime >= now) {
-                bg.color = collection.color
+                if( getOwnersStatus(collection) === EventAttendee.StatusDeclined ) {
+                    //if owner of account is not attending event the dim it
+                    bg.color = Qt.tint( collection.color, "#aaffffff" );
+                } else {
+                    bg.color = collection.color
+                }
             } else {
                 //if event is on past then add some white color to original color
                 bg.color = Qt.tint( collection.color, "#aaffffff" );
-                return;
+            }
+        }
+    }
+
+    function getOwnersStatus(collection) {
+        var attendees = event.attendees;
+        if( attendees !== undefined ) {
+            for (var j = 0 ; j < attendees.length ; ++j) {
+                var contact = attendees[j];
+                //mail to is appended on email address so remove it
+                var email = contact.emailAddress.replace("mailto:", "");
+                if( email === collection.name) {
+                    return contact.participationStatus;
+                }
             }
         }
     }
@@ -205,7 +223,7 @@
 
                         layoutBubbleDetails();
                     } else if (event.displayLabel){
-                        eventDetails.item.timeLableText = event.displayLabel;
+                        timeLabel.text = event.displayLabel;
                     }
                 }
             }

=== removed file 'MonthComponentDateDelegate.qml.moved'
--- MonthComponentDateDelegate.qml.moved	2014-10-22 21:27:04 +0000
+++ MonthComponentDateDelegate.qml.moved	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-Item{
-    id: dateRootItem
-
-    property int date;
-    property bool isCurrentMonth;
-    property bool isToday
-
-    Loader {
-        width: parent.width < parent.height ? parent.width : parent.height
-        height: width
-        anchors.centerIn: parent
-        sourceComponent: isToday && isCurrentMonth ? highLightComp : undefined
-    }
-
-    Label {
-        id: dateLabel
-        anchors.centerIn: parent
-        width: parent.width
-        text: date
-        horizontalAlignment: Text.AlignHCenter
-        fontSize: root.dateLabelFontSize
-        color: {
-            if( isCurrentMonth ) {
-                if(isToday) {
-                    "white"
-                } else {
-                    "#5D5D5D"
-                }
-            } else {
-                "#AEA79F"
-            }
-        }
-    }
-
-    Loader{
-        property bool shouldLoad: showEvents
-                                  && intern.eventStatus !== undefined
-                                  && intern.eventStatus[index] !== undefined
-                                  &&intern.eventStatus[index]
-        sourceComponent: shouldLoad ? eventIndicatorComp : undefined
-        anchors.top: dateLabel.bottom
-        anchors.horizontalCenter: dateLabel.horizontalCenter
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onPressAndHold: {
-            var selectedDate = new Date();
-            selectedDate.setFullYear(intern.monthStartYear)
-            selectedDate.setMonth(intern.monthStartMonth + 1)
-            selectedDate.setDate(date)
-            selectedDate.setMinutes(60, 0, 0)
-            pageStack.push(Qt.resolvedUrl("NewEvent.qml"), {"date":selectedDate, "model":eventModel});
-        }
-        onClicked: {
-            var selectedDate = new Date(intern.monthStartYear,
-                                        intern.monthStartMonth,
-                                        intern.monthStartDate + index, 0, 0, 0, 0)
-            //If monthView is clicked then open selected DayView
-            if ( isYearView === false ) {
-                root.dateSelected(selectedDate);
-            }
-            //If yearView is clicked then open selected MonthView
-            else {
-                root.monthSelected(selectedDate);
-            }
-        }
-    }
-}