Merge lp:~yohanboniface/ubuntu-calendar-app/AgendaView into lp:ubuntu-calendar-app

[ybon]

Basic version of a AgendaView (flat ordered list of incoming events).
Need autopilot tests.
See http://imgur.com/BodtxLK for a preview.

Basic version of a AgendaView (flat ordered list of incoming events).
Need autopilot tests.
See http://imgur.com/BodtxLK for a preview.

[Kunal Parmar (pkunal-parmar)]

16 + property var model;

This looks like private variable for this view.
Can we shift it to internal QtObject like, and use that
QtObject{
 id: internal
 property var model;
}

[Kunal Parmar (pkunal-parmar)]

+Item {
13 + id: root
14 + objectName: "AgendaView"

Can you make this a Page? I am planning to make other Views also a Page, to make those loaded using Loader on demand.

[Kunal Parmar (pkunal-parmar)]

+ Column {
35 + id: column
36 + anchors.top: parent.top
37 + anchors.topMargin: units.gu(1.5)
38 + width: parent.width; height: parent.height
39 + spacing: units.gu(1)
40 +
41 + anchors.fill: parent

I think If we are using anchors.fill, then we don't need to set width and height.

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

+ Component.onCompleted: {
44 + model = GlobalModel.gloablModel();
45 + model.reloaded.connect(buildList);
46 + }

As we are loading whole year's events using buildList, I suspect there will be performance problem, might hang UI if there are many events.

I think for this case it might be better to use separate OrganizerModel for agenda view, then you will not need to populate model your self and also it will not rebuild model in case of addition or deletion of event.

But I need to consult EDS developer for the same.

[lp:~yohanboniface/ubuntu-calendar-app/AgendaView]

202. By ybon on 2014-03-25

Merged from trunk

203. By ybon on 2014-03-25

Use QtObject instead of item property

204. By ybon on 2014-03-26

Replace Item by Page

205. By ybon on 2014-03-26

No need to width/height when using anchors.fill

[Kunal Parmar (pkunal-parmar)]

54 + var itemIds = intern.model.itemIds(new Date().midnight());

as per discussion here
https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1298239

In agenda view, we decided to show events only for one month, can you address that.

Rest of changes looks good to me

[ybon (yohanboniface)]

Sure, I will try to take time today for this.

[Kunal Parmar (pkunal-parmar)]

121 + Tab {
122 + objectName: "agendaTab"
123 + title: i18n.tr("Agenda")
124 + page: Page {
125 + anchors.fill: parent
126 + tools: commonToolBar
127 + AgendaView {
128 + id: agendaView
129 + anchors.fill: parent
130 + }
131 + }
132 + }

Agenda view is already a Page, we need not create another Page container for agenda view.

[Kunal Parmar (pkunal-parmar)]

145 +Date.prototype.formatTime = function (d) {
146 + // TRANSLATORS: this is a time formatting string,
147 + // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
148 + var format = qsTr("hh:mm");
149 + return Qt.formatTime(this, format);
150 +}

I was suggested to use following for time date translation, can you also use the same.

        var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
        var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), timeFormat);

BTW above code is from EventDetails.

[ybon (yohanboniface)]

Oh, you're right. But then what was you expecting me to do with this comment: https://code.launchpad.net/~yohanboniface/ubuntu-calendar-app/AgendaView/+merge/212164/comments/501716 ?

[Kunal Parmar (pkunal-parmar)]

> Oh, you're right. But then what was you expecting me to do with this comment:
> https://code.launchpad.net/~yohanboniface/ubuntu-calendar-
> app/AgendaView/+merge/212164/comments/501716 ?

so, I wanted to you make root element of AgendaView a Page.

12 +Page {
13 + id: root
14 + objectName: "AgendaView"

Which you already did, I have no further comment there.

But, you are creating a Page and putting AgendaView ( which is also a page) inside this page, which is not necessary.
        + page: Page {
125 + anchors.fill: parent
126 + tools: commonToolBar
127 + AgendaView {

so, I think we can directly put AgendaView inside tab, instead of creating intermediate page. Like

+ Tab {
122 + objectName: "agendaTab"
123 + title: i18n.tr("Agenda")
124 + page: AgendaView {
                                  tools: commonToolBar
                                  // and rest of necessary properties
                             }

[lp:~yohanboniface/ubuntu-calendar-app/AgendaView]

206. By ybon on 2014-03-29

Use an Item for AgendaView for now

207. By ybon on 2014-03-29

Pick only next month events in AgendaView

[ybon (yohanboniface)]

I've reverted the Page thing to Item for now. I see that in the trunk it's not cleaned yet, so I suggest not to mix MR and to fix Tab/Page structure once for all in a dedicate branch.

[ybon (yohanboniface)]

If I replace
Date.prototype.formatDate = function () {
    // TRANSLATORS: this is a date formatting string,
    // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
    var format = qsTr("dd MMMM yyyy");
    return Qt.formatDate(this, format);
}

by

Date.prototype.formatDate = function () {
    this.toLocaleTimeString(Qt.locale(), "dd MMMM yyyy");
    return this;
}

I only have raw date printed.
It may be that Qt.locale() without argument is not finding any default.

[Kunal Parmar (pkunal-parmar)]

>
> Date.prototype.formatDate = function () {
> this.toLocaleTimeString(Qt.locale(), "dd MMMM yyyy");
> return this;
> }
>
> I only have raw date printed.
> It may be that Qt.locale() without argument is not finding any default.

ok, I will have a look then

[Kunal Parmar (pkunal-parmar)]

I missed something in original comment,

        var timeFormat = i18n.tr("hh:mm");
        var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), timeFormat);
        var endTime = e.endDateTime.toLocaleTimeString(Qt.locale(), timeFormat);

I was suggested to use i18n.tr() instead of qsTr(), and format date/time as shown in above code.

but I am not able to figure out how to use i18n.tr from using from JS.
How about using code similar to above from QML directly for now ?
and then take help from some expert for how to move formating code to JS lib and use i18n.tr from JS,

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:207
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/352/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1924
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/352
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/352
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/186

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/352/rebuild

review: Approve (continuous-integration)

[Roman Shchekin (mrqtros)]

section property can be reformatted:

section {
    property:
    ...
}

[ybon (yohanboniface)]

@Kunal: I suggest to keep code DRY and well organised/separated, and thus to keep the Date custom methods in DateExt (instead of putting generic functions in a qml file), and to update there when we know how to properly handle date localization in JavaScript. Thoughts?

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:208
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/356/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1935
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/356
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/356
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/190

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/356/rebuild

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

> @Kunal: I suggest to keep code DRY and well organised/separated, and thus to
> keep the Date custom methods in DateExt (instead of putting generic functions
> in a qml file), and to update there when we know how to properly handle date
> localization in JavaScript. Thoughts?

I personally would prefer correctness over structure of code. Not to say that your code is not correct, but as I said
earlier, I was suggested to use following over Qt.formatDate, so I will suggest you to use the same.

        var timeFormat = i18n.tr("hh:mm");
        var startTime = e.startDateTime.toLocaleTimeString(Qt.locale(), timeFormat)

But if you must use function then I have following suggestion.
- Create a QtObject and move format function there, like done in Defines.js, getReminderLabels() function. that will allow usage of i18n.tr with toLocaleTimeString.

- now that we are using toLocaleTimeString, we can have only single format function that takes DATE/TIME format as argument and we can have constant with well defined name and use function with those constants.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good, but I'm not sure I need to see my alarms in there, or indeed where they're coming from..?

http://imgur.com/OK9MbMK

[ybon (yohanboniface)]

@kunal: ok, will do before next moon ;)
@popey: don't you have the alarm showing also on other views?

[Alan Pope 🍺🐧🐱 🦄 (popey)]

@ybon, no.

[lp:~yohanboniface/ubuntu-calendar-app/AgendaView]

208. By ybon on 2014-04-10

Merge with trunk

209. By ybon on 2014-04-10

merge

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:209
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/380/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2032
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/380
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/380
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/214

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/380/rebuild

review: Approve (continuous-integration)

[ybon (yohanboniface)]

One curious thing about i18n.tr() and JavaScript is that I'm able to use it directly in the JavaScript file in OSMTouch, but not in Calendar. See http://bazaar.launchpad.net/~yohanboniface/osmtouch/trunk/view/head:/components/Categories.js
I need to investigate this.

[ybon (yohanboniface)]

@popey: I've merged with trunk, can you please try again and see if alarm things are still shown?

[Victor Thompson (vthompson)]

I just tested from trunk and I see my Clock alarms as well: http://imgur.com/QPBTd0q

Only the "Test" and "Test2" events should have been shown.

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

 + Component.onCompleted: {
48 + mainModel.addModelChangeListener(buildList);
49 + }
50 +
51 + function buildList () {
52 + eventModel.clear();

Now that you are using EventListModel {}, you should be able to use it directly with your ListView.

And you should be able to achieve following.
// 3. no way to cheat like adding on the fly a method or property to the ListItem while looping

[Kunal Parmar (pkunal-parmar)]

> One curious thing about i18n.tr() and JavaScript is that I'm able to use it
> directly in the JavaScript file in OSMTouch, but not in Calendar. See http://b
> azaar.launchpad.net/~yohanboniface/osmtouch/trunk/view/head:/components/Catego
> ries.js
> I need to investigate this.

This is because, Calendar JS file is shared library, declared by
.pragma library. But your JS file does not seems to be shared lib.

http://qt-project.org/doc/qt-5/qtqml-javascript-resources.html

[ybon (yohanboniface)]

Thanks all for answers.
@Kunal: how can I filter alarm events? I don't see where this is done in other event list of calendar app.

[Kunal Parmar (pkunal-parmar)]

I am not sure why only agenda view is getting alarm data, but looking at Alarm model source code.

Alarm is stored as todo item type. so if you apply Detail Filter on model with only item type of ItemType.Event
ItemType.EventOccurrence . you should be able to filter out alarm data from model.

http://developer.ubuntu.com/api/qml/sdk-1.0/QtOrganizer.ItemType/
http://developer.ubuntu.com/api/qml/sdk-1.0/QtOrganizer.DetailFilter/

http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp

[ybon (yohanboniface)]

Status: not able, even with the help of renato, to make the DetailFilter work (here is a smaller test case: http://paste.ubuntu.com/7257603/ but not working, i.e. no event at all is displayed as soon as I set up the filter).

> And you should be able to achieve following.
> // 3. no way to cheat like adding on the fly a method or property to the ListItem while looping

No sure how :)
I can use EvenListModel directly as model in my ListView, yes, but I don't know how to set a property on each item with the event *date* value (in string format). Any clue?

Thanks!

[Kunal Parmar (pkunal-parmar)]

I will need to check about DetailsFilter, I never tried that filter.

> I can use EvenListModel directly as model in my ListView, yes, but I don't
> know how to set a property on each item with the event *date* value (in string
> format). Any clue?

Regarding using EventListModel directly, something like following should work. Though we need i18n.tr, instead of Qt.formatDate, this is code from Qt example.

                TextEdit {
                    id: startTime
                    font.pixelSize: 12
                    text: (model.item) ? Qt.formatDate(
                                             model.item.startDateTime) : ""
                    readOnly: true
                }

Following is link for complete example, will be useful.
https://qt.gitorious.org/qt/qtpim/source/cdbe3d4a34f728caaac15eccc9fdca3195b60b3a:examples/organizer/qmlorganizerlistview/qmlorganizerlistview.qml

[Victor Thompson (vthompson)]

In your test code I see the following console output:

file:///home/victor/Development/test.qml:11:17: Unable to assign int to QDeclarativeOrganizerItemDetail*

Seems like DetailFilter's detail property can not be set directly to the enumeration.

[Victor Thompson (vthompson)]

I think you'll also want to merge with trunk and add the Loader infrastructure for the AgendaView tab as well. I believe the tab won't be visible otherwise. I say this because this might also resolve some errors I see in the console with this branch.

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

Victor is right, DetailFilter's details propperty accepts Type object and not type itself.
Needs to do something like below.

    Type {
        id: typeDetailToMatch
        type: Type.Todo
    }
    DetailFilter {
        id: todoFilter
        detail: typeDetailToMatch
    }

[ybon (yohanboniface)]

> I will need to check about DetailsFilter, I never tried that filter.
>
> > I can use EvenListModel directly as model in my ListView, yes, but I don't
> > know how to set a property on each item with the event *date* value (in
> string
> > format). Any clue?
>
> Regarding using EventListModel directly, something like following should work.
> Though we need i18n.tr, instead of Qt.formatDate, this is code from Qt
> example.
>
> TextEdit {
> id: startTime
> font.pixelSize: 12
> text: (model.item) ? Qt.formatDate(
> model.item.startDateTime) : ""
> readOnly: true
> }
>
> Following is link for complete example, will be useful.
> https://qt.gitorious.org/qt/qtpim/source/cdbe3d4a34f728caaac15eccc9fdca3195b60
> b3a:examples/organizer/qmlorganizerlistview/qmlorganizerlistview.qml

Sorry, it seems I've not been clear.
The need is to have the date of the event to create the "section" part (the date header that group events of same day).
So we need:
- a property on each item (cannot be a method, section don't want a method)
- the property value need to be the date, without hours, minutes, etc. Because to want to group event by day, so we need events of same day to have the exact same value in the property given to section
- this property need to be a string type (not a date, section seems to only call the toString() of the property), not a Date type

If you have an idea, great! If not, I will but back my ugly workaround... ;)

[ybon (yohanboniface)]

> Victor is right, DetailFilter's details propperty accepts Type object and not
> type itself.
> Needs to do something like below.
>
> Type {
> id: typeDetailToMatch
> type: Type.Todo
> }
> DetailFilter {
> id: todoFilter
> detail: typeDetailToMatch
> }

Well, I know that, I've read the documentation too. This example comes right from the DetailFilter page (http://developer.ubuntu.com/api/qml/sdk-14.04/QtOrganizer.DetailFilter/), and indeed this was my first attempt too, but it doesn't work either:

ybon@edoardo:~/Code/qml/calendar-app$ qmlscene testfilter.qml
file:///home/ybon/Code/qml/calendar-app/testfilter.qml:10 Invalid property assignment: "type" is a read-only property

We need someone who *knows*. The documentation is useless and wrong (and renato sadly doesn't know either). And I sadly don't have enough time these days to play the riddle for hours :(

[Victor Thompson (vthompson)]

Does the following qmltypes file [1] give any useful information? Also, note there's a qmltypes file for QtOrganizer installed by default under "/usr/lib/*/qt5/qml/QtOrganizer/plugins.qmltypes", IIRC.

[1] https://github.com/qtproject/qtpim/blob/master/src/imports/organizer/plugins.qmltypes

[ybon (yohanboniface)]

AFAIK, the available types are here: http://developer.ubuntu.com/api/qml/sdk-14.04/QtOrganizer.ItemType/#itemType-prop but I don't know how to filter them ;)

[Michael Hall (mhall119)]

It seems the example given in DetailFilter is incorrect. From what I can tell, the "Type" component doesn't exist, but the "Detail" component has the same properties and would make sense to assign to the 'detail' property of DetailFilter. Also there is no Type enum, but ItemType seems to contain the value used in the example. So maybe something like this:

    Detail {
        id: typeDetailToMatch
        type: ItemType.Todo
    }
    DetailFilter {
        id: todoFilter
        detail: typeDetailToMatch
    }

[Michael Hall (mhall119)]

Or maybe this should use DetailFieldFilter instead of DetailFilter: http://developer.ubuntu.com/api/qml/sdk-14.04/QtOrganizer.DetailFieldFilter/

[ybon (yohanboniface)]

Thanks for the inputs, Michael. But no more luck until now :(

For the record, with the first suggestion, same error about type read-only (http://paste.ubuntu.com/7263748/):

file:///home/ybon/Code/qml/calendar-app/testfilter.qml:10 Invalid property assignment: "type" is a read-only property

And with the DetailFieldFilter, I don't get it to return anything (not sure the types match the ones of OrganizerModel), event playing around with values, but I've no specific error.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Any progress to report on this Yohan?

[ybon (yohanboniface)]

Nope.
As the documentation is wrong, we need someone aware of the secret sauce to be able to move forward :/

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I've asked Zsombor and Renato to provide guidance here.

[Renato Araujo Oliveira Filho (renatofilho)]

You should be able to filter events type using this this example:

    OrganizerModel {
        id: organizer

        startPeriod: new Date("2014-01-01")
        endPeriod: new Date("2014-12-31")
        manager: "eds"
        autoUpdate: true
        onItemCountChanged: console.debug("Item count changed: " + itemCount)
        filter: DetailFieldFilter {
            id: todoFilter
            detail: Detail.ItemType
            field: Type.FieldType
            value: Type.Todo
            matchFlags: Filter.MatchExactly
        }
        Component.onCompleted: console.debug("Type: " + Type.Todo)

    }

[Renato Araujo Oliveira Filho (renatofilho)]

You do not need this:

47 + Component.onCompleted: {
48 + mainModel.addModelChangeListener(buildList);
49 + }
50 +
51 + function buildList () {
52 + eventModel.clear();
53 + // Include all events from 00:00 so you can still consult the past events of the day
54 + // (or just you are late 10 minutes to your RDV, and you need details from the event...)
55 + var itemIds = mainModel.getItems();
56 + for(var i = 0 ; i < itemIds.length ; ++i) {
57 + var event = itemIds[(i)];
58 + if( event ) {
59 + // Recreating new ListItem model, because
60 + // 1. I'm not able to take control on section.property formating in ListView
61 + // 2. section in deledate has been cast to string (even if property was a QDateTime
62 + // 3. no way to cheat like adding on the fly a method or property to the ListItem while looping
63 + eventModel.append({
64 + sectionLabel: event.startDateTime.formatDate(),
65 + event: event
66 + });
67 + }
68 + }
69 + }
70 +
71 + ListModel {
72 + id: eventModel
73 + }

60 + // 1. I'm not able to take control on section.property formating in ListView
61 + // 2. section in deledate has been cast to string (even if property was a QDateTime
62 + // 3. no way to cheat like adding on the fly a method or property to the ListItem while looping
Why do you need cheat the section property? If the section was cast to string you can use the string to convert back to a QDateTime object using the "section" property no?

[ybon (yohanboniface)]

Thanks all!

> Why do you need cheat the section property? If the section was cast to string you can use the string to convert back
> to a QDateTime object using the "section" property no?

Because items are grouped by section *before* I can do anything on the value, so if I keep passing the raw Date value (including hours, minutes..), then every item event will ends in its own section, which is not what we want.

I'm gonna test our example code and give feedback asap.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Renato / Yohan - will you both be around for the calendar meeting tomorrow at 13:00 UTC so we can increase the velocity of this merge?

[ybon (yohanboniface)]

Sounds possible for me, so I will be there :)

[Renato Araujo Oliveira Filho (renatofilho)]

You can make this simpler:

51 + function buildList () {
52 + eventModel.clear();
53 + // Include all events from 00:00 so you can still consult the past events of the day
54 + // (or just you are late 10 minutes to your RDV, and you need details from the event...)
55 + var itemIds = mainModel.getItems();
56 + for(var i = 0 ; i < itemIds.length ; ++i) {
57 + var event = itemIds[(i)];
58 + if( event ) {
59 + // Recreating new ListItem model, because
60 + // 1. I'm not able to take control on section.property formating in ListView
61 + // 2. section in deledate has been cast to string (even if property was a QDateTime
62 + // 3. no way to cheat like adding on the fly a method or property to the ListItem while looping
63 + eventModel.append({
64 + sectionLabel: event.startDateTime.formatDate(),
65 + event: event
66 + });
67 + }
68 + }
69 + }

function buildList () {
        eventModel.clear();
        // Include all events from 00:00 so you can still consult the past events of the day
        // (or just you are late 10 minutes to your RDV, and you need details from the event...)
        var items = mainModel.items
        for(var i = 0 ; i < itemIds.length ; ++i) {
            var event = items[i]
                    // Recreating new ListItem model, because
                    // 1. I'm not able to take control on section.property formating in ListView
                    // 2. section in deledate has been cast to string (even if property was a QDateTime
                    // 3. no way to cheat like adding on the fly a method or property to the ListItem while looping
                    eventModel.append({
                        sectionLabel: event.startDateTime.formatDate(),
                        event: event
                    });
               }
            }
        }

[lp:~yohanboniface/ubuntu-calendar-app/AgendaView]

210. By ybon on 2014-05-08

Simpler buildList, thanks to Renato

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:210
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/449/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2514
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2514/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/48
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/283
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/7

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/449/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This is looking great, thanks Yohan & Renato.

https://imgur.com/HSdgtad

I'm keen to see this landed, it's very useful. Kunal, can you please review?

[ybon (yohanboniface)]

Great news!
(6:30 Gym, seriously? ;) )

[Victor Thompson (vthompson)]

I'll test this out right now. I'm looking at the translation string of each of the MPs in the queue and one thing I just noticed is that the empty state for the agenda view is "No incoming event", should this be "No upcoming event"?

[Victor Thompson (vthompson)]

I still see alarms in the Agenda View: http://i.imgur.com/8c1Z6SE.png

Maybe the issue with alarms in the agenda view can be fixed later?

One thing I want to know is did we consider placing the agenda view in the toolbar? It doesn't fit the same flat pattern of Year/Month/Week/Day, so with the current UI it seems to make more sense in the toolbar. Also, once the app moves to using the app drawer and toolbar icons are placed in the header, having both "Agenda" and "New Event" in the header would be nice.

review: Needs Information

[Alan Pope 🍺🐧🐱 🦄 (popey)]

My inclination is to say that "day/week/month/year and agenda" should all go in the header, with agenda the default if you have items in your calendar.

I would see "New event" being a button on the right end of the header/toolbar, and a quick action launched via a quick swipe up from the bottom.

[Kunal Parmar (pkunal-parmar)]

101 + pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event": model.event});

we need to pass model as well now,

like

pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event":modelData,"model": root.model});

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

Agenda tab needs to follow loader architecture like other tab,

something like below,

            Tab {
                id: agendaTab
                objectName: "agendaTab"
                title: i18n.tr("Agenda")
                page: Loader{
                    id: agendaViewLoader
                    objectName: "agendaViewLoader"
                    source: tabs.selectedTab == agendaTab ? Qt.resolvedUrl("AgendaView.qml"):""
                    onLoaded: {
                        item.tools = Qt.binding(function() { return commonToolBar })
                    }

                    anchors{
                        left: parent.left
                        right: parent.right
                        bottom: parent.bottom
                    }
                }
            }

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

148 + var format = qsTr("hh:mm");
149 + return Qt.formatTime(this, format);

This still needs to be changed to use i18n.tr, as suggested in my previous review comment.

review: Needs Fixing

[lp:~yohanboniface/ubuntu-calendar-app/AgendaView]

211. By ybon on 2014-05-21

Pass model to pageStack.push()

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:211
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/470/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2739
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/276
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/276/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/304
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/28

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/470/rebuild

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Rejecting this branch , as new branch has been merged to the trunk.
https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/AgedaView

review: Disapprove

Unmerged revisions

211. By ybon on 2014-05-21

Pass model to pageStack.push()

210. By ybon on 2014-05-08

Simpler buildList, thanks to Renato

209. By ybon on 2014-04-10

merge

208. By ybon on 2014-04-10

Merge with trunk

207. By ybon on 2014-03-29

Pick only next month events in AgendaView

206. By ybon on 2014-03-29

Use an Item for AgendaView for now

205. By ybon on 2014-03-26

No need to width/height when using anchors.fill

204. By ybon on 2014-03-26

Replace Item by Page

203. By ybon on 2014-03-25

Use QtObject instead of item property

202. By ybon on 2014-03-25

Merged from trunk

=== added file 'AgendaView.qml'
--- AgendaView.qml	1970-01-01 00:00:00 +0000
+++ AgendaView.qml	2014-05-21 09:10:19 +0000
@@ -0,0 +1,107 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+import "dateExt.js" as DateExt
+
+Item {
+    id: root
+    objectName: "AgendaView"
+
+    property var startDay: DateExt.today();
+
+    EventListModel {
+        id: mainModel
+        startPeriod: startDay.midnight()
+        endPeriod: startPeriod.addDays(30).endOfDay()
+    }
+
+    Label {
+        id: noEvent
+        objectName: "noEvent"
+
+        width: parent.width-units.gu(6)
+        visible: eventModel.count === 0
+        anchors.centerIn: parent
+
+        fontSize: "medium"
+        wrapMode: Text.WordWrap
+        horizontalAlignment: Text.AlignHCenter
+
+        text:  i18n.tr("No incoming event")
+    }
+
+    Column {
+        id: column
+        anchors.top: parent.top
+        anchors.topMargin: units.gu(1.5)
+        spacing: units.gu(1)
+
+        anchors.fill: parent
+
+
+        Component.onCompleted: {
+            mainModel.addModelChangeListener(buildList);
+        }
+
+        function buildList () {
+            eventModel.clear();
+            // Include all events from 00:00 so you can still consult the past events of the day
+            // (or just you are late 10 minutes to your RDV, and you need details from the event...)
+            var items = mainModel.items;
+            for(var i = 0 ; i < items.length ; ++i) {
+                var event = items[i];
+                // Recreating new ListItem model, because
+                // 1. I'm not able to take control on section.property formating in ListView
+                // 2. section in deledate has been cast to string (even if property was a QDateTime
+                // 3. no way to cheat like adding on the fly a method or property to the ListItem while looping
+                eventModel.append({
+                    sectionLabel: event.startDateTime.formatDate(),
+                    event: event
+                });
+            }
+        }
+
+        ListModel {
+            id: eventModel
+        }
+
+        Component {
+            id: dateHeading
+            ListItem.Header {
+                text: section
+            }
+        }
+
+        ListView {
+            id: eventList
+            model: eventModel
+
+            width: parent.width
+            height: parent.height
+            anchors { left: parent.left; right: parent.right}
+            clip: true
+
+            section {
+                property: "sectionLabel"
+                criteria: ViewSection.FullString
+                labelPositioning: ViewSection.InlineLabels
+                delegate: dateHeading
+            }
+
+            delegate: ListItem.Standard {
+                id: eventItem
+                text: event.startDateTime.formatTime() + " - " + event.displayLabel
+                progression: true
+                onClicked: {
+                    pageStack.push(Qt.resolvedUrl("EventDetails.qml"),{"event": model.event, "model": model});
+                }
+
+            }
+            Scrollbar {
+                flickableItem: eventList
+            }
+        }
+
+    }
+}

=== modified file 'calendar.qml'
--- calendar.qml	2014-04-27 05:12:51 +0000
+++ calendar.qml	2014-05-21 09:10:19 +0000
@@ -363,6 +363,20 @@
                         }
                     }
                 }
+
+                Tab {
+                    objectName: "agendaTab"
+                    title: i18n.tr("Agenda")
+                    page: Page {
+                        anchors.fill: parent
+                        tools: commonToolBar
+                        AgendaView {
+                            id: agendaView
+                            anchors.fill: parent
+                        }
+                    }
+                }
+
             }
         }
     }

=== modified file 'dateExt.js'
--- dateExt.js	2014-03-22 03:07:26 +0000
+++ dateExt.js	2014-05-21 09:10:19 +0000
@@ -90,6 +90,20 @@
     && this.getFullYear() === otherDay.getFullYear() );
 }
 
+Date.prototype.formatTime = function (d) {
+    // TRANSLATORS: this is a time formatting string,
+    // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+    var format = qsTr("hh:mm");
+    return Qt.formatTime(this, format);
+}
+
+Date.prototype.formatDate = function () {
+    // TRANSLATORS: this is a date formatting string,
+    // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+    var format = qsTr("dd MMMM yyyy");
+    return Qt.formatDate(this, format);
+}
+
 function weekCount(year, month_number) {
     var firstOfMonth = new Date(year, month_number, 1);
     var lastOfMonth = new Date(year, month_number+1, 0);