Merge lp:~renatofilho/ubuntu-calendar-app/fix-1439049 into lp:ubuntu-calendar-app
- fix-1439049
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Arthur Mello |
Approved revision: | 787 |
Merged at revision: | 795 |
Proposed branch: | lp:~renatofilho/ubuntu-calendar-app/fix-1439049 |
Merge into: | lp:ubuntu-calendar-app |
Diff against target: |
269 lines (+92/-52) 1 file modified
calendar.qml (+92/-52) |
To merge this branch: | bzr merge lp:~renatofilho/ubuntu-calendar-app/fix-1439049 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Arthur Mello (community) | Approve | ||
Nekhelesh Ramananthan | Approve | ||
Review via email: mp+289198@code.launchpad.net |
Commit message
Accept 'calendar://*' url as argument on app startup.
This is necessary because url-dispatcher calls the app with uri as an argument if the app is not opened yet.
Description of the change
you need silo 049 to test this:
- 783. By Renato Araujo Oliveira Filho
-
Trunk merged.
- 784. By Renato Araujo Oliveira Filho
-
Accept 'startdate' in the uri handler.
- 785. By Renato Araujo Oliveira Filho
-
Trunk merged.
- 786. By Renato Araujo Oliveira Filho
-
Handle 'startTime' arg on uri.
Make sure that the app opens on day view with the 'startTime' visible when app is called from uri handler.
Arthur Mello (artmello) wrote : | # |
Added some diff comments
- 787. By Renato Araujo Oliveira Filho
-
Removed debug message.
Fixed function name typo.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
> On testing on the device, I found that clicking the event in the indicator
> opens the calendar app in the Day View (nice!) rather than the month/year/week
> view. It also nicely positions the hours close to the event. However it does
> not show the event details page which is critical to fixing this bug.
yes we know that, unfortunately we do not have a API necessary to do this right now. (There is no way to fetch for a specific recurrence). As short term solution we will open the day view page in the event time.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
> Added some diff comments
fixed.
Nekhelesh Ramananthan (nik90) wrote : | # |
> > On testing on the device, I found that clicking the event in the indicator
> > opens the calendar app in the Day View (nice!) rather than the
> month/year/week
> > view. It also nicely positions the hours close to the event. However it does
> > not show the event details page which is critical to fixing this bug.
>
> yes we know that, unfortunately we do not have a API necessary to do this
> right now. (There is no way to fetch for a specific recurrence). As short term
> solution we will open the day view page in the event time.
Based on that reasoning, the MP lgtm.
Nekhelesh Ramananthan (nik90) wrote : | # |
> > On testing on the device, I found that clicking the event in the indicator
> > opens the calendar app in the Day View (nice!) rather than the
> month/year/week
> > view. It also nicely positions the hours close to the event. However it does
> > not show the event details page which is critical to fixing this bug.
>
> yes we know that, unfortunately we do not have a API necessary to do this
> right now. (There is no way to fetch for a specific recurrence). As short term
> solution we will open the day view page in the event time.
Based on that reasoning, the MP lgtm.
Nekhelesh Ramananthan (nik90) : | # |
Preview Diff
1 | === modified file 'calendar.qml' | |||
2 | --- calendar.qml 2016-03-17 17:45:21 +0000 | |||
3 | +++ calendar.qml 2016-03-22 19:00:24 +0000 | |||
4 | @@ -31,6 +31,29 @@ | |||
5 | 31 | property int reminderDefaultValue: 900; | 31 | property int reminderDefaultValue: 900; |
6 | 32 | readonly property bool syncInProgress: commonHeaderActions.syncInProgress | 32 | readonly property bool syncInProgress: commonHeaderActions.syncInProgress |
7 | 33 | 33 | ||
8 | 34 | function handleUri(uri) | ||
9 | 35 | { | ||
10 | 36 | if(uri !== undefined && uri !== "") { | ||
11 | 37 | var commands = uri.split("://")[1].split("="); | ||
12 | 38 | if(commands[0].toLowerCase() === "eventid") { | ||
13 | 39 | // calendar://eventid=?? | ||
14 | 40 | if( eventModel ) { | ||
15 | 41 | // qtorganizer:eds::<event-id> | ||
16 | 42 | var eventId = commands[1]; | ||
17 | 43 | var prefix = "qtorganizer:eds::"; | ||
18 | 44 | if (eventId.indexOf(prefix) < 0) | ||
19 | 45 | eventId = prefix + eventId; | ||
20 | 46 | |||
21 | 47 | eventModel.showEventFromId(eventId); | ||
22 | 48 | } | ||
23 | 49 | } else if (commands[0].toLowerCase() === "startdate") { | ||
24 | 50 | var date = new Date(commands[1]) | ||
25 | 51 | // this will be handled by Tabs.component.completed | ||
26 | 52 | tabs.starttime = date.getTime() | ||
27 | 53 | } | ||
28 | 54 | } | ||
29 | 55 | } | ||
30 | 56 | |||
31 | 34 | // Work-around until this branch lands: | 57 | // Work-around until this branch lands: |
32 | 35 | // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496 | 58 | // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496 |
33 | 36 | //property bool windowActive: typeof window != 'undefined' | 59 | //property bool windowActive: typeof window != 'undefined' |
34 | @@ -100,21 +123,11 @@ | |||
35 | 100 | Connections { | 123 | Connections { |
36 | 101 | target: UriHandler | 124 | target: UriHandler |
37 | 102 | onOpened: { | 125 | onOpened: { |
53 | 103 | var uri = uris[0] | 126 | handleUri(uris[0]) |
54 | 104 | if(uri !== undefined && uri !== "") { | 127 | if (tabs.starttime !== -1) { |
55 | 105 | var commands = uri.split("://")[1].split("="); | 128 | tabs.currentDay = new Date(tabs.starttime); |
56 | 106 | if(commands[0].toLowerCase() === "eventid") { | 129 | tabs.selectedTabIndex = dayTab.index |
57 | 107 | // calendar://eventid=?? | 130 | tabs.starttime = -1 |
43 | 108 | if( eventModel ) { | ||
44 | 109 | // qtorganizer:eds::<event-id> | ||
45 | 110 | var eventId = commands[1]; | ||
46 | 111 | var prefix = "qtorganizer:eds::"; | ||
47 | 112 | if (eventId.indexOf(prefix) < 0) | ||
48 | 113 | eventId = prefix + eventId; | ||
49 | 114 | |||
50 | 115 | eventModel.showEventFromId(eventId); | ||
51 | 116 | } | ||
52 | 117 | } | ||
58 | 118 | } | 131 | } |
59 | 119 | } | 132 | } |
60 | 120 | } | 133 | } |
61 | @@ -240,11 +253,16 @@ | |||
62 | 240 | var requestId = ""; | 253 | var requestId = ""; |
63 | 241 | var callbackFunc = function(id,fetchedItems) { | 254 | var callbackFunc = function(id,fetchedItems) { |
64 | 242 | if( requestId === id && fetchedItems.length > 0 ) { | 255 | if( requestId === id && fetchedItems.length > 0 ) { |
66 | 243 | pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":fetchedItems[0],"model": eventModel}); | 256 | var event = fetchedItems[0] |
67 | 257 | var currentPage = tabs.selectedTab.page.item | ||
68 | 258 | if (currentPage.showDate) { | ||
69 | 259 | currentPage.showDate(event.startDateTime) | ||
70 | 260 | } | ||
71 | 261 | |||
72 | 262 | pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":event,"model": eventModel}); | ||
73 | 244 | } | 263 | } |
74 | 245 | eventModel.onItemsFetched.disconnect( callbackFunc ); | 264 | eventModel.onItemsFetched.disconnect( callbackFunc ); |
75 | 246 | } | 265 | } |
76 | 247 | |||
77 | 248 | eventModel.onItemsFetched.connect( callbackFunc ); | 266 | eventModel.onItemsFetched.connect( callbackFunc ); |
78 | 249 | requestId = eventModel.fetchItems(eventId); | 267 | requestId = eventModel.fetchItems(eventId); |
79 | 250 | } | 268 | } |
80 | @@ -282,8 +300,8 @@ | |||
81 | 282 | 300 | ||
82 | 283 | // Arguments on startup | 301 | // Arguments on startup |
83 | 284 | property bool newevent: false; | 302 | property bool newevent: false; |
86 | 285 | property int starttime: -1; | 303 | property real starttime: -1; |
87 | 286 | property int endtime: -1; | 304 | property real endtime: -1; |
88 | 287 | property string eventId; | 305 | property string eventId; |
89 | 288 | 306 | ||
90 | 289 | //WORKAROUND: The new header api does not work with tabs check bug: #1539759 | 307 | //WORKAROUND: The new header api does not work with tabs check bug: #1539759 |
91 | @@ -380,14 +398,20 @@ | |||
92 | 380 | var starttimepattern = new RegExp ("starttime=\\d+"); | 398 | var starttimepattern = new RegExp ("starttime=\\d+"); |
93 | 381 | var endtimepattern = new RegExp ("endtime=\\d+"); | 399 | var endtimepattern = new RegExp ("endtime=\\d+"); |
94 | 382 | var eventIdpattern = new RegExp ("eventId=.*") | 400 | var eventIdpattern = new RegExp ("eventId=.*") |
95 | 401 | var urlpattern = new RegExp("calendar://.*") | ||
96 | 402 | |||
97 | 403 | if (urlpattern.test(url)) { | ||
98 | 404 | handleUri(url) | ||
99 | 405 | return | ||
100 | 406 | } | ||
101 | 383 | 407 | ||
102 | 384 | newevent = newevenpattern.test(url); | 408 | newevent = newevenpattern.test(url); |
103 | 385 | 409 | ||
104 | 386 | if (starttimepattern.test(url)) | 410 | if (starttimepattern.test(url)) |
106 | 387 | starttime = url.match(/starttime=(\d+)/)[1]; | 411 | starttime = parseInt(url.match(/starttime=(\d+)/)[1]); |
107 | 388 | 412 | ||
108 | 389 | if (endtimepattern.test(url)) | 413 | if (endtimepattern.test(url)) |
110 | 390 | endtime = url.match(/endtime=(\d+)/)[1]; | 414 | endtime = parseInt(url.match(/endtime=(\d+)/)[1]); |
111 | 391 | 415 | ||
112 | 392 | if (eventIdpattern.test(url)) | 416 | if (eventIdpattern.test(url)) |
113 | 393 | eventId = url.match(/eventId=(.*)/)[1]; | 417 | eventId = url.match(/eventId=(.*)/)[1]; |
114 | @@ -396,20 +420,17 @@ | |||
115 | 396 | Component.onCompleted: { | 420 | Component.onCompleted: { |
116 | 397 | // If an url has been set | 421 | // If an url has been set |
117 | 398 | if (args.defaultArgument.at(0)) { | 422 | if (args.defaultArgument.at(0)) { |
118 | 423 | tabs.currentDay = new Date() | ||
119 | 399 | parseArguments(args.defaultArgument.at(0)) | 424 | parseArguments(args.defaultArgument.at(0)) |
120 | 400 | tabs.currentDay = new Date() | ||
121 | 401 | // If newevent has been called on startup | 425 | // If newevent has been called on startup |
122 | 402 | if (newevent) { | 426 | if (newevent) { |
123 | 403 | timer.running = true; | 427 | timer.running = true; |
124 | 404 | } | 428 | } |
125 | 405 | else if (starttime !== -1) { // If no newevent has been setted, but starttime | 429 | else if (starttime !== -1) { // If no newevent has been setted, but starttime |
129 | 406 | var startTime = parseInt(starttime); | 430 | tabs.currentDay = new Date(tabs.starttime); |
127 | 407 | tabs.currentDay = new Date(startTime); | ||
128 | 408 | |||
130 | 409 | // If also endtime has been settend | 431 | // If also endtime has been settend |
131 | 410 | if (endtime !== -1) { | 432 | if (endtime !== -1) { |
134 | 411 | var endTime = parseInt(endtime); | 433 | tabs.selectedTabIndex = calculateDifferenceStarttimeEndtime(tabs.startTime, tabs.endTime); |
133 | 412 | tabs.selectedTabIndex = calculateDifferenceStarttimeEndtime(startTime, endTime); | ||
135 | 413 | } | 434 | } |
136 | 414 | else { | 435 | else { |
137 | 415 | // If no endtime has been setted, open the starttime date in day view | 436 | // If no endtime has been setted, open the starttime date in day view |
138 | @@ -432,6 +453,9 @@ | |||
139 | 432 | else { | 453 | else { |
140 | 433 | tabs.selectedTabIndex = settings.defaultViewIndex; | 454 | tabs.selectedTabIndex = settings.defaultViewIndex; |
141 | 434 | } | 455 | } |
142 | 456 | tabs.starttime = -1 | ||
143 | 457 | tabs.endtime = -1 | ||
144 | 458 | tabs.eventId = "" | ||
145 | 435 | tabs.isReady = true | 459 | tabs.isReady = true |
146 | 436 | // WORKAROUND: Due the missing feature on SDK, they can not detect if | 460 | // WORKAROUND: Due the missing feature on SDK, they can not detect if |
147 | 437 | // there is a mouse attached to device or not. And this will cause the | 461 | // there is a mouse attached to device or not. And this will cause the |
148 | @@ -575,6 +599,11 @@ | |||
149 | 575 | YearView { | 599 | YearView { |
150 | 576 | readonly property bool tabSelected: tabs.selectedTabIndex === yearTab.index | 600 | readonly property bool tabSelected: tabs.selectedTabIndex === yearTab.index |
151 | 577 | 601 | ||
152 | 602 | function showDate(date) | ||
153 | 603 | { | ||
154 | 604 | refreshCurrentYear(date.getFullYear()) | ||
155 | 605 | } | ||
156 | 606 | |||
157 | 578 | reminderValue: mainView.reminderDefaultValue | 607 | reminderValue: mainView.reminderDefaultValue |
158 | 579 | model: eventModel.isReady ? eventModel : null | 608 | model: eventModel.isReady ? eventModel : null |
159 | 580 | bootomEdgeEnabled: tabSelected | 609 | bootomEdgeEnabled: tabSelected |
160 | @@ -597,7 +626,7 @@ | |||
161 | 597 | 626 | ||
162 | 598 | onTabSelectedChanged: { | 627 | onTabSelectedChanged: { |
163 | 599 | if (tabSelected) { | 628 | if (tabSelected) { |
165 | 600 | refreshCurrentYear(tabs.currentDay.getFullYear()) | 629 | showDate(tabs.currentDay) |
166 | 601 | } | 630 | } |
167 | 602 | } | 631 | } |
168 | 603 | } | 632 | } |
169 | @@ -609,6 +638,14 @@ | |||
170 | 609 | MonthView { | 638 | MonthView { |
171 | 610 | readonly property bool tabSelected: tabs.selectedTabIndex === monthTab.index | 639 | readonly property bool tabSelected: tabs.selectedTabIndex === monthTab.index |
172 | 611 | 640 | ||
173 | 641 | function showDate(date) | ||
174 | 642 | { | ||
175 | 643 | anchorDate = new Date(date.getFullYear(), | ||
176 | 644 | date.getMonth(), | ||
177 | 645 | 1, | ||
178 | 646 | 0, 0, 0) | ||
179 | 647 | } | ||
180 | 648 | |||
181 | 612 | reminderValue: mainView.reminderDefaultValue | 649 | reminderValue: mainView.reminderDefaultValue |
182 | 613 | model: eventModel.isReady ? eventModel : null | 650 | model: eventModel.isReady ? eventModel : null |
183 | 614 | bootomEdgeEnabled: tabSelected | 651 | bootomEdgeEnabled: tabSelected |
184 | @@ -632,10 +669,7 @@ | |||
185 | 632 | 669 | ||
186 | 633 | onTabSelectedChanged: { | 670 | onTabSelectedChanged: { |
187 | 634 | if (tabSelected) { | 671 | if (tabSelected) { |
192 | 635 | anchorDate = new Date(tabs.currentDay.getFullYear(), | 672 | showDate(tabs.currentDay) |
189 | 636 | tabs.currentDay.getMonth(), | ||
190 | 637 | 1, | ||
191 | 638 | 0, 0, 0) | ||
193 | 639 | } | 673 | } |
194 | 640 | } | 674 | } |
195 | 641 | } | 675 | } |
196 | @@ -647,6 +681,18 @@ | |||
197 | 647 | WeekView { | 681 | WeekView { |
198 | 648 | readonly property bool tabSelected: tabs.selectedTab === weekTab | 682 | readonly property bool tabSelected: tabs.selectedTab === weekTab |
199 | 649 | 683 | ||
200 | 684 | function showDate(date) | ||
201 | 685 | { | ||
202 | 686 | var dateGoTo = new Date(date) | ||
203 | 687 | if (!anchorDate || | ||
204 | 688 | (dateGoTo.getFullYear() != anchorDate.getFullYear()) || | ||
205 | 689 | (dateGoTo.getMonth() != anchorDate.getMonth()) || | ||
206 | 690 | (dateGoTo.getDate() != anchorDate.getDate())) { | ||
207 | 691 | anchorDate = new Date(dateGoTo) | ||
208 | 692 | } | ||
209 | 693 | delayScrollToDate(dateGoTo) | ||
210 | 694 | } | ||
211 | 695 | |||
212 | 650 | reminderValue: mainView.reminderDefaultValue | 696 | reminderValue: mainView.reminderDefaultValue |
213 | 651 | model: eventModel.isReady ? eventModel : null | 697 | model: eventModel.isReady ? eventModel : null |
214 | 652 | bootomEdgeEnabled: tabSelected | 698 | bootomEdgeEnabled: tabSelected |
215 | @@ -674,16 +720,7 @@ | |||
216 | 674 | 720 | ||
217 | 675 | onTabSelectedChanged: { | 721 | onTabSelectedChanged: { |
218 | 676 | if (tabSelected) { | 722 | if (tabSelected) { |
229 | 677 | // 'tabs.currntDay' can change after set 'anchorDate' to avoid that | 723 | showDate(tabs.currentDay) |
220 | 678 | // create a copy of the current value | ||
221 | 679 | var tabDate = new Date(tabs.currentDay) | ||
222 | 680 | if (!anchorDate || | ||
223 | 681 | (tabs.currentDay.getFullYear() != anchorDate.getFullYear()) || | ||
224 | 682 | (tabs.currentDay.getMonth() != anchorDate.getMonth()) || | ||
225 | 683 | (tabs.currentDay.getDate() != anchorDate.getDate())) { | ||
226 | 684 | anchorDate = new Date(tabDate) | ||
227 | 685 | } | ||
228 | 686 | delayScrollToDate(tabDate) | ||
230 | 687 | } | 724 | } |
231 | 688 | } | 725 | } |
232 | 689 | } | 726 | } |
233 | @@ -695,6 +732,18 @@ | |||
234 | 695 | DayView { | 732 | DayView { |
235 | 696 | readonly property bool tabSelected: tabs.selectedTabIndex === dayTab.index | 733 | readonly property bool tabSelected: tabs.selectedTabIndex === dayTab.index |
236 | 697 | 734 | ||
237 | 735 | function showDate(date) | ||
238 | 736 | { | ||
239 | 737 | var dateGoTo = new Date(date) | ||
240 | 738 | if (!anchorDate || | ||
241 | 739 | (dateGoTo.getFullYear() != anchorDate.getFullYear()) || | ||
242 | 740 | (dateGoTo.getMonth() != anchorDate.getMonth()) || | ||
243 | 741 | (dateGoTo.getDate() != anchorDate.getDate())) { | ||
244 | 742 | anchorDate = new Date(dateGoTo) | ||
245 | 743 | } | ||
246 | 744 | delayScrollToDate(dateGoTo) | ||
247 | 745 | } | ||
248 | 746 | |||
249 | 698 | reminderValue: mainView.reminderDefaultValue | 747 | reminderValue: mainView.reminderDefaultValue |
250 | 699 | model: eventModel.isReady ? eventModel : null | 748 | model: eventModel.isReady ? eventModel : null |
251 | 700 | bootomEdgeEnabled: tabSelected | 749 | bootomEdgeEnabled: tabSelected |
252 | @@ -714,16 +763,7 @@ | |||
253 | 714 | 763 | ||
254 | 715 | onTabSelectedChanged: { | 764 | onTabSelectedChanged: { |
255 | 716 | if (tabSelected) { | 765 | if (tabSelected) { |
266 | 717 | // 'tabs.currntDay' can change after set 'anchorDate' to avoid that | 766 | showDate(tabs.currentDay) |
257 | 718 | // create a copy of the current value | ||
258 | 719 | var tabDate = new Date(tabs.currentDay) | ||
259 | 720 | if (!anchorDate || | ||
260 | 721 | (tabs.currentDay.getFullYear() != anchorDate.getFullYear()) || | ||
261 | 722 | (tabs.currentDay.getMonth() != anchorDate.getMonth()) || | ||
262 | 723 | (tabs.currentDay.getDate() != anchorDate.getDate())) { | ||
263 | 724 | anchorDate = new Date(tabDate) | ||
264 | 725 | } | ||
265 | 726 | delayScrollToDate(tabDate) | ||
267 | 727 | } | 767 | } |
268 | 728 | } | 768 | } |
269 | 729 | } | 769 | } |
On testing on the device, I found that clicking the event in the indicator opens the calendar app in the Day View (nice!) rather than the month/year/week view. It also nicely positions the hours close to the event. However it does not show the event details page which is critical to fixing this bug.