Ubuntu Calendar App

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

  1. ReminderRepeat
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Merged
Approved by: Kunal Parmar
Approved revision: 694
Merged at revision: 699
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/ReminderRepeat
Merge into: lp:ubuntu-calendar-app
Diff against target: 32 lines (+15/-4)
1 file modified
EventReminder.qml (+15/-4)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/ReminderRepeat
Reviewer Review Type Date Requested Status
Mihir Soni Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+264488@code.launchpad.net

Commit message

Resolves Bug #1470583

Description of the change

Reminder repeat and delay changed
Resolves Bug #1470583

To post a comment you must log in.
lp:~pkunal-parmar/ubuntu-calendar-app/ReminderRepeat updated
694. By Kunal Parmar

log removed

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:694
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1212/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3069
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3069/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/683
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/209

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

review: Approve (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

looks good to me.

review: Approve
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

as its been approved by mihir I am top approving it

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventReminder.qml'
2--- EventReminder.qml 2014-11-11 12:41:18 +0000
3+++ EventReminder.qml 2015-07-12 03:39:23 +0000
4@@ -37,13 +37,24 @@
5 head.backAction: Action{
6 iconName:"back"
7 onTriggered:{
8- visualReminder.repetitionCount = 3;
9- visualReminder.repetitionDelay = 120;
10+ var repeatCount = 3;
11+ var repeatDelay = 5 * 60;
12+
13+ //reminder on event time
14+ if( reminderTime === 0 ) {
15+ repeatCount = 0;
16+ repeatDelay = 0;
17+ } else if( reminderTime === 300) { //5 min
18+ repeatCount = 1;
19+ }
20+
21+ visualReminder.repetitionCount = repeatCount;
22+ visualReminder.repetitionDelay = repeatDelay;
23 visualReminder.message = eventTitle
24 visualReminder.secondsBeforeStart = reminderTime;
25
26- audibleReminder.repetitionCount = 3;
27- audibleReminder.repetitionDelay = 120;
28+ audibleReminder.repetitionCount = repeatCount;
29+ audibleReminder.repetitionDelay = repeatDelay;
30 audibleReminder.secondsBeforeStart = reminderTime;
31
32 pop();

Subscribers

People subscribed via source and target branches

to status/vote changes: