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
Status: Merged
Approved by: Nicholas Skaggs
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 (community) Needs Fixing
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Mihir Soni Approve
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.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:671
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1196/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2950
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2950/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/667
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/193

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:671
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1199/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2961/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/670/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/196/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:672
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1200/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2969
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2969/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/671
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/197

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

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

Hi ,

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

Thanks,
Mihir Soni

review: Approve
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Approve
Revision history for this message
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/535/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3004
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3004/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/320
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/108

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

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

review: Needs Fixing
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Sorry, ignore my previous comment. Wrong mp.

Revision history for this message
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
=== modified file 'EventDetails.qml'
--- EventDetails.qml 2014-11-06 13:14:06 +0000
+++ EventDetails.qml 2015-06-21 08:31:20 +0000
@@ -122,7 +122,12 @@
122 dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))122 dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
123 }123 }
124 } else {124 } else {
125 dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - " + endTime;125 if (e.endDateTime.getDate() !== e.startDateTime.getDate()) {
126 dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "
127 + e.endDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " + endTime;
128 } else {
129 dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - " + endTime;
130 }
126 }131 }
127132
128 if( e.itemType === Type.EventOccurrence ){133 if( e.itemType === Type.EventOccurrence ){
129134
=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml 2015-06-01 08:54:59 +0000
+++ TimeLineBase.qml 2015-06-21 08:31:20 +0000
@@ -226,27 +226,26 @@
226226
227 if (event.endDateTime.getDate() - day.getDate() == 0 &&227 if (event.endDateTime.getDate() - day.getDate() == 0 &&
228 event.startDateTime.getDate() - day.getDate() == 0) {228 event.startDateTime.getDate() - day.getDate() == 0) {
229 hour = event.startDateTime.getHours();229 hour = event.startDateTime.getHours();
230 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight230 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
231 durationMin = (event.endDateTime.getHours() - event.startDateTime.getHours()) * 60;231 durationMin = (event.endDateTime.getHours() - event.startDateTime.getHours()) * 60;
232 durationMin += (event.endDateTime.getMinutes() - event.startDateTime.getMinutes());232 durationMin += (event.endDateTime.getMinutes() - event.startDateTime.getMinutes());
233 }233 }
234 if (event.endDateTime.getDate() - day.getDate() == 0 &&234 if (event.endDateTime.getDate() - day.getDate() == 0 &&
235 event.startDateTime.getDate() - day.getDate() < 0) {235 event.startDateTime - day < 0) {
236 hour = 0;236 hour = 0;
237 yPos = 0;237 yPos = 0;
238 durationMin = event.endDateTime.getHours() * 60;238 durationMin = event.endDateTime.getHours() * 60;
239 durationMin += event.endDateTime.getMinutes();239 durationMin += event.endDateTime.getMinutes();
240 }240 }
241 if (event.endDateTime.getDate() - day.getDate() > 0 &&241 if (event.startDateTime.getDate() - day.getDate() == 0 &&
242 event.startDateTime.getDate() - day.getDate() == 0) {242 event.endDateTime - day > Date.msPerDay) {
243 hour = event.startDateTime.getHours();243 hour = event.startDateTime.getHours();
244 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight244 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
245 durationMin = (24 - event.startDateTime.getHours()) * 60;245 durationMin = (24 - event.startDateTime.getHours()) * 60;
246 }246 }
247247 if (event.endDateTime - day > Date.msPerDay &&
248 if (event.endDateTime.getDate() - day.getDate() > 0 &&248 event.startDateTime- day < 0) {
249 event.startDateTime.getDate() - day.getDate() < 0) {
250 hour = 0;249 hour = 0;
251 yPos = 0;250 yPos = 0;
252 durationMin = 24 * 60;251 durationMin = 24 * 60;
253252
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2015-06-16 09:18:21 +0000
+++ po/com.ubuntu.calendar.pot 2015-06-21 08:31:20 +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-16 17:18+0800\n"11"POT-Creation-Date: 2015-06-21 16:27+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,7 +132,7 @@
132msgid "Delete this"132msgid "Delete this"
133msgstr ""133msgstr ""
134134
135#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:183135#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:188
136msgid "Delete"136msgid "Delete"
137msgstr ""137msgstr ""
138138
@@ -185,15 +185,15 @@
185msgid "%1 (All Day)"185msgid "%1 (All Day)"
186msgstr ""186msgstr ""
187187
188#: ../EventDetails.qml:196188#: ../EventDetails.qml:201
189msgid "Edit"189msgid "Edit"
190msgstr ""190msgstr ""
191191
192#: ../EventDetails.qml:347 ../NewEvent.qml:512192#: ../EventDetails.qml:352 ../NewEvent.qml:512
193msgid "Guests"193msgid "Guests"
194msgstr ""194msgstr ""
195195
196#: ../EventDetails.qml:390 ../EventReminder.qml:35 ../NewEvent.qml:609196#: ../EventDetails.qml:395 ../EventReminder.qml:35 ../NewEvent.qml:609
197msgid "Reminder"197msgid "Reminder"
198msgstr ""198msgstr ""
199199

Subscribers

People subscribed via source and target branches

to status/vote changes: