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

[Kunal Parmar]

resolves Bug #1369543

resolves Bug #1369543

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

PASSED: Continuous integration, rev:695
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1214/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3085
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3085/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/685
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/211

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

it works fine , but there is a small change, it seems we are not using declared variable , we should remove that if we are not using it.

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

Thanks, I updated the MR

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

696. By Kunal Parmar on 2015-08-02

review comment

697. By Kunal Parmar on 2015-08-02

merge from trunk

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks Kunal.

review: Approve

=== modified file 'EventListModel.qml'
--- EventListModel.qml	2015-07-30 19:18:55 +0000
+++ EventListModel.qml	2015-08-02 03:59:36 +0000
@@ -90,6 +90,30 @@
         return cals;
     }
 
+    function getDefaultCollection() {
+        var cals = getCollections();
+         for(var i = 0 ; i < cals.length ; ++i) {
+            var cal = cals[i]
+            var val = cal.extendedMetaData("X-CAL-DEFAULT-CALENDAR")
+            if( val ) {
+                return cal;
+            }
+        }
+
+        return defaultCollection();
+    }
+
+    function setDefaultCollection( collectionId ) {
+        var cals = getCollections();
+         for(var i = 0 ; i < cals.length ; ++i) {
+             var cal = cals[i]
+             cal.setExtendedMetaData("X-CAL-DEFAULT-CALENDAR", false);
+             if( cal.collectionId === collectionId) {
+                cal.setExtendedMetaData("X-CAL-DEFAULT-CALENDAR", true);
+             }
+        }
+    }
+
     onStartPeriodChanged: {
         isLoading = true
     }

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2015-07-30 19:33:41 +0000
+++ NewEvent.qml	2015-08-02 03:59:36 +0000
@@ -136,7 +136,7 @@
         event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
         //Create fresh Recurrence Object.
         rule = Qt.createQmlObject("import QtOrganizer 5.0; RecurrenceRule {}", event.recurrence,"EventRepetition.qml");
-        selectCalendar(model.defaultCollection().collectionId);
+        selectCalendar(model.getDefaultCollection().collectionId);
     }
 
     //Editing Event
@@ -186,6 +186,7 @@
 
         selectCalendar(e.collectionId);
     }
+
     //Save the new or Existing event
     function saveToQtPim() {
         internal.clearFocus()
@@ -245,6 +246,7 @@
                 event.setDetail(audibleReminder);
             }
             event.collectionId = calendarsOption.model[calendarsOption.selectedIndex].collectionId;
+            model.setDefaultCollection(event.collectionId);
 
             var comment = event.detail(Detail.Comment);
             if(comment && comment.comment === "X-CAL-DEFAULT-EVENT") {