Merge lp://staging/~pkunal-parmar/ubuntu-calendar-app/CalManagement into lp://staging/ubuntu-calendar-app
- CalManagement
- Merge into trunk
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Alan Pope πΊπ§π± π¦ | ||||||||
Approved revision: | 247 | ||||||||
Merged at revision: | 354 | ||||||||
Proposed branch: | lp://staging/~pkunal-parmar/ubuntu-calendar-app/CalManagement | ||||||||
Merge into: | lp://staging/ubuntu-calendar-app | ||||||||
Diff against target: |
571 lines (+312/-31) 11 files modified
AgendaView.qml (+9/-24) CalendarChoicePopup.qml (+115/-0) ColorPickerDialog.qml (+45/-0) DayView.qml (+1/-0) EventListModel.qml (+12/-0) MonthComponent.qml (+1/-1) NewEvent.qml (+50/-1) TimeLineBase.qml (+3/-2) TimeLineBaseComponent.qml (+1/-0) WeekView.qml (+2/-0) calendar.qml (+73/-3) |
||||||||
To merge this branch: | bzr merge lp://staging/~pkunal-parmar/ubuntu-calendar-app/CalManagement | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
David Planella | Needs Information | ||
Renato Araujo Oliveira Filho (community) | Approve | ||
Review via email: mp+213355@code.staging.launchpad.net |
Commit message
Calendar management feature added, here is how it looks/works
http://
Note: Following EDS changes are required to test it
https:/
Description of the change
Calendar management feature added, here is how it looks/works
http://
Note: Following EDS changes are required to test it
https:/
- 216. By Kunal Parmar
-
Removed unnecessary code
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:216
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 217. By Kunal Parmar
-
Dummy Commit
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:217
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
I don't understand why this fails in Jenkins. Will ask fginther to review.
Michael Hall (mhall119) wrote : | # |
The links qtorganizer5-eds MP has been approved now
- 218. By Kunal Parmar
-
Merge from Trunk
- 219. By Kunal Parmar
-
Collection filter logic improved
- 220. By Kunal Parmar
-
Minor changes
- 221. By Kunal Parmar
-
Error removed
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:220
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:221
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 222. By Kunal Parmar
-
merge from trunk
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:222
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Victor Thompson (vthompson) wrote : | # |
I get the same failure on the device as Jenkins sees:
Traceback (most recent call last):
File "/home/
self.main_
File "/usr/lib/
return f(instance, *args, **kwargs)
File "/usr/lib/
'Button with objectName "{0}" not found.'
ubuntuuitoolkit
I also get this failure on the device:
=======
ERROR: unittest.
-------
Traceback (most recent call last):
File "/usr/lib/
test.debug()
File "/usr/lib/
getattr(self, self._testMetho
File "/usr/lib/
raise exception
ImportError: Failed to import test module: calendar_
Traceback (most recent call last):
File "/usr/lib/
module = self._get_
File "/usr/lib/
__import__(name)
File "/home/
from dateutil.
ImportError: No module named 'dateutil'
Kunal Parmar (pkunal-parmar) wrote : | # |
> File "/home/
from dateutil.
ImportError: No module named 'dateutil'
For this, I think you need to install dateutil python module.
>'Button with objectName "{0}" not found.'
ubuntuuitoolkit
I am not sure why its not able to find todayButton.
Kunal Parmar (pkunal-parmar) wrote : | # |
BTW if you have some suggestion for colors in Calendar's Color, that we can use, please do, I will add those to color picker.
Victor Thompson (vthompson) wrote : | # |
Thanks, yep, installing python-dateutil fixed the first issue.
I'll look a bit into the second issue.
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
Tested on mako, worked well. Only improvement I can see is maybe reducing the font size in the calendar list as they all seem too large to me and run into the tickbox.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
56 + for(var i=0; i < collections.length ; ++i) {
57 + var collection = collections[i]
58 + if(collection.
59 + collectionIds.
60 + }
61 + }
Should you save even if the collection is un-selected? In case of the user un-select the collection, and want to save that state?
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
> 56 + for(var i=0; i < collections.length ; ++i) {
> 57 + var collection = collections[i]
> 58 + if(collection.
> selected") === true) {
> 59 +
> collectionIds.
> 60 + }
> 61 + }
>
> Should you save even if the collection is un-selected? In case of the user un-
> select the collection, and want to save that state?
Sorry, my bad. Now I understand you are creating the filter.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Just a opinion here:
53 + onTriggered: {
54 + var collectionIds = [];
55 + var collections = calendarsList.
56 + for(var i=0; i < collections.length ; ++i) {
57 + var collection = collections[i]
58 + if(collection.
59 + collectionIds.
60 + }
61 + }
62 +
63 + var calFilter = Qt.createQmlObj
64 + calFilter.ids = collectionIds;
65 + model.filter = calFilter;
66 + pageStack.pop();
67 + }
This will be more QML "friendly" :D if you do something like:
53 + onTriggered: {
54 + var collectionIds = []
55 + var collections = calendarsList.
56 + for(var i=0; i < collections.length ; ++i) {
57 + var collection = collections[i]
58 + if(collection.
59 + collectionIds.
60 + }
61 + }
65 + model.filter.ids = collectionIds;
66 + pageStack.pop();
67 + }
Should not be necessary to recreate the filter every time, you can use the old filter instead.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Where do you save the collection after the user select or unselect it?
This should be saved back in the model.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:222
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Nicholas Skaggs (nskaggs) wrote : | # |
The reason the test is failing is because new events aren't saving properly. Try running the app and making a new event. It doesn't leave the new event screen, no matter how much I press 'save' :-)
Nicholas Skaggs (nskaggs) wrote : | # |
Just affirming trunk does not suffer from this issue. New events can be properly saved.
Kunal Parmar (pkunal-parmar) wrote : | # |
> Tested on mako, worked well. Only improvement I can see is maybe reducing the
> font size in the calendar list as they all seem too large to me and run into
> the tickbox.
ok, will change font to meduim
Kunal Parmar (pkunal-parmar) wrote : | # |
> Where do you save the collection after the user select or unselect it?
> This should be saved back in the model.
If user change the color then I save collection like this
136 + var collection = root.model.
137 + collection.color = color;
138 + root.model.
139 + })
But if user just select and unselect the collection for filtering event. I just do the following.
152 + onCheckedChanged: {
153 + modelData.
154 + }
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Ok, but if the user quit the app and open again? The selected
calendars will be different since you did not save the options.
On Wed, Apr 16, 2014 at 10:12 AM, Kunal Parmar <email address hidden> wrote:
>> Where do you save the collection after the user select or unselect it?
>> This should be saved back in the model.
>
> If user change the color then I save collection like this
>
> 136 + var collection = root.model.
> 137 + collection.color = color;
> 138 + root.model.
> 139 + })
>
> But if user just select and unselect the collection for filtering event. I just do the following.
>
> 152 + onCheckedChanged: {
> 153 + modelData.
> 154 + }
> --
> https:/
> You are requested to review the proposed merge of lp:~pkunal-parmar/ubuntu-calendar-app/CalManagement into lp:ubuntu-calendar-app.
Kunal Parmar (pkunal-parmar) wrote : | # |
> Ok, but if the user quit the app and open again? The selected
> calendars will be different since you did not save the options.
Ok, Then I will save collection when user select/unselect checkbox.
Thanks for pointing it out.
- 223. By Kunal Parmar
-
review
- 224. By Kunal Parmar
-
review comment addressed
- 225. By Kunal Parmar
-
Newevent fix
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:225
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 226. By Kunal Parmar
-
minor changes
- 227. By Kunal Parmar
-
Unnecessary changes removed
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:227
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Albert Astals Cid (aacid) wrote : | # |
The crash looks like qtpim related to me after doing some debugging. https:/
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
looks good
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
I built a package including Albert's patch
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
Have you had a chance to test with the "fixed" qtpim from my ppa?
Kunal Parmar (pkunal-parmar) wrote : | # |
> Have you had a chance to test with the "fixed" qtpim from my ppa?
I tested, but I don't see any difference. I will try once again after system update.
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
Is this blocking on something else? Do we need to get Albert or upstream Qt involved?
David Planella (dpm) wrote : | # |
Changing review as Needs Information as per the last comments
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
I have asked Albert if he can help us debug the crash which is easily reproducible with this branch:-
Grab this branch
Add this ppa https:/
In system system-settings -> online accounts I have 2x google accounts (one personal, one work) which I enabled calendar sync on. (I have also tried with only one account active).
Start the calendar app with qmlscene calendar.qml
After a short while navigating around it crashes:-
(qmlscene:21334): GLib-GObject-
'G_IS_OBJECT (object)' failed
Segmentation fault (core dumped)
Kunal Parmar (pkunal-parmar) wrote : | # |
It crashes on Utopic image as well on device
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
Albert ran this under valgrind and found it's still crashing in qtorganized-eds
==16142== Invalid write of size 8
==16142== at 0x230989DA: RequestData:
==16142== by 0x2308858A: QOrganizerEDSEn
==16142== by 0x1EC266FA: QtOrganizer:
==16142== by 0x21F3A322: ??? (in /usr/lib/
==16142== by 0x21F3AA53: ??? (in /usr/lib/
==16142== by 0x21F42DC4: ??? (in /usr/lib/
==16142== by 0x6ACF22D: QObject:
==16142== by 0x5B03C8B: QApplicationPri
==16142== by 0x5B08E55: QApplication:
==16142== by 0x6AA6C2C: QCoreApplicatio
==16142== by 0x6AA8E06: QCoreApplicatio
==16142== by 0x6AF3CD2: ??? (in /usr/lib/
==16142== Address 0x33ab75c8 is 56 bytes inside a block of size 96 free'd
==16142== at 0x4C2C2BC: operator delete(void*) (vg_replace_
==16142== by 0x23314374: ??? (in /usr/lib/
==16142== by 0x23319FA1: ??? (in /usr/lib/
==16142== by 0x1410EEF6: g_simple_
==16142== by 0x1410EF78: complete_
==16142== by 0x831DCE4: g_main_
==16142== by 0x831E047: g_main_
==16142== by 0x831E0EB: g_main_
==16142== by 0x6AF398B: QEventDispatche
==16142== by 0x23085FC6: QOrganizerEDSEn
==16142== by 0x230989D9: RequestData:
==16142== by 0x2308858A: QOrganizerEDSEn
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
To reproduce
#plug phone in
bzr branch lp:~pkunal-parmar/ubuntu-calendar-app/CalManagement ./ubuntu-
click-buddy --dir ubuntu-
# Setup google account(s) on device and enable calendar sync on them
# Let sync monitor do its thing
# Open calendar app
# Open Calendar management from the bottom toolbar.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
I was unable to reproduce the same crash, using popey steps I go a different crash as you can see in the log bellow:
#1 0xb0d50a50 in ~QDeclarativeOr
#2 cleanup (pointer=0x6c4ce0) at /usr/include/
#3 ~QScopedPointer (this=0x6c4c30, __in_chrg=
#4 QDeclarativeOrg
#5 0xb0d311fc in ~QQmlElement (this=0x6c4c20, __in_chrg=
#6 QQmlPrivate:
#7 0xb6371da0 in QObjectPrivate:
#8 0xb6375fee in QObject::~QObject (this=<optimized out>, __in_chrg=
#9 0xb6ea4588 in QQuickItem:
#10 0xb6f098e2 in ~QQuickImplicit
#11 QQuickLoader:
#12 0xb6eb1950 in ~QQmlElement (this=0x6190b0, __in_chrg=
#13 QQmlPrivate:
#14 0xb6371da0 in QObjectPrivate:
#15 0xb6375fee in QObject::~QObject (this=<optimized out>, __in_chrg=
#16 0xb6ea4588 in QQuickItem:
#17 0xb6eb10cc in ~QQmlElement (this=0x618b58, __in_chrg=
#18 QQmlPrivate:
#19 0xb6d467f6 in QQmlDelegateMod
#20 0xb6d4686c in QQmlDelegateMod
#21 0xb6f02894 in QQuickPathView:
#22 0xb6eb1830 in ~QQmlElement (this=0x55c638, __in_chrg=
#23 QQmlPrivate:
#24 0xb6371da0 in QObjectPrivate:
#25 0xb6375fee in QObject::~QObject (this=<optimized out>, __in_chrg=
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Build a fresh new version of qtpim git fixes the crash, I was unable to reproduce it after install the new version.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
But even after that I did some changes on EDS plugin that could cause the crash described on popey log.
The MR can be found here: https:/
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
Tested this branch with the following ppa enabled as requested by renato. https:/
It all seems to work, I had no crashes. The only big issue is performance. With my personal and work calendars enabled the evolution-
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
The way I tested that was:-
# plug phone in
adb shell touch /userdata/
adb reboot
adb shell
# on phone
add-apt-repository ppa:canonical-
apt-get update
apt-get upgrade
CTRL+D
adb reboot
# Test
- 228. By Kunal Parmar
-
temp commit
- 229. By Kunal Parmar
-
merge from trunk
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:229
http://
Executed test runs:
UNSTABLE: http://
deb: http://
UNSTABLE: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 230. By Kunal Parmar
-
error resolved
- 231. By Kunal Parmar
-
error resolved
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:231
http://
Executed test runs:
UNSTABLE: http://
deb: http://
UNSTABLE: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 232. By Kunal Parmar
-
error resolved
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:232
http://
Executed test runs:
UNSTABLE: http://
deb: http://
UNSTABLE: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
#blocked on EDS crashes
- 233. By Kunal Parmar
-
temp commit
- 234. By Kunal Parmar
-
merge from trunk
- 235. By Kunal Parmar
-
review comment
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:235
http://
Executed test runs:
UNSTABLE: http://
deb: http://
UNSTABLE: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 236. By Kunal Parmar
-
merge from trunk
- 237. By Kunal Parmar
-
merge from trunk
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:237
http://
Executed test runs:
UNSTABLE: http://
deb: http://
UNSTABLE: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
looks like we need some policy rules:
Fail to update collection An AppArmor policy prevents this sender from sending this message to this recipient, 0 matched rules; type="method_call", sender=":1.99" (uid=32011 pid=4871 comm="/
Fail to update collection An AppArmor policy prevents this sender from sending this message to this recipient, 0 matched rules; type="method_call", sender=":1.99" (uid=32011 pid=4871 comm="/
Jamie Strandboge (jdstrand) wrote : | # |
There are a number of apparmor rules for the calendar already-- can you paste the output of 'grep DEN /var/log/syslog' at the time of the denial?
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Jun 3 17:55:12 ubuntu-phablet dbus[1547]: apparmor="DENIED" operation=
Jun 3 17:55:12 ubuntu-phablet dbus[1547]: apparmor="DENIED" operation=
Jun 3 17:55:17 ubuntu-phablet dbus[1547]: apparmor="DENIED" operation=
Jun 3 17:55:17 ubuntu-phablet dbus[1547]: apparmor="DENIED" operation=
Jamie Strandboge (jdstrand) wrote : | # |
In /var/lib/
dbus (receive, send)
bus=session
path=
then do:
$ sudo apparmor_parser -r /var/lib/
and try again?
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
> In /var/lib/
> you add:
> dbus (receive, send)
> bus=session
> path=/org/
>
> then do:
> $ sudo apparmor_parser -r
> /var/lib/
>
> and try again?
Works.
Jamie Strandboge (jdstrand) wrote : | # |
I'll update apparmor-
Jamie Strandboge (jdstrand) wrote : | # |
I've updated apparmor-
Nicholas Skaggs (nskaggs) wrote : | # |
Triggered a rebuild of this. Curious where this stands.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:237
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:237
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Nicholas Skaggs (nskaggs) wrote : | # |
Needs to be rebased with trunk :-)
Text conflict in AgendaView.qml
Text conflict in EventBubble.qml
Text conflict in TimeLineBase.qml
Text conflict in calendar.qml
4 conflicts encountered.
bzr: ERROR: Conflicts from merge
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
Kunal, can you please merge from trunk and we'll get this landed. Thanks!
We are no longer blocked on apparmor I believe as 1.2.4 of apparmor-
#unblocked
Kunal Parmar (pkunal-parmar) wrote : | # |
> Kunal, can you please merge from trunk and we'll get this landed. Thanks!
>
> We are no longer blocked on apparmor I believe as 1.2.4 of apparmor-easyprof-
> ubuntu landed on the phone now.
>
> #unblocked
ok, Glad to know that we can now land this
- 238. By Kunal Parmar
-
merge from trunk
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:238
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 239. By Kunal Parmar
-
merge issue resolved
Kunal Parmar (pkunal-parmar) wrote : | # |
I updated the code, but on device i still see some hangup and freeze after changing calendar filters. Not able to test on desktop. I am on release 87 on device.
Please test and see if you also faces same issue.
And also we need icon for calendars.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Works fine on desktop for me, but the UI is freezing, I did not find any problem in eds code.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:239
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Kunal Parmar (pkunal-parmar) wrote : | # |
> Works fine on desktop for me, but the UI is freezing, I did not find any
> problem in eds code.
Mine is trusty, so I guess i don't have required patches. I think I see the same freezing on phone. but I am not sure as well for what is causing the freeze.
I will check more.
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
I think this is probably down to renato running utopic, and you being on trusty. Can you try in the emulator - which will be utopic - Kunal?
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
This patch fix the problem: http://
This patch will wait for some interval before reload all events, this optimize the app since you are saving all collections individually and you receive the collections changed event for each saved collection. With this patch the reload function will run only once.
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
I strongly suggest this patch for the calendar dialogs: http://
The current implementation is confusing, the edit mode is a dead end since the toolbar disappear and I can not save the changes.
This patch will remove the edit mode and allow the user to change the color by clicking in the color square.
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
Is this now able to proceed with the patch from Renato?
Kunal Parmar (pkunal-parmar) wrote : | # |
> Is this now able to proceed with the patch from Renato?
Hi, my pc broke down. I was not able to test. hopefully I might recover my pc soon and will update about it.
Alan Pope πΊπ§π± π¦ (popey) wrote : | # |
Thanks for letting us know Kunal! Good luck with the PC!
- 240. By Kunal Parmar
-
Timer approach
- 241. By Kunal Parmar
-
commented out code removed
- 242. By Kunal Parmar
-
merge from trunk
- 243. By Kunal Parmar
-
review comment
- 244. By Kunal Parmar
-
added comment
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:244
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 245. By Kunal Parmar
-
removed redudant code
Kunal Parmar (pkunal-parmar) wrote : | # |
I modified the code, now after changing the filter, calendar does not freeze.
But It looks like when I am trying to create UnionFilter with DetailFieldFilter and CollectionFilter,
CollectionFilter does not work.
3 + filter: UnionFilter {
524 + filters: [ collectionFilter /*,eventFilter ,eventOccurence
525 + }
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:245
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 246. By Kunal Parmar
-
merge from trunk
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:246
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 247. By Kunal Parmar
-
merge from trunk
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:247
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
> I modified the code, now after changing the filter, calendar does not freeze.
What exactly do you want with these filters, they does not look correct for me:
Union filter will list events that matches with all filters and you are using a filter that conflict with each other.
id: eventFilter
detail: Detail.ItemType;
field: Type.FieldType
value: Type.Event
}
id: eventOccurenceF
detail: Detail.ItemType;
field: Type.FieldType
value: Type.EventOccur
}
A event can only be one type Type.EventOccur
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
if you want to filter a event that is a EventOccurrence or a Event you should try Intersection filter.
Probably you will need a combination of Union and Intersection filters.
Kunal Parmar (pkunal-parmar) wrote : | # |
Hello,
It looks like I don't understand UnionFilter, what I want is all event that are either event or event occurrence and also belongs to collection which are selected by filter.
Kunal Parmar (pkunal-parmar) wrote : | # |
i understand now,
i tried to correct it here
https:/
can you have a look ?
FAILED: Continuous integration, rev:215 91.189. 93.70:8080/ job/ubuntu- calendar- app-ci/ 347/ 91.189. 93.70:8080/ job/generic- mediumtests- trusty/ 1914 91.189. 93.70:8080/ job/ubuntu- calendar- app-raring- amd64-ci/ 347 91.189. 93.70:8080/ job/ubuntu- calendar- app-saucy- amd64-ci/ 347 91.189. 93.70:8080/ job/ubuntu- calendar- app-trusty- amd64-ci/ 181
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- calendar- app-ci/ 347/rebuild
http://