Merge lp:~mihirsoni/ubuntu-calendar-app/editEvent into lp:ubuntu-calendar-app

[Mihir Soni]

Added Edit event support

Added edit event support using new UDS presentation.

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

53 + title: isEdit===false? i18n.tr("New Event"):i18n.tr("Edit Event")

this would be clearer if written:

    title: isEdit ? i18n.tr("Edit Event") : i18n.tr("New Event")

[Olivier Tilloy (osomon)]

38 + console.log("I am adding");
43 + console.log("I am editing");

Please remove those logs if the functionality is working fine.

[Olivier Tilloy (osomon)]

I got stuck on the edit screen by doing the following:

 - create a new event today
 - in the day view click on the event to see its details
 - click on the edit button in the toolbar
 - click on the cancel button to go back to the event details
 - click on the back button to go back to the day view -> what happens is I’m taken back to the "edit event" page instead

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

61 - pageStack.pop();
62 + if(isEdit)
63 + pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event});
64 + else
65 + pageStack.pop();

You dont need to push EventDetails page again.

62 + if(isEdit)
63 + pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event});

In any case we need to pop current page to go back to original page. so this modification is not necessary,

review: Needs Fixing

[David Planella (dpm)]

Mihir, now the EDS branch has landed and we can land the new views too. Have you had the chance to look into the fixes Kunal was mentioning in his last comment?

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[David Planella (dpm)]

176 +}

Just a small nitpick: could you revert the change to the manifest file? It's not related to this branch.

Other than that, it looks good to me, thanks!

review: Approve

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

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

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/50/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1106
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/52
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/50
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/50

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Its almost ready, but still clean up is required

[Kunal Parmar (pkunal-parmar)]

147 + function clearFocus() {
148 + Qt.inputMethod.hide()
149 + titleEdit.focus = false
150 + locationEdit.focus = false
151 + personEdit.focus = false
152 + startTime.focus = false
153 + endTime.focus = false
154 + messageEdit.focus = false
155 + }

internal object already has defined clearFocus() method, please remove redundant code
    QtObject {
        id: internal

[Kunal Parmar (pkunal-parmar)]

70 + internal.eventModel = GlobalModel.gloablModel(event);

what does this do? I do not see gloablModel() method which takes event as parameter? did you forgot to merge?

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

61 + if( pageStack.header )
62 + pageStack.header.visible = true;
63 + if(event === null){
64 + internal.eventModel = GlobalModel.gloablModel();
65 + isEdit =false;
66 + addEvent();
67 + }
68 + else{
69 + pageStack.header.visible = true;

pageStack.header.visible = true;
is called twice

I think first call should be able to handle all case, you are facing some issue ?

review: Needs Fixing

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/51/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1108
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/51
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/53
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/51
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/51

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Trying edit event is showing error

ile:///home/kunal/Dropbox/projects/qt/qml/ubuntu/calendar/review/editEvent/NewEvent.qml:61: Error: Cannot assign QQmlListReference to QString
virtual void QOrganizerEDSEngine::requestDestroyed(QtOrganizer::QOrganizerAbstractRequest*)

100 + if(e.attendees){
101 + personEdit.text = e.attendees;
102 + }

Due to above line, please see event details how to get attendee's name from attendees array.

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

59 - internal.eventModel = GlobalModel.gloablModel();
60 -
61 + if( pageStack.header )

May be you need to restore "internal.eventModel = GlobalModel.gloablModel();" call and remove code you added in condition.

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

115 + if(!isEdit) // if it is new event create new object
116 + event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");

I think its better to move event creation to addEvent method now.

review: Needs Fixing

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

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

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

            if( personEdit.text != "") {
                var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee{}", Qt.application, "NewEvent.qml");
                attendee.name = personEdit.text;
                attendee.emailAddress = "<email address hidden>";
                event.setDetail(attendee);
            }

In case of edit, I think we will need to delete all existing attendees first, I am not sure thought, we need to try it out this and see how it works.

bool OrganizerItem::removeDetail ( detail )

This method should be useful.

[Mihir Soni (mihirsoni)]

> if( personEdit.text != "") {
> var attendee = Qt.createQmlObject("import QtOrganizer 5.0;
> EventAttendee{}", Qt.application, "NewEvent.qml");
> attendee.name = personEdit.text;
> attendee.emailAddress = "<email address hidden>";
> event.setDetail(attendee);
> }
>
> In case of edit, I think we will need to delete all existing attendees first,
> I am not sure thought, we need to try it out this and see how it works.
>
> bool OrganizerItem::removeDetail ( detail )
>
> This method should be useful.

I have used this instead of remove details :
// attendees clear
        event.attendees = [];

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

FAILED: Continuous integration, rev:154
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/157/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/1143/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/157/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/157/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/157/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/157/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:155
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/158/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1144
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/158
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/158
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/158
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/158

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

This is looking nice now,
Can you remove this line, I added this for some testing and forgot to remove it.

136 attendee.emailAddress = "<email address hidden>";

review: Needs Fixing

[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/160/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1146
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/160
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/160
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/160
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/160

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

There is typo here,
108 + if(j!== e.attendess.length-1)

it needs to be

e.attendees.length

review: Needs Fixing

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

this is looking good now, thanks :)

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/67/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/7

review: Needs Fixing (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/editEvent]

161. By Mihir Soni on 2013-12-20

Removed lines

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

PASSED: Continuous integration, rev:161
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/233/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/529
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/233
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/233
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/67

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

review: Approve (continuous-integration)

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2013-10-15 23:52:44 +0000
+++ EventDetails.qml	2013-12-20 19:18:14 +0000
@@ -21,7 +21,15 @@
         if( pageStack.header )
             pageStack.header.visible = true;
     }
-
+    Connections{
+        target: pageStack
+        onCurrentPageChanged:{
+            if( pageStack.currentPage === root) {
+                pageStack.header.visible = false;
+                showEvent(event);
+            }
+        }
+    }
     function showEvent(e) {
         var location = "";
 
@@ -72,17 +80,16 @@
             }
         }
 	*/
-	/*
+
         ToolbarButton {
             action:Action {
                 text: i18n.tr("Edit");
                 iconSource: Qt.resolvedUrl("edit.svg");
                 onTriggered: {
-                    print(text + " not implemented");
+                   pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"event":event});
                 }
             }
         }
-	*/
     }
     Rectangle {
         id:eventDetilsView

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2013-10-31 15:09:14 +0000
+++ NewEvent.qml	2013-12-20 19:18:14 +0000
@@ -8,15 +8,21 @@
 
 Page {
     id: root
-
     property var date: new Date();
+
+    property var event:null;
+
     property var startDate;
     property var endDate;
     property int optionSelectorWidth: frequencyLabel.width > remindLabel.width ? frequencyLabel.width : remindLabel.width
 
     property alias scrollY: flickable.contentY
+    property bool isEdit: false
 
     Component.onCompleted: {
+
+        pageStack.header.visible = true;
+
         // If startDate is setted by argument we have to not change it
         if (typeof(startDate) === 'undefined')
             startDate = new Date(date)
@@ -26,37 +32,65 @@
             endDate = new Date(date)
             endDate.setMinutes( endDate.getMinutes() + 10)
         }
-
         internal.eventModel = GlobalModel.gloablModel();
 
+        if(event === null){
+            isEdit =false;
+            addEvent();
+        }
+        else{
+            isEdit = true;
+            editEvent(event);
+        }
+    }
+    //Data for Add events
+    function addEvent() {
+        event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
+        startDate = new Date(date)
+        endDate = new Date(date)
+        endDate.setMinutes( endDate.getMinutes() + 10)
+
         startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
         endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");
     }
-
+    //Editing Event
+    function editEvent(e) {
+        startDate =new Date(e.startDateTime);
+        endDate = new Date(e.endDateTime);
+        startTime.text = Qt.formatDateTime(e.startDateTime, "dd MMM yyyy hh:mm");
+        endTime.text = Qt.formatDateTime(e.endDateTime, "dd MMM yyyy hh:mm");
+        if(e.displayLabel)
+            titleEdit.text = e.displayLabel;
+        if(e.location)
+            locationEdit.text = e.location;
+        if( e.description ) {
+            messageEdit.text = e.description;
+        }
+        if(e.attendees){
+            for( var j = 0 ; j < e.attendees.length ; ++j ) {
+                personEdit.text += e.attendees[j].name;
+                if(j!== e.attendees.length-1)
+                    personEdit.text += ",";
+            }
+        }
+    }
+    //Save the new or Existing event
     function saveToQtPim() {
-
         internal.clearFocus()
-
         if ( startDate >= endDate ) {
             PopupUtils.open(errorDlgComponent,root,{"text":i18n.tr("End time can't be before start time")});
         } else {
-
-            var event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
-
             event.startDateTime = startDate;
             event.endDateTime = endDate;
             event.displayLabel = titleEdit.text;
             event.description = messageEdit.text;
-
             event.location = locationEdit.text
-
+            event.attendees = []; // if Edit remove all attendes & add them again if any
             if( personEdit.text != "") {
                 var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee{}", Qt.application, "NewEvent.qml");
                 attendee.name = personEdit.text;
-                attendee.emailAddress = "[e-mail]";
                 event.setDetail(attendee);
             }
-
             internal.eventModel.saveItem(event);
             pageStack.pop();
         }
@@ -65,7 +99,7 @@
     width: parent.width
     height: parent.height
 
-    title: i18n.tr("New Event")
+    title: isEdit ? i18n.tr("Edit Event"):i18n.tr("New Event")
 
     tools: ToolbarItems {
         //keeping toolbar always open
@@ -107,7 +141,6 @@
             }
         }
     }
-
     Component {
         id: timePicker
         TimePicker {
@@ -194,7 +227,6 @@
                     }
                 }
             }
-
             NewEventEntryField{
                 id: titleEdit
                 width: parent.width