Merge lp:~pkunal-parmar/ubuntu-calendar-app/DefReminderTime into lp:ubuntu-calendar-app

Proposed by Kunal Parmar on 2015-04-29
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2015-05-22
Approved revision: 640
Merged at revision: 650
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/DefReminderTime
Merge into: lp:ubuntu-calendar-app
Diff against target: 60 lines (+11/-10)
2 files modified
NewEvent.qml (+10/-9)
tests/autopilot/calendar_app/tests/test_new_event.py (+1/-1)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/DefReminderTime
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-05-22
Ubuntu Calendar Developers 2015-04-29 Pending
Review via email: mp+257743@code.launchpad.net

Commit message

Resolves Bug #1419001

Setting default reminder time to 15 min

Description of the change

Resolves Bug #1419001

Setting default reminder time to 15 min

To post a comment you must log in.
review: Approve (continuous-integration)

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/507/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2802
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2802/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/292
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/80

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NewEvent.qml'
2--- NewEvent.qml 2015-04-05 04:54:54 +0000
3+++ NewEvent.qml 2015-05-09 02:21:00 +0000
4@@ -224,10 +224,14 @@
5 }
6
7 VisualReminder{
8- id:visualReminder
9+ id: visualReminder
10+ //default reminder time = 15 min
11+ secondsBeforeStart: 900
12 }
13 AudibleReminder{
14- id:audibleReminder
15+ id: audibleReminder
16+ //default reminder time = 15 min
17+ secondsBeforeStart: 900
18 }
19
20 function getDaysOfWeek(){
21@@ -590,9 +594,7 @@
22 id:eventReminder
23 objectName : "eventReminder"
24
25- anchors{
26- left:parent.left
27- }
28+ anchors.left:parent.left
29 showDivider: false
30 progression: true
31 text: i18n.tr("Reminder")
32@@ -603,12 +605,11 @@
33
34 subText:{
35 if(visualReminder.secondsBeforeStart !== -1) {
36- for(var i=0; i<reminderModel.count; i++) {
37- if(visualReminder.secondsBeforeStart === reminderModel.get(i).value)
38+ for( var i=0; i<reminderModel.count; i++ ) {
39+ if(visualReminder.secondsBeforeStart === reminderModel.get(i).value) {
40 return reminderModel.get(i).label
41+ }
42 }
43- } else {
44- reminderModel.get(0).label
45 }
46 }
47
48
49=== modified file 'tests/autopilot/calendar_app/tests/test_new_event.py'
50--- tests/autopilot/calendar_app/tests/test_new_event.py 2014-11-27 17:46:47 +0000
51+++ tests/autopilot/calendar_app/tests/test_new_event.py 2015-05-09 02:21:00 +0000
52@@ -109,7 +109,7 @@
53 self.assertThat(new_event_page.get_is_all_day_event(), Equals(False))
54 self.assertThat(new_event_page.has_guests(), Equals(False))
55 self.assertThat(new_event_page.get_this_happens(), Equals('Once'))
56- self.assertThat(new_event_page.get_reminder(), Equals('On Event'))
57+ self.assertThat(new_event_page.get_reminder(), Equals('15 minutes'))
58
59 expected_start_date = self._expected_start_date()
60 expected_end_date = expected_start_date + datetime.timedelta(hours=1)

Subscribers

People subscribed via source and target branches

to status/vote changes: