Ubuntu Calendar App

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

  1. fix_1460433_new
  2. Merge into trunk
Proposed by Gary.Wang on 2015-06-18
Status: Merged
Approved by: Nicholas Skaggs on 2015-08-20
Approved revision: 672
Merge reported by: Nicholas Skaggs
Merged at revision: not available
Proposed branch: lp:~gary-wzl77/ubuntu-calendar-app/fix_1460433_new
Merge into: lp:ubuntu-calendar-app
Diff against target: 107 lines (+29/-25)
3 files modified
EventDetails.qml (+6/-1)
TimeLineBase.qml (+18/-19)
po/com.ubuntu.calendar.pot (+5/-5)
To merge this branch: bzr merge lp:~gary-wzl77/ubuntu-calendar-app/fix_1460433_new
Reviewer Review Type Date Requested Status
Nicholas Skaggs Needs Fixing on 2015-08-21
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-08-20
Alan Pope 🍺🐧🐱 🦄 2015-06-18 Approve on 2015-06-23
Mihir Soni Approve on 2015-06-23
Review via email: mp+262357@code.launchpad.net

Commit Message

1.Fix multi-day event displayed issue in weeklyview
2.Show end date time for multi-day event in Event details

Description of the Change

1.Fix multi-day event displayed issue in weeklyview
2.Show end date time for multi-day event in Event details

To post a comment you must log in.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Mihir Soni (mihirsoni) wrote :

Hi ,

Thanks for the MP ,It looks good and working as expected.

Thanks,
Mihir Soni

review: Approve
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/1301/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/874

review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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/1302/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/875

review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
Nicholas Skaggs (nskaggs) wrote :

Text conflict in po/com.ubuntu.calendar.pot
1 conflicts encountered.

review: Needs Fixing
Nicholas Skaggs (nskaggs) wrote :

Sorry, ignore my previous comment. Wrong mp.

Nicholas Skaggs (nskaggs) wrote :

AFAICT, this is merged and bzr says nothing to merge with trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventDetails.qml'
2--- EventDetails.qml 2014-11-06 13:14:06 +0000
3+++ EventDetails.qml 2015-06-21 08:31:20 +0000
4@@ -122,7 +122,12 @@
5 dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
6 }
7 } else {
8- dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - " + endTime;
9+ if (e.endDateTime.getDate() !== e.startDateTime.getDate()) {
10+ dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "
11+ + e.endDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " + endTime;
12+ } else {
13+ dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - " + endTime;
14+ }
15 }
16
17 if( e.itemType === Type.EventOccurrence ){
18
19=== modified file 'TimeLineBase.qml'
20--- TimeLineBase.qml 2015-06-01 08:54:59 +0000
21+++ TimeLineBase.qml 2015-06-21 08:31:20 +0000
22@@ -226,27 +226,26 @@
23
24 if (event.endDateTime.getDate() - day.getDate() == 0 &&
25 event.startDateTime.getDate() - day.getDate() == 0) {
26- hour = event.startDateTime.getHours();
27- yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
28- durationMin = (event.endDateTime.getHours() - event.startDateTime.getHours()) * 60;
29- durationMin += (event.endDateTime.getMinutes() - event.startDateTime.getMinutes());
30+ hour = event.startDateTime.getHours();
31+ yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
32+ durationMin = (event.endDateTime.getHours() - event.startDateTime.getHours()) * 60;
33+ durationMin += (event.endDateTime.getMinutes() - event.startDateTime.getMinutes());
34 }
35 if (event.endDateTime.getDate() - day.getDate() == 0 &&
36- event.startDateTime.getDate() - day.getDate() < 0) {
37- hour = 0;
38- yPos = 0;
39- durationMin = event.endDateTime.getHours() * 60;
40- durationMin += event.endDateTime.getMinutes();
41- }
42- if (event.endDateTime.getDate() - day.getDate() > 0 &&
43- event.startDateTime.getDate() - day.getDate() == 0) {
44- hour = event.startDateTime.getHours();
45- yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
46- durationMin = (24 - event.startDateTime.getHours()) * 60;
47- }
48-
49- if (event.endDateTime.getDate() - day.getDate() > 0 &&
50- event.startDateTime.getDate() - day.getDate() < 0) {
51+ event.startDateTime - day < 0) {
52+ hour = 0;
53+ yPos = 0;
54+ durationMin = event.endDateTime.getHours() * 60;
55+ durationMin += event.endDateTime.getMinutes();
56+ }
57+ if (event.startDateTime.getDate() - day.getDate() == 0 &&
58+ event.endDateTime - day > Date.msPerDay) {
59+ hour = event.startDateTime.getHours();
60+ yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
61+ durationMin = (24 - event.startDateTime.getHours()) * 60;
62+ }
63+ if (event.endDateTime - day > Date.msPerDay &&
64+ event.startDateTime- day < 0) {
65 hour = 0;
66 yPos = 0;
67 durationMin = 24 * 60;
68
69=== modified file 'po/com.ubuntu.calendar.pot'
70--- po/com.ubuntu.calendar.pot 2015-06-16 09:18:21 +0000
71+++ po/com.ubuntu.calendar.pot 2015-06-21 08:31:20 +0000
72@@ -8,7 +8,7 @@
73 msgstr ""
74 "Project-Id-Version: \n"
75 "Report-Msgid-Bugs-To: \n"
76-"POT-Creation-Date: 2015-06-16 17:18+0800\n"
77+"POT-Creation-Date: 2015-06-21 16:27+0800\n"
78 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
79 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
80 "Language-Team: LANGUAGE <LL@li.org>\n"
81@@ -132,7 +132,7 @@
82 msgid "Delete this"
83 msgstr ""
84
85-#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:183
86+#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:188
87 msgid "Delete"
88 msgstr ""
89
90@@ -185,15 +185,15 @@
91 msgid "%1 (All Day)"
92 msgstr ""
93
94-#: ../EventDetails.qml:196
95+#: ../EventDetails.qml:201
96 msgid "Edit"
97 msgstr ""
98
99-#: ../EventDetails.qml:347 ../NewEvent.qml:512
100+#: ../EventDetails.qml:352 ../NewEvent.qml:512
101 msgid "Guests"
102 msgstr ""
103
104-#: ../EventDetails.qml:390 ../EventReminder.qml:35 ../NewEvent.qml:609
105+#: ../EventDetails.qml:395 ../EventReminder.qml:35 ../NewEvent.qml:609
106 msgid "Reminder"
107 msgstr ""
108

Subscribers

People subscribed via source and target branches

to status/vote changes: