1
=== modified file 'EventLayoutHelper.js'
2
--- EventLayoutHelper.js	2014-08-18 16:48:54 +0000
3
+++ EventLayoutHelper.js	2016-02-03 08:03:13 +0000
4
@@ -37,24 +37,13 @@
5
37
    }
37
    }
6
38
}
38
}
7
39
39
8
40
9
41
function getMinutes(time) {
10
42
    return time.getHours() * 60 + time.getMinutes();
11
43
}
12
44
13
45
function getDuration(event) {
14
46
    var start = getMinutes(event.startDateTime);
15
47
    var end = getMinutes(event.endDateTime);
16
48
    return end - start;
17
49
}
18
50
19
51
function processEvents(events) {
40
function processEvents(events) {
20
52
    var array = [];
41
    var array = [];
21
53
    for( var i = 0; i < events.length ; ++i) {
42
    for( var i = 0; i < events.length ; ++i) {
22
54
        var event = events[i]
43
        var event = events[i]
23
55
        var sch = {};
44
        var sch = {};
26
56
        sch["start"] = getMinutes(event.startDateTime);
45
        sch["start"] = event.startDateTime.getTime()
27
57
        sch["duration"] = getDuration(event);
46
        sch["duration"] = event.endDateTime - event.startDateTime
28
58
        sch["id"] = event.id;
47
        sch["id"] = event.id;
29
59
        sch["depth"] = 0;
48
        sch["depth"] = 0;
30
60
        sortedInsert(array,sch);
49
        sortedInsert(array,sch);
31
61
50
32
=== modified file 'TimeLineBase.qml'
33
--- TimeLineBase.qml	2016-01-29 14:35:14 +0000
34
+++ TimeLineBase.qml	2016-02-03 08:03:13 +0000
35
@@ -80,7 +80,7 @@
36
80
        objectName: "separator"
80
        objectName: "separator"
37
81
        width:  bubbleOverLay.width
81
        width:  bubbleOverLay.width
38
82
        visible: false
82
        visible: false
40
83
        z:1
83
        z:10
41
84
    }
84
    }
42
85
85
43
86
    QtObject {
86
    QtObject {
44
@@ -221,28 +221,27 @@
45
221
        if (event.endDateTime - day  == 0)
221
        if (event.endDateTime - day  == 0)
46
222
            return;
222
            return;
47
223
223
50
224
        if (event.endDateTime.getDate() - day.getDate() == 0 &&
224
        if (event.endDateTime.isSameDay(day) &&
51
225
                event.startDateTime.getDate() - day.getDate() == 0) {
225
                event.endDateTime.isSameDay(event.startDateTime)) {
52
226
            hour = event.startDateTime.getHours();
226
            hour = event.startDateTime.getHours();
53
227
            yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
227
            yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
56
228
            durationMin = (event.endDateTime.getHours() - event.startDateTime.getHours()) * 60;
228
            durationMin = (event.endDateTime - event.startDateTime)  / Date.msPerMin;
55
229
            durationMin += (event.endDateTime.getMinutes() - event.startDateTime.getMinutes());
57
230
        }
229
        }
60
231
        if (event.endDateTime.getDate() - day.getDate() == 0 &&
230
        if (!event.startDateTime.isSameDay(day) &&
61
232
                event.startDateTime - day < 0) {
231
                event.endDateTime.isSameDay(day)) {
62
233
            hour = 0;
232
            hour = 0;
63
234
            yPos = 0;
233
            yPos = 0;
64
235
            durationMin = event.endDateTime.getHours() * 60;
234
            durationMin = event.endDateTime.getHours() * 60;
65
236
            durationMin += event.endDateTime.getMinutes();
235
            durationMin += event.endDateTime.getMinutes();
66
237
        }
236
        }
69
238
        if (event.startDateTime.getDate() - day.getDate() == 0 &&
237
        if (event.startDateTime.isSameDay(day) &&
70
239
                event.endDateTime - day >= Date.msPerDay) {
238
                !event.endDateTime.isSameDay(day)) {
71
240
            hour = event.startDateTime.getHours();
239
            hour = event.startDateTime.getHours();
72
241
            yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
240
            yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
73
242
            durationMin = (24 - event.startDateTime.getHours()) * 60;
241
            durationMin = (24 - event.startDateTime.getHours()) * 60;
74
243
        }
242
        }
77
244
        if (event.endDateTime - day  >= Date.msPerDay &&
243
        if (!event.startDateTime.isSameDay(day) &&
78
245
                event.startDateTime- day <= 0) {
244
                !event.endDateTime.isSameDay(day)) {
79
246
            hour = 0;
245
            hour = 0;
80
247
            yPos = 0;
246
            yPos = 0;
81
248
            durationMin = 24 * 60;
247
            durationMin = 24 * 60;
82
249
248
83
=== modified file 'dateExt.js'
84
--- dateExt.js	2015-09-05 05:30:23 +0000
85
+++ dateExt.js	2016-02-03 08:03:13 +0000
86
@@ -17,6 +17,7 @@
87
17
 */
17
 */
88
18
.pragma library
18
.pragma library
89
19
19
90
20
Date.msPerMin = 60000
91
20
Date.msPerDay = 86400e3
21
Date.msPerDay = 86400e3
92
21
Date.msPerWeek = Date.msPerDay * 7
22
Date.msPerWeek = Date.msPerDay * 7
93
22
23
94
23
24
95
=== modified file 'po/com.ubuntu.calendar.pot'
96
--- po/com.ubuntu.calendar.pot	2015-12-06 20:06:50 +0000
97
+++ po/com.ubuntu.calendar.pot	2016-02-03 08:03:13 +0000
98
@@ -8,7 +8,7 @@
99
8
msgstr ""
8
msgstr ""
100
9
"Project-Id-Version: \n"
9
"Project-Id-Version: \n"
101
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
103
11
"POT-Creation-Date: 2015-11-01 10:45+0900\n"
11
"POT-Creation-Date: 2016-01-11 21:36+0800\n"
104
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
105
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
106
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
Reviewer	Review Type	Date Requested	Status
Jenkins Bot	continuous-integration		Approve on 2016-02-03
Kunal Parmar		2015-11-27	Approve on 2016-01-10
Review via email: mp+278759@code.launchpad.net