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

[Kunal Parmar]

delete event,

delete event,

Note: there is some issue with EDS, due to which we are not getting notification when event it removed.
So if you restart calendar, you can see event is deleted

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

PASSED: Continuous integration, rev:157
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/161/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1147
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/161
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/161
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/161
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/161

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

I did try to test this MR & not able to delete the any event.

file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml:33:9: QML QQuickImage: Failed to get image from provider: image://theme/delete,edit-delete-symbolic
virtual bool QOrganizerEDSEngine::startRequest(QtOrganizer::QOrganizerAbstractRequest*)
void QOrganizerEDSEngine::removeItemsAsync(QtOrganizer::QOrganizerItemRemoveRequest*)
static void QOrganizerEDSEngine::removeItemsAsyncStart(RemoveRequestData*)
Remove item size: 1
Fail to remove Items Cannot remove calendar object: Object not found

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

> I did try to test this MR & not able to delete the any event.
>
> file:///usr/lib/x86_64-linux-
> gnu/qt5/qml/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml:33:9: QML
> QQuickImage: Failed to get image from provider: image://theme/delete,edit-
> delete-symbolic
> virtual bool
> QOrganizerEDSEngine::startRequest(QtOrganizer::QOrganizerAbstractRequest*)
> void QOrganizerEDSEngine::removeItemsAsync(QtOrganizer::QOrganizerItemRemoveRe
> quest*)
> static void QOrganizerEDSEngine::removeItemsAsyncStart(RemoveRequestData*)
> Remove item size: 1
> Fail to remove Items Cannot remove calendar object: Object not found

yes, this is dues to some EDS issue,
you can find more details here.
https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1240505

[lp:~pkunal-parmar/ubuntu-calendar-app/deleteEvent]

158. By Kunal Parmar on 2014-01-18

making event bubble hiddle before deleting it

159. By Kunal Parmar on 2014-01-18

merge from trunk

160. By Kunal Parmar on 2014-01-18

Print statement removed

161. By Kunal Parmar on 2014-01-18

reverting menifest file

162. By Kunal Parmar on 2014-01-18

Commented out code removed

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

PASSED: Continuous integration, rev:162
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/245/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/745
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/245
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/245
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/79

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me and it works well with EDS on Trusty.

One thing I've noticed, and that it might be worth fixing is the following typo (gloablModel vs. globalModel):

48 + var eventModel = GlobalModel.gloablModel();

review: Approve

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2013-10-17 06:09:12 +0000
+++ EventDetails.qml	2014-01-18 03:15:47 +0000
@@ -4,6 +4,8 @@
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.Components.Themes.Ambiance 0.1
 
+import "GlobalEventModel.js" as GlobalModel
+
 Page {
     id: root
 
@@ -39,10 +41,10 @@
         var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
         var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
 
-	startHeader.value = startTime;
-	endHeader.value = endTime;
+        startHeader.value = startTime;
+        endHeader.value = endTime;
 
-	// This is the event title
+        // This is the event title
         if( e.displayLabel) {
             titleLabel.text = e.displayLabel;
         }
@@ -59,7 +61,6 @@
             for( var j = 0 ; j < attendees.length ; ++j ) {
                 contactModel.append( {"name": attendees[j].name } );
             }
-
         }
         // FIXME: need to cache map image to avoid duplicate download every time
         var imageSrc = "http://maps.googleapis.com/maps/api/staticmap?center="+location+
@@ -70,16 +71,17 @@
 
     tools: ToolbarItems {
 
-	/*
         ToolbarButton {
-            action: Action {
-                text: i18n.tr("Add invite");
+            action:Action {
+                text: i18n.tr("Delete");
+                iconSource: "image://theme/delete,edit-delete-symbolic"
                 onTriggered: {
-                    print(text + " not implemented");
+                    var eventModel = GlobalModel.gloablModel();
+                    eventModel.removeItem(event);
+                    pageStack.pop();
                 }
             }
         }
-	*/
 
         ToolbarButton {
             action:Action {
@@ -91,6 +93,7 @@
             }
         }
     }
+
     Rectangle {
         id:eventDetilsView
         anchors.fill: parent

=== modified file 'EventListModel.qml'
--- EventListModel.qml	2013-09-28 03:20:54 +0000
+++ EventListModel.qml	2014-01-18 03:15:47 +0000
@@ -3,14 +3,13 @@
 
 import QtOrganizer 5.0
 
-//http://qt.gitorious.org/qt/qtpim/blobs/master/examples/organizer/qmlorganizerlistview/qmlorganizerlistview.qml
 OrganizerModel {
     id: eventModel
     manager:"eds"
 
     signal reloaded
 
-    onItemCountChanged:{
+    onModelChanged: {
         reloaded();
     }
 }

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2013-09-28 03:37:02 +0000
+++ TimeLineBase.qml	2014-01-18 03:15:47 +0000
@@ -65,6 +65,7 @@
             if( children[i].objectName === "separator") {
                 children[i].visible = false;
             } else {
+                children[i].visible = false;
                 children[i].destroy();
             }
         }