history-service

Merge lp://staging/~boiko/history-service/grouped_events_model into lp://staging/history-service

grouped_events_model
Merge into trunk

Proposed by Gustavo Pichorim Boiko on 2014-08-12

Status:	Merged
Approved by:	Tiago Salem Herrmann on 2014-08-21
Approved revision:	166
Merged at revision:	164
Proposed branch:	lp://staging/~boiko/history-service/grouped_events_model
Merge into:	lp://staging/history-service
Diff against target:	635 lines (+470/-16) 9 files modified Ubuntu/History/CMakeLists.txt (+2/-0) Ubuntu/History/historyeventmodel.cpp (+12/-3) Ubuntu/History/historyeventmodel.h (+16/-13) Ubuntu/History/historygroupedeventsmodel.cpp (+348/-0) Ubuntu/History/historygroupedeventsmodel.h (+82/-0) Ubuntu/History/historyqmlplugin.cpp (+2/-0) src/event.cpp (+6/-0) src/event.h (+1/-0) src/types.h (+1/-0)
To merge this branch:	bzr merge lp://staging/~boiko/history-service/grouped_events_model
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-08-21
Tiago Salem Herrmann (community)		2014-08-12	Approve on 2014-08-21
Review via email: mp+230531@code.staging.launchpad.net

Commit message

Add a model that groups events that have happened in a contiguous way.

Description of the change

Add a model that groups events that have happened in a contiguous way.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-12:

#

PASSED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/history-service-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/134/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/grouped_events_model updated on 2014-08-16

163. By Gustavo Pichorim Boiko on 2014-08-16: Make it possible to group by multiple properties at the same time.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-16:

#

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/history-service-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/137/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/grouped_events_model updated on 2014-08-18

164. By Gustavo Pichorim Boiko on 2014-08-18: Merge latest changes from trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-18:

#

FAILED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/history-service-ci/138/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-utopic-amd64-ci/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/138/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-18:

#

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/history-service-ci/139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/139/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/grouped_events_model updated on 2014-08-20

165. By Gustavo Pichorim Boiko on 2014-08-20: Keep the grouped events list sorted.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-20:

#

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/history-service-ci/142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/142/rebuild

review: Approve (continuous-integration)

lp://staging/~boiko/history-service/grouped_events_model updated on 2014-08-21

166. By Gustavo Pichorim Boiko on 2014-08-21: Check the upper bound too before accessing the QList.

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-08-21:

#

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-21:

#

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/history-service-ci/144/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/history-service-utopic-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-utopic-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/144/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Gustavo Pichorim Boiko

Ubuntu Phablet Team