ubuntu-touch-coreapps-reviewers team mailing list archive

["Gary.Wang" <Gary.Wang@xxxxxxxxxxxxx>]

Gary.Wang has proposed merging lp:~gary-wzl77/ubuntu-calendar-app/fix_1460433_new into lp:ubuntu-calendar-app.

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

Requested reviews:
  Alan Pope  (popey)

For more details, see:
https://code.launchpad.net/~gary-wzl77/ubuntu-calendar-app/fix_1460433_new/+merge/262357

1.Fix multi-day event displayed issue in weeklyview
2.Show end date time for multi-day event in Event details
-- 
Your team Ubuntu Calendar Developers is subscribed to branch lp:ubuntu-calendar-app.

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2014-11-06 13:14:06 +0000
+++ EventDetails.qml	2015-06-18 15:51:16 +0000
@@ -122,7 +122,12 @@
                 dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
             }
         } else {
-           dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "  + endTime;
+            if (e.endDateTime.getDate() !== e.startDateTime.getDate()) {
+                dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "
+                        + e.endDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) +  ", " + endTime;
+            } else {
+                dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "  + endTime;
+            }
         }
 
         if( e.itemType === Type.EventOccurrence ){

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2015-06-01 08:54:59 +0000
+++ TimeLineBase.qml	2015-06-18 15:51:16 +0000
@@ -232,21 +232,20 @@
                 durationMin += (event.endDateTime.getMinutes() - event.startDateTime.getMinutes());
         }
         if (event.endDateTime.getDate() - day.getDate() == 0 &&
-                event.startDateTime.getDate() - day.getDate() < 0) {
+                event.startDateTime - day < 0) {
                 hour = 0;
                 yPos = 0;
                 durationMin = event.endDateTime.getHours() * 60;
                 durationMin += event.endDateTime.getMinutes();
         }
-        if (event.endDateTime.getDate() - day.getDate() > 0 &&
-                event.startDateTime.getDate() - day.getDate() == 0) {
+        if (event.startDateTime.getDate() - day.getDate() == 0 &&
+                event.endDateTime - day > Date.msPerDay) {
                 hour = event.startDateTime.getHours();
                 yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
                 durationMin = (24 - event.startDateTime.getHours()) * 60;
         }
-
-        if (event.endDateTime.getDate() - day.getDate() > 0 &&
-                event.startDateTime.getDate() - day.getDate() < 0) {
+        if (event.endDateTime - day > Date.msPerDay &&
+                event.startDateTime- day < 0) {
             hour = 0;
             yPos = 0;
             durationMin = 24 * 60;

=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot	2015-06-09 10:45:01 +0000
+++ po/com.ubuntu.calendar.pot	2015-06-18 15:51:16 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-09 18:44+0800\n"
+"POT-Creation-Date: 2015-06-18 23:41+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -77,8 +77,8 @@
 msgid "Syncing"
 msgstr ""
 
-#: ../CalendarChoicePopup.qml:71
-msgid "Add new Calendar"
+#: ../CalendarChoicePopup.qml:70
+msgid "Add online Calendar"
 msgstr ""
 
 #: ../ColorPickerDialog.qml:25
@@ -132,7 +132,7 @@
 msgid "Delete this"
 msgstr ""
 
-#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:183
+#: ../DeleteConfirmationDialog.qml:51 ../EventDetails.qml:188
 msgid "Delete"
 msgstr ""
 
@@ -185,15 +185,15 @@
 msgid "%1 (All Day)"
 msgstr ""
 
-#: ../EventDetails.qml:196
+#: ../EventDetails.qml:201
 msgid "Edit"
 msgstr ""
 
-#: ../EventDetails.qml:347 ../NewEvent.qml:509
+#: ../EventDetails.qml:352 ../NewEvent.qml:509
 msgid "Guests"
 msgstr ""
 
-#: ../EventDetails.qml:390 ../EventReminder.qml:35 ../NewEvent.qml:606
+#: ../EventDetails.qml:395 ../EventReminder.qml:35 ../NewEvent.qml:606
 msgid "Reminder"
 msgstr ""