Ubuntu Calendar App

Merge lp:~gary-wzl77/ubuntu-calendar-app/fix-1472081 into lp:ubuntu-calendar-app

  1. fix-1472081
  2. Merge into trunk
Proposed by Gary.Wang
Status: Merged
Approved by: Mihir Soni
Approved revision: 692
Merged at revision: 703
Proposed branch: lp:~gary-wzl77/ubuntu-calendar-app/fix-1472081
Merge into: lp:ubuntu-calendar-app
Diff against target: 233 lines (+41/-32)
4 files modified
EventDetails.qml (+4/-2)
NewEvent.qml (+7/-4)
TimeLineBase.qml (+6/-2)
po/com.ubuntu.calendar.pot (+24/-24)
To merge this branch: bzr merge lp:~gary-wzl77/ubuntu-calendar-app/fix-1472081
Reviewer Review Type Date Requested Status
Mihir Soni Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+264152@code.launchpad.net

Commit message

1.fix display bug for multiple all day events
2.skip event bubble display in case of endDateTime == dd-MM-yyyy 12:00 AM

Description of the change

1.fix display bug for multiple all day events
2.skip event bubble display in case of endDateTime == dd-MM-yyyy 12:00 AM

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:692
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1208/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3050
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3050/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/679
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/205

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

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Looks good to me, thanks!

review: Approve
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me !!
Could you please make sure when you commit next time , you revert the pot Files manually ?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'EventDetails.qml'
--- EventDetails.qml 2015-06-27 17:52:44 +0000
+++ EventDetails.qml 2015-07-08 13:39:43 +0000
@@ -23,6 +23,7 @@
23import QtOrganizer 5.023import QtOrganizer 5.0
2424
25import "Defines.js" as Defines25import "Defines.js" as Defines
26import "dateExt.js" as DateExt
2627
27Page {28Page {
28 id: root29 id: root
@@ -114,10 +115,11 @@
114 var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)115 var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
115116
116 if( e.allDay ) {117 if( e.allDay ) {
117 if( !e.startDateTime.isSameDay( e.endDateTime) ) {118 var days = Math.floor((e.endDateTime - e.startDateTime) / Date.msPerDay);
119 if( days !== 1 ) {
118 dateLabel.text = i18n.tr("%1 - %2 (All Day)")120 dateLabel.text = i18n.tr("%1 - %2 (All Day)")
119 .arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))121 .arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
120 .arg( e.endDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))122 .arg( e.endDateTime.addDays(-1).toLocaleDateString(Qt.locale(), Locale.LongFormat))
121 } else {123 } else {
122 dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))124 dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
123 }125 }
124126
=== modified file 'NewEvent.qml'
--- NewEvent.qml 2015-06-27 17:52:44 +0000
+++ NewEvent.qml 2015-07-08 13:39:43 +0000
@@ -155,6 +155,7 @@
155 }155 }
156 if(e.allDay){156 if(e.allDay){
157 allDayEventCheckbox.checked =true;157 allDayEventCheckbox.checked =true;
158 endDate = endDate.addDays(-1);
158 }159 }
159160
160 if(e.location) {161 if(e.location) {
@@ -202,12 +203,14 @@
202 }203 }
203204
204 event.allDay = allDayEventCheckbox.checked;205 event.allDay = allDayEventCheckbox.checked;
205
206 event.startDateTime = startDate;206 event.startDateTime = startDate;
207 if (event.allDay)207
208 event.endDateTime = startDate.addDays(1);208 if (event.allDay){
209 else209 event.endDateTime = endDate.addDays(1);
210 } else {
210 event.endDateTime = endDate;211 event.endDateTime = endDate;
212 }
213
211 event.displayLabel = titleEdit.text;214 event.displayLabel = titleEdit.text;
212 event.description = messageEdit.text;215 event.description = messageEdit.text;
213 event.location = locationEdit.text216 event.location = locationEdit.text
214217
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml 2015-06-21 08:29:02 +0000
+++ TimeLineBase.qml 2015-07-08 13:39:43 +0000
@@ -224,6 +224,10 @@
224 var hour = 0;224 var hour = 0;
225 var durationMin = 0;225 var durationMin = 0;
226226
227 // skip it in case of endDateTime == dd-MM-yyyy 12:00 AM
228 if (event.endDateTime - day == 0)
229 return;
230
227 if (event.endDateTime.getDate() - day.getDate() == 0 &&231 if (event.endDateTime.getDate() - day.getDate() == 0 &&
228 event.startDateTime.getDate() - day.getDate() == 0) {232 event.startDateTime.getDate() - day.getDate() == 0) {
229 hour = event.startDateTime.getHours();233 hour = event.startDateTime.getHours();
@@ -244,8 +248,8 @@
244 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight248 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
245 durationMin = (24 - event.startDateTime.getHours()) * 60;249 durationMin = (24 - event.startDateTime.getHours()) * 60;
246 }250 }
247 if (event.endDateTime - day > Date.msPerDay &&251 if (event.endDateTime - day >= Date.msPerDay &&
248 event.startDateTime- day < 0) {252 event.startDateTime- day <= 0) {
249 hour = 0;253 hour = 0;
250 yPos = 0;254 yPos = 0;
251 durationMin = 24 * 60;255 durationMin = 24 * 60;
252256
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2015-06-23 15:59:08 +0000
+++ po/com.ubuntu.calendar.pot 2015-07-08 13:39:43 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-06-23 23:57+0800\n"11"POT-Creation-Date: 2015-07-08 21:32+0800\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -132,11 +132,11 @@
132msgid "Delete this"132msgid "Delete this"
133msgstr ""133msgstr ""
134134
135#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:188135#: ../DeleteConfirmationDialog.qml:51 ../NewEvent.qml:68
136msgid "Delete"136msgid "Delete"
137msgstr ""137msgstr ""
138138
139#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:304139#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:322
140msgid "Edit Event"140msgid "Edit Event"
141msgstr ""141msgstr ""
142142
@@ -154,7 +154,7 @@
154msgid "Edit this"154msgid "Edit this"
155msgstr ""155msgstr ""
156156
157#: ../EventActions.qml:50 ../NewEvent.qml:304157#: ../EventActions.qml:50 ../NewEvent.qml:322
158msgid "New Event"158msgid "New Event"
159msgstr ""159msgstr ""
160160
@@ -165,35 +165,35 @@
165msgid "%1 <b>%2</b>"165msgid "%1 <b>%2</b>"
166msgstr ""166msgstr ""
167167
168#: ../EventDetails.qml:42 ../NewEvent.qml:415168#: ../EventDetails.qml:43 ../NewEvent.qml:433
169msgid "Event Details"169msgid "Event Details"
170msgstr ""170msgstr ""
171171
172#. TRANSLATORS: the first parameter refers to the name of event calendar.172#. TRANSLATORS: the first parameter refers to the name of event calendar.
173#: ../EventDetails.qml:66173#: ../EventDetails.qml:67
174#, qt-format174#, qt-format
175msgid "%1 Calendar"175msgid "%1 Calendar"
176msgstr ""176msgstr ""
177177
178#: ../EventDetails.qml:118178#: ../EventDetails.qml:120
179#, qt-format179#, qt-format
180msgid "%1 - %2 (All Day)"180msgid "%1 - %2 (All Day)"
181msgstr ""181msgstr ""
182182
183#: ../EventDetails.qml:122183#: ../EventDetails.qml:124
184#, qt-format184#, qt-format
185msgid "%1 (All Day)"185msgid "%1 (All Day)"
186msgstr ""186msgstr ""
187187
188#: ../EventDetails.qml:201188#: ../EventDetails.qml:194
189msgid "Edit"189msgid "Edit"
190msgstr ""190msgstr ""
191191
192#: ../EventDetails.qml:352 ../NewEvent.qml:517192#: ../EventDetails.qml:345 ../NewEvent.qml:535
193msgid "Guests"193msgid "Guests"
194msgstr ""194msgstr ""
195195
196#: ../EventDetails.qml:395 ../EventReminder.qml:35 ../NewEvent.qml:614196#: ../EventDetails.qml:388 ../EventReminder.qml:35 ../NewEvent.qml:632
197msgid "Reminder"197msgid "Reminder"
198msgstr ""198msgstr ""
199199
@@ -216,7 +216,7 @@
216#. TRANSLATORS: this refers to how often a recurrent event repeats216#. TRANSLATORS: this refers to how often a recurrent event repeats
217#. and it is shown as the header of the option selector to choose217#. and it is shown as the header of the option selector to choose
218#. its repetition218#. its repetition
219#: ../EventRepetition.qml:237 ../NewEvent.qml:598219#: ../EventRepetition.qml:237 ../NewEvent.qml:616
220msgid "Repeats"220msgid "Repeats"
221msgstr ""221msgstr ""
222222
@@ -259,51 +259,51 @@
259msgid "After Date"259msgid "After Date"
260msgstr ""260msgstr ""
261261
262#: ../NewEvent.qml:68262#: ../NewEvent.qml:84
263msgid "Save"263msgid "Save"
264msgstr ""264msgstr ""
265265
266#: ../NewEvent.qml:177266#: ../NewEvent.qml:193
267msgid "End time can't be before start time"267msgid "End time can't be before start time"
268msgstr ""268msgstr ""
269269
270#: ../NewEvent.qml:314270#: ../NewEvent.qml:332
271msgid "Error"271msgid "Error"
272msgstr ""272msgstr ""
273273
274#: ../NewEvent.qml:316274#: ../NewEvent.qml:334
275msgid "OK"275msgid "OK"
276msgstr ""276msgstr ""
277277
278#: ../NewEvent.qml:369278#: ../NewEvent.qml:387
279msgid "From"279msgid "From"
280msgstr ""280msgstr ""
281281
282#: ../NewEvent.qml:382282#: ../NewEvent.qml:400
283msgid "To"283msgid "To"
284msgstr ""284msgstr ""
285285
286#: ../NewEvent.qml:399286#: ../NewEvent.qml:417
287msgid "All day event"287msgid "All day event"
288msgstr ""288msgstr ""
289289
290#: ../NewEvent.qml:428290#: ../NewEvent.qml:446
291msgid "Event Name"291msgid "Event Name"
292msgstr ""292msgstr ""
293293
294#: ../NewEvent.qml:446294#: ../NewEvent.qml:464
295msgid "Description"295msgid "Description"
296msgstr ""296msgstr ""
297297
298#: ../NewEvent.qml:464298#: ../NewEvent.qml:482
299msgid "Location"299msgid "Location"
300msgstr ""300msgstr ""
301301
302#: ../NewEvent.qml:479 com.ubuntu.calendar_calendar.desktop.in.in.h:1302#: ../NewEvent.qml:497 com.ubuntu.calendar_calendar.desktop.in.in.h:1
303msgid "Calendar"303msgid "Calendar"
304msgstr ""304msgstr ""
305305
306#: ../NewEvent.qml:521306#: ../NewEvent.qml:539
307msgid "Add Guest"307msgid "Add Guest"
308msgstr ""308msgstr ""
309309

Subscribers

People subscribed via source and target branches

to status/vote changes: