← Back to branch summary

~pkunal-parmar/ubuntu-calendar-app/EventBubble-Truncation

« back to all changes in this revision

Viewing changes to NewEvent.qml

  • Committer: Mihir Soni
  • Date: 2014-06-28 13:05:46 UTC
  • mto: This revision was merged to the branch mainline in revision 353.
  • Revision ID: mihirsoni.123@gmail.com-20140628130546-x5qocodnkuu1eu55
changes as per review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
NewEvent.qml
22
22
 
23
23
    property alias scrollY: flickable.contentY
24
24
    property bool isEdit: false
25
 
    property var weekDays : [];
26
25
 
27
26
    onStartDateChanged: {
28
27
        startDateInput.text = Qt.formatDateTime(startDate, "dd MMM yyyy");
61
60
        else{
62
61
            isEdit = true;
63
62
            editEvent(event);
64
 
 
65
63
        }
66
64
    }
67
65
 
101
99
            if(e.recurrence ) {
102
100
                var recurrenceRule = e.recurrence.recurrenceRules;
103
101
                index = ( recurrenceRule.length > 0 ) ? recurrenceRule[0].frequency : 0;
104
 
                if(index > 0 ){
 
102
                if(index > 0 )
 
103
                {
105
104
                    limit.visible = true;
106
105
                    if(recurrenceRule[0].limit !== undefined){
107
106
                        var temp = recurrenceRule[0].limit;
118
117
                        // If limit is infinite
119
118
                        limitOptions.selectedIndex = 0;
120
119
                    }
121
 
                    if(compareArrays(recurrenceRule[0].daysOfWeek,[1,2,3,4,5]))
122
 
                        index = 2
123
 
                    else if(compareArrays(recurrenceRule[0].daysOfWeek,[1,3,5]))
124
 
                        index = 3
125
 
                    else if(compareArrays(recurrenceRule[0].daysOfWeek,[2,4]))
126
 
                        index = 4
127
 
                    else
128
 
                        index = 5
 
120
                    if(index === 5){
 
121
                        if(compareArrays(recurrenceRule[0].daysOfWeek.sort(),[1,2,3,4,5]))
 
122
                            index = 2
 
123
                        else if(compareArrays(recurrenceRule[0].daysOfWeek.sort(),[1,3,5]))
 
124
                            index = 3
 
125
                        else if(compareArrays(recurrenceRule[0].daysOfWeek.sort(),[2,4]))
 
126
                            index = 4
 
127
                    }
129
128
                    if(recurrenceRule[0].daysOfWeek.length>0 && index === 5){
130
129
                        for(var j = 0;j<recurrenceRule[0].daysOfWeek.length;++j){
131
130
                            //Start childern after first element.
176
175
                    event.setDetail(attendee);
177
176
                }
178
177
 
179
 
                var recurrenceRule = Defines.recurrenceValue[(recurrenceOption.selectedIndex >=2 && recurrenceOption.selectedIndex <=5) ? 2 : recurrenceOption.selectedIndex];
 
178
                var recurrenceRule = Defines.recurrenceValue[recurrenceOption.selectedIndex];
180
179
                var rule = Qt.createQmlObject("import QtOrganizer 5.0; RecurrenceRule {}", event.recurrence,"NewEvent.qml");
181
180
                if( recurrenceRule !== RecurrenceRule.Invalid ) {
182
181
                    rule.frequency = recurrenceRule;
191
190
                        rule.daysOfWeek = [Qt.Tuesday,Qt.Thursday];
192
191
                        break;
193
192
                    case 5:
194
 
                        rule.daysOfWeek = weekDays.length === 0 ? [date.getDay()] : weekDays.sort();
 
193
                        rule.daysOfWeek = intern.weekDays.length === 0 ? [date.getDay()] : intern.weekDays;
195
194
                        break;
196
195
                    }
197
196
                    if(limitOptions.selectedIndex === 1 && recurrenceOption.selectedIndex > 0){
232
231
                audibleReminder.secondsBeforeStart = reminderTime;
233
232
                event.setDetail(audibleReminder);
234
233
            }
235
 
 
236
234
            model.saveItem(event);
237
235
            pageStack.pop();
238
236
        }
518
516
                        id: weekCheck
519
517
                        anchors.verticalCenter: parent.verticalCenter
520
518
                        onCheckedChanged: {
 
519
                            //EDS consider 7 as Sunday index so if the index is 0 then we have to explicitly push Sunday.
521
520
                            if(index === 0)
522
 
                                (checked) ? weekDays.push(7) : weekDays.splice(weekDays.indexOf(7),1);
 
521
                                (checked) ? intern.weekDays.push(Qt.Sunday) : intern.weekDays.splice(intern.weekDays.indexOf(Qt.Sunday),1);
523
522
                            else
524
 
                                (checked) ? weekDays.push(index) : weekDays.splice(weekDays.indexOf(index),1);
 
523
                                (checked) ? intern.weekDays.push(index) : intern.weekDays.splice(intern.weekDays.indexOf(index),1);
525
524
                        }
526
525
                        checked: {
527
 
                            (weekDays.length == 0 && index === date.getDay() && isEdit== false) ? true : false;
 
526
                            (intern.weekDays.length == 0 && index === date.getDay() && isEdit== false) ? true : false;
528
527
                        }
529
528
                        Label{
530
529
                            id:lbl
644
643
            messageEdit.focus = false
645
644
        }
646
645
    }
 
646
    QtObject {
 
647
        id: intern
 
648
        property var weekDays : [];
 
649
    }
647
650
}