ubuntu-touch-coreapps-reviewers team mailing list archive

[Szymon Waliczek <majsterrr@xxxxxxxxx>]

Diff comments:

> 
> === modified file 'EventDetails.qml'
> --- EventDetails.qml	2016-03-02 19:55:52 +0000
> +++ EventDetails.qml	2016-03-09 09:23:12 +0000
> @@ -79,103 +77,124 @@
>          if (event.recurrence) {
>              if(event.recurrence.recurrenceRules[0] !== undefined){
>                  var rule =  event.recurrence.recurrenceRules[0];
> -                repeatLabel.text = eventUtils.getRecurrenceString(rule)
> +                mainEventDetailsLayout.summary.text = eventUtils.getRecurrenceString(rule)
>              } else {
>                  //For event occurs once, event.recurrence.recurrenceRules == []
> -                repeatLabel.text = Defines.recurrenceLabel[0];
> +                mainEventDetailsLayout.summary.text = Defines.recurrenceLabel[0];
>              }
>          }
>      }
>  
>      function updateContacts(event) {
> -        var attendees = event.attendees;
> +        var attendees
> +        var attendingCount, notAttendingCount
> +
> +        attendingCount = 0
> +        notAttendingCount = 0
> +        attendees = event.attendees
> +
>          contactModel.clear();
> +
>          if( attendees !== undefined ) {
>              for (var j = 0 ; j < attendees.length ; ++j) {
> -                var name = attendees[j].name.trim().length === 0 ?
> -                                attendees[j].emailAddress.replace("mailto:";, ""):
> -                                attendees[j].name
> -
> -                contactModel.append( {"name": name,"participationStatus": attendees[j].participationStatus }  );
> +                var name = attendees[j].name.trim().length === 0 ? attendees[j].emailAddress.replace("mailto:";, "")
> +                                                                 : attendees[j].name
> +
> +                // Sort the participating guests by Attending, Not-Attending and No-Reply for easier diaply in the list view.
> +                if(attendees[j].participationStatus === 0) {
> +                    contactModel.insert(attendingCount+notAttendingCount, {"name": name,"participationStatus": attendees[j].participationStatus})
> +                    notAttendingCount++
> +                }
> +
> +                else if(attendees[j].participationStatus === 1) {
> +                    contactModel.insert(attendingCount, {"name": name,"participationStatus": attendees[j].participationStatus})
> +                    attendingCount++
> +                }
> +
> +                else {
> +                    contactModel.append({"name": name,"participationStatus": attendees[j].participationStatus});
> +                }
>              }
>          }
>      }
>  
>      function updateReminder(event) {
> -        var reminder = event.detail( Detail.VisualReminder)
> +        var reminder = event.detail(Detail.VisualReminder)
>          if(reminder) {
>              for(var i=0; i<reminderModel.count; i++) {
>                  if(reminder.secondsBeforeStart === reminderModel.get(i).value) {
> -                    reminderHeader.subText = reminderModel.get(i).label
> +                    reminderLayout.subtitle.text = reminderModel.get(i).label
>                  }
>              }
>          } else {
> -            reminderHeader.subText = reminderModel.get(0).label
> -        }
> -    }
> -
> -    function updateLocation(event) {
> -        if( event.location ) {
> -            locationLabel.text = event.location
> -        }
> -    }
> -
> -    function showEvent(e) {
> +            reminderLayout.subtitle.text = reminderModel.get(0).label
> +        }
> +    }
> +
> +    function getDate(e) {
> +        var dateLabel = null
> +
>          var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
>          var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), Locale.ShortFormat)
> -
> -        var lunarStartDate = null;
> -        var lunarEndDate = null;
> +        var startDay = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat)
> +        var endDay = e.endDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat)
> +
> +        var lunarStartDate = null
> +        var lunarEndDate = null
> +
> +        var allDayString = i18n.tr("(All Day)")

I would do it as follow: var allDayString = "(%1)".arg(i18n.tr("All Day"))
That way translator should not get confused with parentheses.

> +
>          if (mainView.displayLunarCalendar) {
>              lunarStartDate = Lunar.calendar.solar2lunar(e.startDateTime.getFullYear(),
> -                                                   e.startDateTime.getMonth() + 1,
> -                                                   e.startDateTime.getDate())
> +                                                        e.startDateTime.getMonth() + 1,
> +                                                        e.startDateTime.getDate())
>  
>              lunarEndDate = Lunar.calendar.solar2lunar(e.endDateTime.getFullYear(),
> -                                                   e.endDateTime.getMonth() + 1,
> -                                                   e.endDateTime.getDate())
> +                                                      e.endDateTime.getMonth() + 1,
> +                                                      e.endDateTime.getDate())
>          }
>  
>          if( e.allDay ) {
>              var days = Math.floor((e.endDateTime - e.startDateTime) / Date.msPerDay);
>              if( days !== 1 ) {
>                  if (mainView.displayLunarCalendar) {
> -                    dateLabel.text = i18n.tr("%1 %2 %3 - %4 %5 %6 (All Day)")
> -                    .arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn)
> +                    dateLabel = ("%1 %2 %3 - %4 %5 %6").arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn)
>                      .arg(lunarEndDate.gzYear).arg(lunarEndDate .IMonthCn).arg(lunarEndDate.IDayCn)
>                  } else {
> -                    dateLabel.text = i18n.tr("%1 - %2 (All Day)")
> -                    .arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
> -                    .arg( e.endDateTime.addDays(-1).toLocaleDateString(Qt.locale(), Locale.LongFormat))
> +                    dateLabel = ("%1 - %2").arg(startDay).arg(e.endDateTime.addDays(-1).toLocaleDateString(Qt.locale(), Locale.LongFormat))
>                  }
>              } else {
>                  if (mainView.displayLunarCalendar) {
> -                    dateLabel.text = i18n.tr("%1 %2 %3 (All Day)")
> -                    .arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn)
> +                    dateLabel = ("%1 %2 %3").arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn)
>                  } else {
> -                    dateLabel.text = i18n.tr("%1 (All Day)").arg( e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat))
> +                    dateLabel = startDay
>                  }
>              }
> -        } else {
> +
> +            dateLabel = dateLabel.concat(" ", allDayString)
> +        }
> +
> +        else {
>              if (e.endDateTime.getDate() !== e.startDateTime.getDate()) {
>                  if (mainView.displayLunarCalendar) {
> -                    dateLabel.text = i18n.tr("%1 %2 %3, %4 - %5 %6 %7, %8")
> -                    .arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn).arg(startTime)
> +                    dateLabel = ("%1 %2 %3, %4 - %5 %6 %7, %8").arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn).arg(startTime)
>                      .arg(lunarEndDate.gzYear).arg(lunarEndDate .IMonthCn).arg(lunarEndDate.IDayCn).arg(endTime);
>                  } else {
> -                    dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "
> -                            + e.endDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) +  ", " + endTime;
> +                    dateLabel = ("%1, %2 - %3, %4").arg(startDay).arg(startTime).arg(endDay).arg(endTime)
>                  }
>              } else {
>                  if (mainView.displayLunarCalendar) {
> -                    dateLabel.text = i18n.tr("%1 %2 %3, %4 - %5")
> -                    .arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn).arg(startTime).arg(endTime);
> +                    dateLabel = ("%1 %2 %3, %4 - %5").arg(lunarStartDate.gzYear).arg(lunarStartDate .IMonthCn).arg(lunarStartDate.IDayCn).arg(startTime).arg(endTime)
>                  } else {
> -                    dateLabel.text = e.startDateTime.toLocaleDateString(Qt.locale(), Locale.LongFormat) + ", " +startTime + " - "  + endTime;
> +                    dateLabel = ("%1, %2 - %3").arg(startDay).arg(startTime).arg(endTime)
>                  }
>              }
>          }
>  
> +        return dateLabel
> +    }
> +
> +    function showEvent(e) {
>          if( e.itemType === Type.EventOccurrence ){
>              var requestId = -1;
>              model.onItemsFetched.connect( function(id,fetchedItems){


-- 
https://code.launchpad.net/~nik90/ubuntu-calendar-app/revamp-eventdetails-page/+merge/288492
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~nik90/ubuntu-calendar-app/revamp-eventdetails-page into lp:ubuntu-calendar-app.