Ubuntu Calendar App

Merge lp://staging/~larochelle-brian/ubuntu-calendar-app/30MinIncrementsHackdays into lp://staging/ubuntu-calendar-app

30MinIncrementsHackdays
Merge into trunk

Proposed by brian larochelle on 2014-03-27

Status:

Superseded

Proposed branch:

lp://staging/~larochelle-brian/ubuntu-calendar-app/30MinIncrementsHackdays

Merge into:

lp://staging/ubuntu-calendar-app

Diff against target:

42 lines (+16/-2)

1 file modified

NewEvent.qml (+16/-2)

To merge this branch:

bzr merge lp://staging/~larochelle-brian/ubuntu-calendar-app/30MinIncrementsHackdays

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Kunal Parmar		2014-03-27	Needs Fixing on 2014-03-27
Review via email: mp+213056@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-03-26.

This proposal has been superseded by a proposal from 2014-03-27.

Description of the change

Added logic to NewEvent.qml to choose a default of either 0 or 30 for minutes for the TimePicker. If minutes are past 30, an hour is added.

Revision history for this message

Kunal Parmar (pkunal-parmar) wrote on 2014-03-27: Posted in a previous version of this proposal

8 + startTime.defaultHour = (startDate.getMinutes() < 30) ? startDate.getHours() : startDate.getHours() + 1
19 + startTime.defaultMinute = (startDate.getMinutes() < 30) ? 30 : 0
20 + var popupObj = PopupUtils.open(timePicker,root,{"hour": startTime.defaultHour,"minute":startTime.defaultMinute});

Can we move above code to separate function ?

Revision history for this message

brian larochelle (larochelle-brian) wrote on 2014-03-27: Posted in a previous version of this proposal

sure.

I moved the logic to functions off the root of NewEvent {} and changed the ternary statements to if statements to improve readability.

Revision history for this message

Kunal Parmar (pkunal-parmar) wrote on 2014-03-27:

Code looks great, Thanks.

I will test and approve it.

Revision history for this message

Kunal Parmar (pkunal-parmar) wrote on 2014-03-27:

8 - var popupObj = PopupUtils.open(timePicker,root,{"hour": endDate.getHours(),"minute":endDate.getMinutes()});
39 + var popupObj = PopupUtils.open(timePicker,root,{"hour": root.hourForPickerFromDate(startDate),"minute":root.minuteForPickerFromDate(startDate)});