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

[Kunal Parmar]

DiaryViewDelegate.qml added and some other minor modification

Delegate for Diary view (DiaryViewDelegate.qml) added and done some other minor modification

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

PASSED: Continuous integration, rev:18
http://91.189.93.125:8080/job/ubuntu-calendar-app-ci/23/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-quantal-amd64-ci/22
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calendar-app-raring-amd64-ci/22

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

review: Approve (continuous-integration)

[Frank Mertens (frankencode)]

On Raring I get errors unrelated to the changes.

frank@nova:~/Source/Ubuntu/Calendar/DiaryViewDelegate$ qmlscene calendar.qml
"Error on creating style rule:
import QtQuick 2.0
import qmltheme 0.1
import Ubuntu.Components 0.1

HeaderDelegate{}

:5 Type HeaderDelegate unavailable
file:///usr/share/themes/Ambiance/qmltheme/HeaderDelegate.qml:110 Header is not a type
"
QQmlComponent: Component is not ready
file:///home/frank/Source/Ubuntu/Calendar/DiaryViewDelegate/EventDetails.qml:17: TypeError: Cannot read property 'header' of null

=== modified file 'DiaryView.qml'
--- DiaryView.qml	2013-04-02 11:34:52 +0000
+++ DiaryView.qml	2013-04-13 04:52:26 +0000
@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+
 import "dateExt.js" as DateExt
 import "colorUtils.js" as Color
 
@@ -21,6 +22,7 @@
     clip: true
 
     model: EventListModel {
+        id: eventModel
         termStart: dayStart
         termLength: Date.msPerDay
     }
@@ -42,9 +44,7 @@
         }
     }
 
-    delegate: ListItem.Standard {
-        text: startTime.toLocaleTimeString(Qt.locale(i18n.language), Locale.ShortFormat) + "   " + title
-
+    delegate: DiaryViewDelegate{
         onClicked: {
             pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{event:diaryView.model.get(index)});
         }

=== added file 'DiaryViewDelegate.qml'
--- DiaryViewDelegate.qml	1970-01-01 00:00:00 +0000
+++ DiaryViewDelegate.qml	2013-04-13 04:52:26 +0000
@@ -0,0 +1,171 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+import "dataService.js" as DataService
+
+Item {
+    id: delegateRoot
+
+    property color textColor: "black"
+    //property color bgColor: "#f1f1f1";
+    property color bgColor: "white";
+
+    signal clicked(int index);
+
+    function collapse( collapse ) {
+        attendeesLayout.visible = !collapse;
+        locationLayout.visible = !collapse;
+        eventRoot.collapsed = collapse;
+    }
+
+    function showEventData() {
+        // FIXME: remove test value, need to decide what to do if there is no location, hide it ?
+        var venues = [{"name":"Test Venue"}]
+        DataService.getVenues(eventModel.get(index), venues)
+        if( venues.length > 0 ) {
+            locationLabel.text = venues[0].name;
+        }
+
+        // FIXME: remove test value, need to decide what to do if there are no attendees, hide it ?
+        var attendees = ["Test One","Test Two"]
+        DataService.getAttendees(eventModel.get(index),attendees)
+        attendeeLabel.text = attendees.toString();
+    }
+
+    function dataChanged() {
+        collapse(true);
+
+        var now = new Date;
+        var lastEvent = eventModel.get(index-1);
+
+        if( endTime >= now && (lastEvent === undefined || lastEvent.endTime < now )  ) {
+            collapse(false);
+            bgColor = "#fffdaa";
+            seperator.visible = true;
+        } else if( startTime < now) {
+            textColor = "#747474"
+        }
+
+        showEventData();
+    }
+
+    height: eventRoot.height + seperator.height + (seperator.visible ? units.gu(1.5) : units.gu(0.5)) /*margins*/
+    width: parent.width
+
+    Rectangle {
+        id: seperator
+        height: units.gu(0.5)
+        width: delegateRoot.width - units.gu(2)
+        anchors.top: parent.top
+        anchors.topMargin: units.gu(1)
+        anchors.horizontalCenter: parent.horizontalCenter
+        color: "#c94212"
+        visible: false
+    }
+
+    Rectangle {
+        id: eventRoot
+
+        property var event;
+        property bool collapsed: false;
+
+        color: delegateRoot.bgColor;
+        height: eventContainer.height;
+        width: parent.width - units.gu(2)
+
+        anchors {
+            top: seperator.visible ? seperator.bottom : parent.top
+            topMargin: units.gu(1)
+            horizontalCenter: parent.horizontalCenter
+        }
+
+        MouseArea{
+            anchors.fill: parent;
+            onClicked: {
+                delegateRoot.clicked(index);
+            }
+        }
+
+        Column{
+            id: eventContainer
+
+            spacing: units.gu(1)
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                leftMargin: units.gu(1)
+                rightMargin: units.gu(1)
+            }
+
+            Row{
+                width:parent.width
+                spacing: units.gu(2)
+                height: timeLabel.height + units.gu(3)
+
+                Label{
+                    id:timeLabel
+                    fontSize: "large"
+                    text: Qt.formatTime(startTime,"hh:mm");
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: delegateRoot.textColor
+
+                    onTextChanged: {
+                        delegateRoot.dataChanged();
+                    }
+                }
+
+                Label{
+                    id: titleLabel
+                    fontSize: "large"
+                    text: title
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: delegateRoot.textColor
+                    wrapMode: Text.Wrap
+                }
+            }
+
+            Row{
+                id: locationLayout
+                width:parent.width
+                spacing: units.gu(2)
+                Item {
+                    id: locationIconContainer
+                    width: timeLabel.width
+                    height: units.gu(4)
+                    Image{
+                        source: "icon-location.png"
+                        anchors.right: parent.right
+                    }
+                }
+                Label{
+                    id: locationLabel
+                    width: parent.width - units.gu(2) - locationIconContainer.width
+                    color: delegateRoot.textColor
+                    wrapMode: Text.Wrap
+                }
+            }
+
+            Row{
+                id: attendeesLayout
+                width:parent.width
+                spacing: units.gu(2)
+                Item {
+                    id: contactIconContainer
+                    width: timeLabel.width
+                    height: units.gu(4)
+                    Image{
+                        source: "icon-contacts.png"
+                        anchors.right: parent.right
+                    }
+                }
+                Label{
+                    id: attendeeLabel
+                    width: parent.width - units.gu(2) - contactIconContainer.width
+                    color: delegateRoot.textColor
+                    wrapMode: Text.Wrap
+                }
+            }
+        }
+    }
+}

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2013-03-31 04:56:58 +0000
+++ EventDetails.qml	2013-04-13 04:52:26 +0000
@@ -44,7 +44,7 @@
         if( venues.length > 0 ) {
             //FIXME: what to do for multiple venue
             var place = venues[0];
-            locationLabel.text = address;
+            locationLabel.text = place.address;
             if( place.latitude && place.longitude) {
                 location = place.latitude +"," + place.longitude;
             }