Merge lp:~mihirsoni/ubuntu-calendar-app/1297739 into lp:ubuntu-calendar-app

[Mihir Soni]

Added Repeat options for weekdays.

Added Repeat options for weekdays.

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

289. By Mihir Soni on 2014-05-27

cleande the code

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:289
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/498/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2850
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2850/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/389
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/389/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/332
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/56

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Thanks Mihir. A couple of things I've seen:

21 + property var weekLabel:[i18n.tr("Su"),\
22 + i18n.tr("Mo"),\
23 + i18n.tr("Tu"),\
24 + i18n.tr("We"),\
25 + i18n.tr("Th"),\
26 + i18n.tr("Fr"),\
27 + i18n.tr("Sa")];}', Qt.application, 'weekLabelObj');

Generally translations for week days are provided by Qt and translators don't need to translate them. See http://qt-project.org/doc/qt-5/qml-qtqml-locale.html#dayName-method

42 + val += i18n.tr(days[recurrenceRule[0].daysOfWeek[j]]) + " ,"

Same here, this shouldn't need explicit translation.

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

290. By Mihir Soni on 2014-05-27

Removed translation from weekdays

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:290
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/500/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2852
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2852/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/391
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/391/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/334
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/58

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

review: Approve (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

291. By Mihir Soni on 2014-05-28

resolved margin issues

292. By Mihir Soni on 2014-05-28

uncomment visibility condition

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:292
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/501/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2854
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/393
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/393/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/335
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/59

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

review: Approve (continuous-integration)

[David Planella (dpm)]

So on my last comment I wasn't suggesting to remove translations, but rather to use the http://qt-project.org/doc/qt-5/qml-qtqml-locale.html#dayName-method method to do the translations automatically.

As the branch stands now, the day names will appear in English only.

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

293. By Mihir Soni on 2014-05-28

Added localization form Qt.locale

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:293
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/502/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2855
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2855/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/394/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/394/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/336
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/60

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

review: Needs Fixing (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

294. By Mihir Soni on 2014-05-29

Merge from trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:294
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/504/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2860
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2860/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/338
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/62

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

I dont see these options,

Daily, Weekly, Monthly, Yearly.
Every Weekday
Every Mon, Wed, Fri
Every Tue, Thu

Did you added those ?

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

295. By Mihir Soni on 2014-06-10

added more recurrence options

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:295
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/543/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/480
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/480/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/377
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/101

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

review: Approve (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

296. By Mihir Soni on 2014-06-10

merge from trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:296
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/544/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/483
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/378
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/102

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

review: Approve (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

297. By Mihir Soni on 2014-06-10

This happens will be Weekly for all days of Week

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:297
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/546/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/486
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/486/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/380
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/104

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

@Kunal - are you happy for this to land now?

[Kunal Parmar (pkunal-parmar)]

Getting warning after launching the NewEvent page.

file:///home/kunal/Dropbox/projects/qt/qml/ubuntu/calendar/review/1297739/NewEvent.qml:66: ReferenceError: startTime is not defined

[Kunal Parmar (pkunal-parmar)]

When I selected Weekly option and selected Sunday. its not getting saved and getting following in terminal

Array is

[Kunal Parmar (pkunal-parmar)]

Added some more comments.

review: Needs Fixing

[Mihir Soni (mihirsoni)]

> When I selected Weekly option and selected Sunday. its not getting saved and
> getting following in terminal
>
> Array is

Hi ,
I have modified the logic accordingly, but i observer that there is difference in QT and EDS days index. EDS doesn't consider 0 as Sunday.

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

298. By Mihir Soni on 2014-06-19

Change as per review comments

299. By Mihir Soni on 2014-06-19

merge from trunk

[Mihir Soni (mihirsoni)]

I have incorporated all change as per your comments.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:299
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/558/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/579
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/579/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/116

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Testing this on the desktop. In the week view I created a new event for Mon, Wed, Fri. When I clicked save it didn't save and I see this in the console output:-

virtual QtOrganizer::QOrganizerCollection QOrganizerEDSEngine::defaultCollection(QtOrganizer::QOrganizerManager::Error*) Not implemented

[Mihir Soni (mihirsoni)]

Hi Popey,

this exists in latest merge as well , i this is causing because of some other issue not because of this MR.

I just took latest branch , and created event it shows same in console.

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

300. By Mihir Soni on 2014-06-20

[Mihir Soni (mihirsoni)]

Hi Kunal,

I see , after saving data without sorting , it jumble all the time.

so if i store data ,
  rule.daysOfWeek = [Qt.Monday,Qt.Wednesday,Qt.Friday].sort();

after saving in EventDetails , it displays in different order.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:300
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/560/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/589
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/589/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/118

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I tried navigating to today, created an event and chose "every tuesday and thursday". It created an event today (Friday) and every Tuesday and Thursday.

Is this desired/expected and consistent with other calendars? I tried Google calendar, and if you choose "Every Tues/Thurs" then it doesn't create an event for today (Friday) but only starting next Tuesday.

I'd suggest we should do the same, and similar for Mon-Tues-Weds too.

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

> Hi Kunal,
>
> I see , after saving data without sorting , it jumble all the time.
>
> so if i store data ,
> rule.daysOfWeek = [Qt.Monday,Qt.Wednesday,Qt.Friday].sort();
>
> after saving in EventDetails , it displays in different order.

What i mean is, currently I see you are sorting data when you are saving and you are sorting when you are reading.

I think you need sort operation at one place only. I think sorting while you are saving data should be good enough. I guess we should get sorted data back.

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

301. By Mihir Soni on 2014-06-25

remove sorting from all places

[Mihir Soni (mihirsoni)]

> > Hi Kunal,
> >
> > I see , after saving data without sorting , it jumble all the time.
> >
> > so if i store data ,
> > rule.daysOfWeek = [Qt.Monday,Qt.Wednesday,Qt.Friday].sort();
> >
> > after saving in EventDetails , it displays in different order.
>
> What i mean is, currently I see you are sorting data when you are saving and
> you are sorting when you are reading.
>
> I think you need sort operation at one place only. I think sorting while you
> are saving data should be good enough. I guess we should get sorted data back.

As you mentioned , i modified it but it didn't work well on my machine. Could you suggest me if i have done something wrong ?

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:301
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/564/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/622/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/122/console

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks like we got a new pep8 which is a bit more strict on comments. Can you fix those?

[Mihir Soni (mihirsoni)]

Hi Kunal,

I tried to create an event on Sat , for weekely repeat option , Mon-Wed-Fri

Actual output :-

It created event on Sat, Mon-Wed-Fri.

Expected output :-

It should create an event starting from coming Mon-Wed-Fri instead of creating on Sat.

Also, if you observe the daysOfWeek sorting it got changed too.

as per last discussion here is the dump of event :

Before saving :-

objectName ->
modified -> true
itemType -> 502
itemDetails -> [object Object]
itemId -> qtorganizer:::
manager ->
collectionId -> qtorganizer:::
description -> This event should starts from coming Monday
displayLabel -> Mon-Wed-Fri
guid ->
allDay -> false
startDateTime -> Sat Jun 28 07:30:00 2014 GMT+0530
endDateTime -> Sat Jun 28 08:00:00 2014 GMT+0530
priority -> 0
recurrence -> QDeclarativeOrganizerItemRecurrence(0x44d3b40)
limit:10
frequency:2
DaysofWeek:1,3,5
location ->

After Saving :

modified -> false
itemType -> 502
itemDetails -> [object Object]
itemId -> qtorganizer:eds::system-calendar/20140627T191347Z-10202-1000-2278-3@mihir-ThinkPad
manager -> qtorganizer:eds:
collectionId -> qtorganizer:eds::system-calendar
description -> This event should starts from coming Monday
displayLabel -> Mon-Wed-Fri
guid -> 20140627T191347Z-10202-1000-2278-3@mihir-ThinkPad
allDay -> false
startDateTime -> Sat Jun 28 07:30:00 2014 GMT+0530
endDateTime -> Sat Jun 28 08:00:00 2014 GMT+0530
priority -> 0
recurrence -> QDeclarativeOrganizerItemRecurrence(0x2a71600)
limit:10
frequency:2
DaysofWeek:3,1,5
location ->
attendees -> [object Object]

I have removed blank keys to make it more visible

[Kunal Parmar (pkunal-parmar)]

Hi,

Following line
event.recurrence.recurrenceRules = [rule];

should be inside below Condition.
if( event.itemType === Type.Event )

It looks like bug in original code, Can you check ?

[Kunal Parmar (pkunal-parmar)]

Following code needs to be move to separate function.

166 + switch(recurrenceOption.selectedIndex){
167 + case 2:
168 + rule.daysOfWeek = [Qt.Monday,Qt.Tuesday,Qt.Wednesday,Qt.Thursday,Qt.Friday];
169 + break;
170 + case 3:
171 + rule.daysOfWeek = [Qt.Monday,Qt.Wednesday,Qt.Friday];
172 + break;
173 + case 4:
174 + rule.daysOfWeek = [Qt.Tuesday,Qt.Thursday];
175 + break;
176 + case 5:
177 + rule.daysOfWeek = weekDays.length === 0 ? [date.getDay()] : weekDays.sort();
178 + break;
179 + }

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

>
> Also, if you observe the daysOfWeek sorting it got changed too.

In that case, just sort when reading the value. as while inserting sorting order is not preserved anyway.

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

302. By Mihir Soni on 2014-06-28

changes as per review comments

303. By Mihir Soni on 2014-06-28

Merge from trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:303
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/583/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/719
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/141

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

review: Approve (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

304. By Mihir Soni on 2014-06-28

moved daysOfWeek into function

305. By Mihir Soni on 2014-06-28

removed hard code values from Enum values

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:305
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/584/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/720
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/142

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

review: Approve (continuous-integration)

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

306. By Mihir Soni on 2014-06-28

Removed typos

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:306
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/585/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/721
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/721/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/143

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Thanks, added few more comments

review: Needs Fixing

[lp:~mihirsoni/ubuntu-calendar-app/1297739]

307. By Mihir Soni on 2014-07-01

Changes as per review comments

308. By Mihir Soni on 2014-07-01

resolved typo

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:307
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/586/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/727
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/727/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/144

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I just tried this branch on device. Created an event for today, repeating for Tuesday and Thursday only. It appears in my calendar on Friday, and every Friday.

review: Needs Fixing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:308
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/587/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/728
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/728/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/145

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

review: Needs Fixing (continuous-integration)

[Mihir Soni (mihirsoni)]

I have observed this was wondering it is something with wrong with my machine.
But if we look at event Details, it shows proper information including of recurrence.
I am still investigating this issue.

[Mihir Soni (mihirsoni)]

This MR is blocked on eds bug #1336880

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:308
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/611/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1010
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1010/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/169

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Based on the comments from Renato on the linked bug I'm approving this.

review: Approve

[David Planella (dpm)]

Top-approving after discussion with popey.

review: Approve

=== modified file 'Defines.js'
--- Defines.js	2014-04-13 10:24:08 +0000
+++ Defines.js	2014-07-01 09:17:37 +0000
@@ -17,9 +17,18 @@
 
 var recurrenceLabel = getRecurrenceLabels();
 var limitLabel = getLimitLabels();
+var weekLabel = getWeekLabels();
+// It contains multiple weekly entries to handle following occurence
+//1.Every Weekday (Monday to Friday
+//2.Every Monday, Wednesday and Friday
+//3.Every Tuesday and Thursday
+//4.Weekly
 var recurrenceValue = [ QtPim.RecurrenceRule.Invalid,
     QtPim.RecurrenceRule.Daily,
     QtPim.RecurrenceRule.Weekly,
+    QtPim.RecurrenceRule.Weekly,
+    QtPim.RecurrenceRule.Weekly,
+    QtPim.RecurrenceRule.Weekly,
     QtPim.RecurrenceRule.Monthly,
     QtPim.RecurrenceRule.Yearly];
 
@@ -48,6 +57,9 @@
         QtObject {\
             property var recurrenceLabel:[i18n.tr("Once"),\
                 i18n.tr("Daily"),\
+                i18n.tr("Every Weekday (Monday to Friday)"),\
+                i18n.tr("Every Monday, Wednesday and Friday"),\
+                i18n.tr("Every Tuesday and Thursday"),\
                 i18n.tr("Weekly"),\
                 i18n.tr("Monthly"),\
                 i18n.tr("Yearly")];}', Qt.application, 'RecurrenceLabelObj');
@@ -62,3 +74,17 @@
                 i18n.tr("After Date")];}', Qt.application, 'LimitLabelObj');
     return object.limitLabel;
 }
+function getWeekLabels(){
+    var object = Qt.createQmlObject('\
+        import QtQuick 2.0;\
+        import Ubuntu.Components 0.1;\
+        QtObject {\
+            property var weekLabel:[Qt.locale().dayName(7,Locale.NarrowFormat),\
+                                    Qt.locale().dayName(1,Locale.NarrowFormat),\
+                                    Qt.locale().dayName(2,Locale.NarrowFormat),\
+                                    Qt.locale().dayName(3,Locale.NarrowFormat),\
+                                    Qt.locale().dayName(4,Locale.NarrowFormat),\
+                                    Qt.locale().dayName(5,Locale.NarrowFormat),\
+                                    Qt.locale().dayName(6,Locale.NarrowFormat)];}', Qt.application, 'weekLabelObj');
+    return object.weekLabel;
+}

=== modified file 'EventDetails.qml'
--- EventDetails.qml	2014-06-27 00:03:24 +0000
+++ EventDetails.qml	2014-07-01 09:17:37 +0000
@@ -27,6 +27,7 @@
     title: "Event Details"
 
     Component.onCompleted: {
+
         showEvent(event);
     }
 
@@ -56,13 +57,27 @@
                 }
 
                 index =  recurrenceRule[0].frequency ;
+                if(index === RecurrenceRule.Weekly ){
+                    var sorted = recurrenceRule[0].daysOfWeek.sort();
+                    var val = i18n.tr("Every ")
+                    for(var j=0;j<sorted.length;++j){
+                        val += Qt.locale().dayName(sorted[j],Locale.LongFormat) + " ,"
+                    }
+                    weekDaysHeader.value = val.slice(0,-1) // Trim last comma from the string
+                    weekDaysHeader.visible = true;
+                }
             }
             else{
                 limitHeader.visible = false
                 index = 0
             }
         }
-        recurrentHeader.value = Defines.recurrenceLabel[index];
+        // This happens will be weekly in following cases:
+        // 1. Weekdays Monday to Friday
+        // 2. Monday,Wednesday,Friday
+        // 3. Tuesday & Thursday
+        // 4. Manual weekdays
+        recurrentHeader.value = Defines.recurrenceLabel[index === RecurrenceRule.Weekly ? 5 : index];
     }
 
     function updateContacts(event) {
@@ -353,7 +368,7 @@
 
             //Guest Entries ends
             ThinDivider{}
-            property int recurranceAreaMaxWidth: Math.max( recurrentHeader.headerWidth, reminderHeader.headerWidth,limitHeader.headerWidth) //Dynamic Height
+            property int recurranceAreaMaxWidth: Math.max( recurrentHeader.headerWidth, reminderHeader.headerWidth,weekDaysHeader.headerWidth,limitHeader.headerWidth) //Dynamic Height
             EventDetailsInfo{
                 id: recurrentHeader
                 xMargin: column.recurranceAreaMaxWidth
@@ -365,10 +380,17 @@
                 header: i18n.tr("Remind me")
             }
             EventDetailsInfo{
+                id: weekDaysHeader
+                xMargin: column.recurranceAreaMaxWidth
+                header: i18n.tr("Repeats On");
+                visible: false
+            }
+            EventDetailsInfo{
                 id: limitHeader
                 xMargin: column.recurranceAreaMaxWidth
                 header: i18n.tr("Repetition Ends")
             }
+
         }
     }
 }

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-06-26 22:48:45 +0000
+++ NewEvent.qml	2014-07-01 09:17:37 +0000
@@ -101,7 +101,8 @@
             if(e.recurrence ) {
                 var recurrenceRule = e.recurrence.recurrenceRules;
                 index = ( recurrenceRule.length > 0 ) ? recurrenceRule[0].frequency : 0;
-                if(index > 0 ){
+                if(index > 0 )
+                {
                     limit.visible = true;
                     if(recurrenceRule[0].limit !== undefined){
                         var temp = recurrenceRule[0].limit;
@@ -118,6 +119,15 @@
                         // If limit is infinite
                         limitOptions.selectedIndex = 0;
                     }
+                    if(index === RecurrenceRule.Weekly){
+                            index = getWeekDaysIndex(recurrenceRule[0].daysOfWeek.sort());
+                    }
+                    if(recurrenceRule[0].daysOfWeek.length>0 && index === 5){
+                        for(var j = 0;j<recurrenceRule[0].daysOfWeek.length;++j){
+                            //Start childern after first element.
+                            weeksRow.children[recurrenceRule[0].daysOfWeek[j]+1].checked = true;
+                        }
+                    }
                 }
             }
             recurrenceOption.selectedIndex = index;
@@ -132,7 +142,26 @@
         }
         reminderOption.selectedIndex = index;
     }
+    function getWeekDaysIndex(daysOfWeek){
+        var index = 0;
+        if(compareArrays(daysOfWeek,[Qt.Monday,Qt.Tuesday,Qt.Wednesday,Qt.Thursday,Qt.Friday]))
+            index = 2
+        else if(compareArrays(daysOfWeek,[Qt.Monday,Qt.Wednesday,Qt.Friday]))
+            index = 3
+        else if(compareArrays(daysOfWeek,[Qt.Tuesday,Qt.Thursday]))
+            index = 4
+        else
+            index = 5
+        return index;
+    }
 
+    function compareArrays(daysOfWeek, actualArray){
+        if (daysOfWeek.length !== actualArray.length) return false;
+        for (var i = 0; i < actualArray.length; i++) {
+            if (daysOfWeek[i] !== actualArray[i]) return false;
+        }
+        return true;
+    }
     //Save the new or Existing event
     function saveToQtPim() {
         internal.clearFocus()
@@ -159,8 +188,8 @@
                 var recurrenceRule = Defines.recurrenceValue[ recurrenceOption.selectedIndex ];
                 var rule = Qt.createQmlObject("import QtOrganizer 5.0; RecurrenceRule {}", event.recurrence,"NewEvent.qml");
                 if( recurrenceRule !== RecurrenceRule.Invalid ) {
-
                     rule.frequency = recurrenceRule;
+                    rule.daysOfWeek = getDaysOfWeek();
                     if(limitOptions.selectedIndex === 1 && recurrenceOption.selectedIndex > 0){
                         rule.limit =  parseInt(limitCount.text);
                     }
@@ -171,8 +200,9 @@
                         rule.limit = undefined;
                     }
                 }
+                event.recurrence.recurrenceRules = [rule];
             }
-            event.recurrence.recurrenceRules = [rule];
+
             //remove old reminder value
             var oldVisualReminder = event.detail(Detail.VisualReminder);
             if(oldVisualReminder) {
@@ -199,11 +229,28 @@
                 audibleReminder.secondsBeforeStart = reminderTime;
                 event.setDetail(audibleReminder);
             }
-
             model.saveItem(event);
             pageStack.pop();
         }
     }
+    function getDaysOfWeek(){
+        var daysOfWeek = [];
+        switch(recurrenceOption.selectedIndex){
+        case 2:
+            daysOfWeek = [Qt.Monday,Qt.Tuesday,Qt.Wednesday,Qt.Thursday,Qt.Friday];
+            break;
+        case 3:
+            daysOfWeek = [Qt.Monday,Qt.Wednesday,Qt.Friday];
+            break;
+        case 4:
+            daysOfWeek = [Qt.Tuesday,Qt.Thursday];
+            break;
+        case 5:
+            daysOfWeek = internal.weekDays.length === 0 ? [date.getDay()] : internal.weekDays;
+            break;
+        }
+        return daysOfWeek;
+    }
 
     function openDatePicker (element, caller, callerProperty, mode) {
         element.highlighted = true;
@@ -467,6 +514,42 @@
                     containerHeight: itemHeight * 4
                 }
             }
+
+            Row {
+                id:weeksRow
+                width: parent.width
+                spacing: units.gu(4)
+                anchors.margins: units.gu(1)
+                visible: recurrenceOption.selectedIndex == 5
+                Label {
+                    text: i18n.tr("Repeats On:")
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+                Repeater{
+                    model: Defines.weekLabel
+                    width: parent.width
+                    CheckBox {
+                        id: weekCheck
+                        anchors.verticalCenter: parent.verticalCenter
+                        onCheckedChanged: {
+                            //EDS consider 7 as Sunday index so if the index is 0 then we have to explicitly push Sunday.
+                            if(index === 0)
+                                (checked) ? internal.weekDays.push(Qt.Sunday) : internal.weekDays.splice(internal.weekDays.indexOf(Qt.Sunday),1);
+                            else
+                                (checked) ? internal.weekDays.push(index) : internal.weekDays.splice(internal.weekDays.indexOf(index),1);
+                        }
+                        checked: {
+                            (internal.weekDays.length === 0 && index === date.getDay() && isEdit== false) ? true : false;
+                        }
+                        Label{
+                            id:lbl
+                            text:modelData
+                            anchors.centerIn: parent
+                            width: parent.width + units.gu(7)
+                        }
+                    }
+                }
+            }
             Item {
                 id: limit
                 visible: recurrenceOption.selectedIndex != 0
@@ -563,7 +646,7 @@
 
     QtObject {
         id: internal
-
+        property var weekDays : [];
         function clearFocus() {
             Qt.inputMethod.hide()
             titleEdit.focus = false