Ubuntu Calendar App

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

  1. DefReminderTime
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
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
Ubuntu Calendar Developers 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.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:639
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1154/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2677
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2677/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/625
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/151

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1154/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:640
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1162/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2734
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2734/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/633
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/159

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

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/500/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2760
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2760/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/285/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/72/console

review: Needs Fixing (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/505/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2794
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2794/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/290
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/78

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NewEvent.qml'
--- NewEvent.qml 2015-04-05 04:54:54 +0000
+++ NewEvent.qml 2015-05-09 02:21:00 +0000
@@ -224,10 +224,14 @@
224 }224 }
225225
226 VisualReminder{226 VisualReminder{
227 id:visualReminder227 id: visualReminder
228 //default reminder time = 15 min
229 secondsBeforeStart: 900
228 }230 }
229 AudibleReminder{231 AudibleReminder{
230 id:audibleReminder232 id: audibleReminder
233 //default reminder time = 15 min
234 secondsBeforeStart: 900
231 }235 }
232236
233 function getDaysOfWeek(){237 function getDaysOfWeek(){
@@ -590,9 +594,7 @@
590 id:eventReminder594 id:eventReminder
591 objectName : "eventReminder"595 objectName : "eventReminder"
592596
593 anchors{597 anchors.left:parent.left
594 left:parent.left
595 }
596 showDivider: false598 showDivider: false
597 progression: true599 progression: true
598 text: i18n.tr("Reminder")600 text: i18n.tr("Reminder")
@@ -603,12 +605,11 @@
603605
604 subText:{606 subText:{
605 if(visualReminder.secondsBeforeStart !== -1) {607 if(visualReminder.secondsBeforeStart !== -1) {
606 for(var i=0; i<reminderModel.count; i++) {608 for( var i=0; i<reminderModel.count; i++ ) {
607 if(visualReminder.secondsBeforeStart === reminderModel.get(i).value)609 if(visualReminder.secondsBeforeStart === reminderModel.get(i).value) {
608 return reminderModel.get(i).label610 return reminderModel.get(i).label
611 }
609 }612 }
610 } else {
611 reminderModel.get(0).label
612 }613 }
613 }614 }
614615
615616
=== modified file 'tests/autopilot/calendar_app/tests/test_new_event.py'
--- tests/autopilot/calendar_app/tests/test_new_event.py 2014-11-27 17:46:47 +0000
+++ tests/autopilot/calendar_app/tests/test_new_event.py 2015-05-09 02:21:00 +0000
@@ -109,7 +109,7 @@
109 self.assertThat(new_event_page.get_is_all_day_event(), Equals(False))109 self.assertThat(new_event_page.get_is_all_day_event(), Equals(False))
110 self.assertThat(new_event_page.has_guests(), Equals(False))110 self.assertThat(new_event_page.has_guests(), Equals(False))
111 self.assertThat(new_event_page.get_this_happens(), Equals('Once'))111 self.assertThat(new_event_page.get_this_happens(), Equals('Once'))
112 self.assertThat(new_event_page.get_reminder(), Equals('On Event'))112 self.assertThat(new_event_page.get_reminder(), Equals('15 minutes'))
113113
114 expected_start_date = self._expected_start_date()114 expected_start_date = self._expected_start_date()
115 expected_end_date = expected_start_date + datetime.timedelta(hours=1)115 expected_end_date = expected_start_date + datetime.timedelta(hours=1)

Subscribers

People subscribed via source and target branches

to status/vote changes: