← Back to branch summary

~renatofilho/ubuntu-calendar-app/optimize

« back to all changes in this revision

Viewing changes to WeekView.qml

  • Committer: Renato Araujo Oliveira Filho
  • Date: 2016-03-01 18:47:39 UTC
  • Revision ID: renato.filho@canonical.com-20160301184739-go6fy3oodrik4pb3
Switching from week to day view will show the first day of the week or the last event start date clicked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WeekView.qml
26
26
    objectName: "weekViewPage"
27
27
 
28
28
    property var anchorDate: new Date();
 
29
    readonly property var anchorFirstDayOfWeek: anchorDate.weekStart(Qt.locale().firstDayOfWeek)
29
30
    readonly property var currentDate: weekViewPath.currentItem.item.startDay
30
 
    readonly property var firstDayOfWeek: anchorDate.weekStart(Qt.locale().firstDayOfWeek);
 
31
    readonly property var currentFirstDayOfWeek: currentDate.weekStart(Qt.locale().firstDayOfWeek)
 
32
 
31
33
    property bool isCurrentPage: false
32
34
    property var selectedDay;
33
35
    property var highlightedDay;
61
63
 
62
64
    onEventCreated: {
63
65
        var eventDate = new Date(event.startDateTime)
 
66
        highlightedDay = eventDate
64
67
        var currentWeekNumber = currentDate.weekNumber(Qt.locale().firstDayOfWeek)
65
68
        var eventWeekNumber = eventDate.weekNumber(Qt.locale().firstDayOfWeek)
66
69
        var needScroll = false
145
148
                TimeLineBaseComponent {
146
149
                    id: timeLineView
147
150
 
148
 
                    startDay: firstDayOfWeek.addDays((weekViewPath.loopCurrentIndex + weekViewPath.indexType(index)) * 7)
 
151
                    startDay: anchorFirstDayOfWeek.addDays((weekViewPath.loopCurrentIndex + weekViewPath.indexType(index)) * 7)
149
152
                    anchors.fill: parent
150
153
                    type: ViewType.ViewTypeWeek
151
154
                    isCurrentItem: parent.PathView.isCurrentItem