1
=== modified file 'EventDetails.qml'
2
--- EventDetails.qml	2013-10-15 23:52:44 +0000
3
+++ EventDetails.qml	2013-12-20 19:18:14 +0000
4
@@ -21,7 +21,15 @@
5
21
        if( pageStack.header )
21
        if( pageStack.header )
6
22
            pageStack.header.visible = true;
22
            pageStack.header.visible = true;
7
23
    }
23
    }
9
24
24
    Connections{
10
25
        target: pageStack
11
26
        onCurrentPageChanged:{
12
27
            if( pageStack.currentPage === root) {
13
28
                pageStack.header.visible = false;
14
29
                showEvent(event);
15
30
            }
16
31
        }
17
32
    }
18
25
    function showEvent(e) {
33
    function showEvent(e) {
19
26
        var location = "";
34
        var location = "";
20
27
35
21
@@ -72,17 +80,16 @@
22
72
            }
80
            }
23
73
        }
81
        }
24
74
	*/
82
	*/
26
75
	/*
83
27
76
        ToolbarButton {
84
        ToolbarButton {
28
77
            action:Action {
85
            action:Action {
29
78
                text: i18n.tr("Edit");
86
                text: i18n.tr("Edit");
30
79
                iconSource: Qt.resolvedUrl("edit.svg");
87
                iconSource: Qt.resolvedUrl("edit.svg");
31
80
                onTriggered: {
88
                onTriggered: {
33
81
                    print(text + " not implemented");
89
                   pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"event":event});
34
82
                }
90
                }
35
83
            }
91
            }
36
84
        }
92
        }
37
85
	*/
38
86
    }
93
    }
39
87
    Rectangle {
94
    Rectangle {
40
88
        id:eventDetilsView
95
        id:eventDetilsView
41
89
96
42
=== modified file 'NewEvent.qml'
43
--- NewEvent.qml	2013-10-31 15:09:14 +0000
44
+++ NewEvent.qml	2013-12-20 19:18:14 +0000
45
@@ -8,15 +8,21 @@
46
8
8
47
9
Page {
9
Page {
48
10
    id: root
10
    id: root
49
11
50
12
    property var date: new Date();
11
    property var date: new Date();
51
12
52
13
    property var event:null;
53
14
54
13
    property var startDate;
15
    property var startDate;
55
14
    property var endDate;
16
    property var endDate;
56
15
    property int optionSelectorWidth: frequencyLabel.width > remindLabel.width ? frequencyLabel.width : remindLabel.width
17
    property int optionSelectorWidth: frequencyLabel.width > remindLabel.width ? frequencyLabel.width : remindLabel.width
57
16
18
58
17
    property alias scrollY: flickable.contentY
19
    property alias scrollY: flickable.contentY
59
20
    property bool isEdit: false
60
18
21
61
19
    Component.onCompleted: {
22
    Component.onCompleted: {
62
23
63
24
        pageStack.header.visible = true;
64
25
65
20
        // If startDate is setted by argument we have to not change it
26
        // If startDate is setted by argument we have to not change it
66
21
        if (typeof(startDate) === 'undefined')
27
        if (typeof(startDate) === 'undefined')
67
22
            startDate = new Date(date)
28
            startDate = new Date(date)
68
@@ -26,37 +32,65 @@
69
26
            endDate = new Date(date)
32
            endDate = new Date(date)
70
27
            endDate.setMinutes( endDate.getMinutes() + 10)
33
            endDate.setMinutes( endDate.getMinutes() + 10)
71
28
        }
34
        }
72
29
73
30
        internal.eventModel = GlobalModel.gloablModel();
35
        internal.eventModel = GlobalModel.gloablModel();
74
31
36
75
37
        if(event === null){
76
38
            isEdit =false;
77
39
            addEvent();
78
40
        }
79
41
        else{
80
42
            isEdit = true;
81
43
            editEvent(event);
82
44
        }
83
45
    }
84
46
    //Data for Add events
85
47
    function addEvent() {
86
48
        event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
87
49
        startDate = new Date(date)
88
50
        endDate = new Date(date)
89
51
        endDate.setMinutes( endDate.getMinutes() + 10)
90
52
91
32
        startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
53
        startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
92
33
        endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");
54
        endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");
93
34
    }
55
    }
95
35
56
    //Editing Event
96
57
    function editEvent(e) {
97
58
        startDate =new Date(e.startDateTime);
98
59
        endDate = new Date(e.endDateTime);
99
60
        startTime.text = Qt.formatDateTime(e.startDateTime, "dd MMM yyyy hh:mm");
100
61
        endTime.text = Qt.formatDateTime(e.endDateTime, "dd MMM yyyy hh:mm");
101
62
        if(e.displayLabel)
102
63
            titleEdit.text = e.displayLabel;
103
64
        if(e.location)
104
65
            locationEdit.text = e.location;
105
66
        if( e.description ) {
106
67
            messageEdit.text = e.description;
107
68
        }
108
69
        if(e.attendees){
109
70
            for( var j = 0 ; j < e.attendees.length ; ++j ) {
110
71
                personEdit.text += e.attendees[j].name;
111
72
                if(j!== e.attendees.length-1)
112
73
                    personEdit.text += ",";
113
74
            }
114
75
        }
115
76
    }
116
77
    //Save the new or Existing event
117
36
    function saveToQtPim() {
78
    function saveToQtPim() {
118
37
119
38
        internal.clearFocus()
79
        internal.clearFocus()
120
39
121
40
        if ( startDate >= endDate ) {
80
        if ( startDate >= endDate ) {
122
41
            PopupUtils.open(errorDlgComponent,root,{"text":i18n.tr("End time can't be before start time")});
81
            PopupUtils.open(errorDlgComponent,root,{"text":i18n.tr("End time can't be before start time")});
123
42
        } else {
82
        } else {
124
43
125
44
            var event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
126
45
127
46
            event.startDateTime = startDate;
83
            event.startDateTime = startDate;
128
47
            event.endDateTime = endDate;
84
            event.endDateTime = endDate;
129
48
            event.displayLabel = titleEdit.text;
85
            event.displayLabel = titleEdit.text;
130
49
            event.description = messageEdit.text;
86
            event.description = messageEdit.text;
131
50
132
51
            event.location = locationEdit.text
87
            event.location = locationEdit.text
134
52
88
            event.attendees = []; // if Edit remove all attendes & add them again if any
135
53
            if( personEdit.text != "") {
89
            if( personEdit.text != "") {
136
54
                var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee{}", Qt.application, "NewEvent.qml");
90
                var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee{}", Qt.application, "NewEvent.qml");
137
55
                attendee.name = personEdit.text;
91
                attendee.name = personEdit.text;
138
56
                attendee.emailAddress = "none@nowhere.com";
139
57
                event.setDetail(attendee);
92
                event.setDetail(attendee);
140
58
            }
93
            }
141
59
142
60
            internal.eventModel.saveItem(event);
94
            internal.eventModel.saveItem(event);
143
61
            pageStack.pop();
95
            pageStack.pop();
144
62
        }
96
        }
145
@@ -65,7 +99,7 @@
146
65
    width: parent.width
99
    width: parent.width
147
66
    height: parent.height
100
    height: parent.height
148
67
101
150
68
    title: i18n.tr("New Event")
102
    title: isEdit ? i18n.tr("Edit Event"):i18n.tr("New Event")
151
69
103
152
70
    tools: ToolbarItems {
104
    tools: ToolbarItems {
153
71
        //keeping toolbar always open
105
        //keeping toolbar always open
154
@@ -107,7 +141,6 @@
155
107
            }
141
            }
156
108
        }
142
        }
157
109
    }
143
    }
158
110
159
111
    Component {
144
    Component {
160
112
        id: timePicker
145
        id: timePicker
161
113
        TimePicker {
146
        TimePicker {
162
@@ -194,7 +227,6 @@
163
194
                    }
227
                    }
164
195
                }
228
                }
165
196
            }
229
            }
166
197
167
198
            NewEventEntryField{
230
            NewEventEntryField{
168
199
                id: titleEdit
231
                id: titleEdit
169
200
                width: parent.width
232
                width: parent.width
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-12-20
Kunal Parmar			Approve on 2013-11-02
David Planella			Approve on 2013-10-16
Olivier Tilloy (community)		2013-10-09	Needs Fixing on 2013-10-10
Review via email: mp+190106@code.launchpad.net
1	=== modified file 'EventDetails.qml'
2	--- EventDetails.qml 2013-10-15 23:52:44 +0000
3	+++ EventDetails.qml 2013-12-20 19:18:14 +0000
4	@@ -21,7 +21,15 @@
5	21	if( pageStack.header )	21	if( pageStack.header )
6	22	pageStack.header.visible = true;	22	pageStack.header.visible = true;
7	23	}	23	}
9	24		24	Connections{
10			25	target: pageStack
11			26	onCurrentPageChanged:{
12			27	if( pageStack.currentPage === root) {
13			28	pageStack.header.visible = false;
14			29	showEvent(event);
15			30	}
16			31	}
17			32	}
18	25	function showEvent(e) {	33	function showEvent(e) {
19	26	var location = "";	34	var location = "";
20	27		35
21	@@ -72,17 +80,16 @@
22	72	}	80	}
23	73	}	81	}
24	74	*/	82	*/
26	75	/*	83
27	76	ToolbarButton {	84	ToolbarButton {
28	77	action:Action {	85	action:Action {
29	78	text: i18n.tr("Edit");	86	text: i18n.tr("Edit");
30	79	iconSource: Qt.resolvedUrl("edit.svg");	87	iconSource: Qt.resolvedUrl("edit.svg");
31	80	onTriggered: {	88	onTriggered: {
33	81	print(text + " not implemented");	89	pageStack.push(Qt.resolvedUrl("NewEvent.qml"),{"event":event});
34	82	}	90	}
35	83	}	91	}
36	84	}	92	}
37	85	*/
38	86	}	93	}
39	87	Rectangle {	94	Rectangle {
40	88	id:eventDetilsView	95	id:eventDetilsView
41	89		96
42	=== modified file 'NewEvent.qml'
43	--- NewEvent.qml 2013-10-31 15:09:14 +0000
44	+++ NewEvent.qml 2013-12-20 19:18:14 +0000
45	@@ -8,15 +8,21 @@
46	8		8
47	9	Page {	9	Page {
48	10	id: root	10	id: root
49	11
50	12	property var date: new Date();	11	property var date: new Date();
51			12
52			13	property var event:null;
53			14
54	13	property var startDate;	15	property var startDate;
55	14	property var endDate;	16	property var endDate;
56	15	property int optionSelectorWidth: frequencyLabel.width > remindLabel.width ? frequencyLabel.width : remindLabel.width	17	property int optionSelectorWidth: frequencyLabel.width > remindLabel.width ? frequencyLabel.width : remindLabel.width
57	16		18
58	17	property alias scrollY: flickable.contentY	19	property alias scrollY: flickable.contentY
59			20	property bool isEdit: false
60	18		21
61	19	Component.onCompleted: {	22	Component.onCompleted: {
62			23
63			24	pageStack.header.visible = true;
64			25
65	20	// If startDate is setted by argument we have to not change it	26	// If startDate is setted by argument we have to not change it
66	21	if (typeof(startDate) === 'undefined')	27	if (typeof(startDate) === 'undefined')
67	22	startDate = new Date(date)	28	startDate = new Date(date)
68	@@ -26,37 +32,65 @@
69	26	endDate = new Date(date)	32	endDate = new Date(date)
70	27	endDate.setMinutes( endDate.getMinutes() + 10)	33	endDate.setMinutes( endDate.getMinutes() + 10)
71	28	}	34	}
72	29
73	30	internal.eventModel = GlobalModel.gloablModel();	35	internal.eventModel = GlobalModel.gloablModel();
74	31		36
75			37	if(event === null){
76			38	isEdit =false;
77			39	addEvent();
78			40	}
79			41	else{
80			42	isEdit = true;
81			43	editEvent(event);
82			44	}
83			45	}
84			46	//Data for Add events
85			47	function addEvent() {
86			48	event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
87			49	startDate = new Date(date)
88			50	endDate = new Date(date)
89			51	endDate.setMinutes( endDate.getMinutes() + 10)
90			52
91	32	startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");	53	startTime.text = Qt.formatDateTime(startDate, "dd MMM yyyy hh:mm");
92	33	endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");	54	endTime.text = Qt.formatDateTime(endDate, "dd MMM yyyy hh:mm");
93	34	}	55	}
95	35		56	//Editing Event
96			57	function editEvent(e) {
97			58	startDate =new Date(e.startDateTime);
98			59	endDate = new Date(e.endDateTime);
99			60	startTime.text = Qt.formatDateTime(e.startDateTime, "dd MMM yyyy hh:mm");
100			61	endTime.text = Qt.formatDateTime(e.endDateTime, "dd MMM yyyy hh:mm");
101			62	if(e.displayLabel)
102			63	titleEdit.text = e.displayLabel;
103			64	if(e.location)
104			65	locationEdit.text = e.location;
105			66	if( e.description ) {
106			67	messageEdit.text = e.description;
107			68	}
108			69	if(e.attendees){
109			70	for( var j = 0 ; j < e.attendees.length ; ++j ) {
110			71	personEdit.text += e.attendees[j].name;
111			72	if(j!== e.attendees.length-1)
112			73	personEdit.text += ",";
113			74	}
114			75	}
115			76	}
116			77	//Save the new or Existing event
117	36	function saveToQtPim() {	78	function saveToQtPim() {
118	37
119	38	internal.clearFocus()	79	internal.clearFocus()
120	39
121	40	if ( startDate >= endDate ) {	80	if ( startDate >= endDate ) {
122	41	PopupUtils.open(errorDlgComponent,root,{"text":i18n.tr("End time can't be before start time")});	81	PopupUtils.open(errorDlgComponent,root,{"text":i18n.tr("End time can't be before start time")});
123	42	} else {	82	} else {
124	43
125	44	var event = Qt.createQmlObject("import QtOrganizer 5.0; Event { }", Qt.application,"NewEvent.qml");
126	45
127	46	event.startDateTime = startDate;	83	event.startDateTime = startDate;
128	47	event.endDateTime = endDate;	84	event.endDateTime = endDate;
129	48	event.displayLabel = titleEdit.text;	85	event.displayLabel = titleEdit.text;
130	49	event.description = messageEdit.text;	86	event.description = messageEdit.text;
131	50
132	51	event.location = locationEdit.text	87	event.location = locationEdit.text
134	52		88	event.attendees = []; // if Edit remove all attendes & add them again if any
135	53	if( personEdit.text != "") {	89	if( personEdit.text != "") {
136	54	var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee{}", Qt.application, "NewEvent.qml");	90	var attendee = Qt.createQmlObject("import QtOrganizer 5.0; EventAttendee{}", Qt.application, "NewEvent.qml");
137	55	attendee.name = personEdit.text;	91	attendee.name = personEdit.text;
138	56	attendee.emailAddress = "none@nowhere.com";
139	57	event.setDetail(attendee);	92	event.setDetail(attendee);
140	58	}	93	}
141	59
142	60	internal.eventModel.saveItem(event);	94	internal.eventModel.saveItem(event);
143	61	pageStack.pop();	95	pageStack.pop();
144	62	}	96	}
145	@@ -65,7 +99,7 @@
146	65	width: parent.width	99	width: parent.width
147	66	height: parent.height	100	height: parent.height
148	67		101
150	68	title: i18n.tr("New Event")	102	title: isEdit ? i18n.tr("Edit Event"):i18n.tr("New Event")
151	69		103
152	70	tools: ToolbarItems {	104	tools: ToolbarItems {
153	71	//keeping toolbar always open	105	//keeping toolbar always open
154	@@ -107,7 +141,6 @@
155	107	}	141	}
156	108	}	142	}
157	109	}	143	}
158	110
159	111	Component {	144	Component {
160	112	id: timePicker	145	id: timePicker
161	113	TimePicker {	146	TimePicker {
162	@@ -194,7 +227,6 @@
163	194	}	227	}
164	195	}	228	}
165	196	}	229	}
166	197
167	198	NewEventEntryField{	230	NewEventEntryField{
168	199	id: titleEdit	231	id: titleEdit
169	200	width: parent.width	232	width: parent.width