Ubuntu Calendar App

Merge lp://qastaging/~gary-wzl77/ubuntu-calendar-app/show-week-number into lp://qastaging/ubuntu-calendar-app

show-week-number
Merge into trunk

Proposed by Gary.Wang on 2015-07-08

Status:

Merged

Approved by:

Alan Pope 🍺🐧🐱 🦄 on 2015-11-23

Approved revision:

726

Merged at revision:

726

Proposed branch:

lp://qastaging/~gary-wzl77/ubuntu-calendar-app/show-week-number

Merge into:

lp://qastaging/ubuntu-calendar-app

Diff against target:

543 lines (+238/-30)

12 files modified

AgendaView.qml (+2/-1)
AllDayEventComponent.qml (+3/-0)
DayView.qml (+2/-1)
EventActions.qml (+11/-0)
MonthComponent.qml (+86/-1)
MonthView.qml (+4/-1)
Settings.qml (+89/-0)
WeekView.qml (+2/-1)
YearView.qml (+2/-1)
YearViewDelegate.qml (+1/-1)
calendar.qml (+4/-3)
po/com.ubuntu.calendar.pot (+32/-20)

To merge this branch:

bzr merge lp://qastaging/~gary-wzl77/ubuntu-calendar-app/show-week-number

Related bugs:

Bug #1464407: [Calendar] Display Calendar Weeks in yearly and monthly view	Undecided	Fix Committed
Bug #1473067: The calendar application does not remember the last view used	Undecided	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Alan Pope 🍺🐧🐱 🦄 (community)		2015-07-08	Approve on 2015-11-23
Jenkins Bot	continuous-integration		Approve on 2015-11-23
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-10-28
Nicholas Skaggs (community)		2015-08-21	Needs Fixing on 2015-08-21
Mihir Soni		2015-08-07	Pending
Review via email: mp+264153@code.qastaging.launchpad.net

Commit message

Show week number in monthly and yearly view.

Description of the change

Show week number in monthly and yearly view.
1.Navigate to day view when clicking weeknum in monthly view
2.Navigate to monthly view when clicking weeknum in yearly view

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-07-08:

PASSED: Continuous integration, rev:692
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1209/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3051
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3051/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/680
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/206

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

review: Approve (continuous-integration)

Revision history for this message

Alan Pope 🍺🐧🐱 🦄 (popey) wrote on 2015-07-09:

Not sure about this. We need design to take a look.

http://people.canonical.com/~alan/year.png
http://people.canonical.com/~alan/month.png

Seems cluttered.

Revision history for this message

Gary.Wang (gary-wzl77) wrote on 2015-07-10:

Add screenshots of monthly view with UI-fined based on feedback from UX team.
Add setting page in latest repo as well.

https://drive.google.com/open?id=0B2H9ECPSSfqIN1AxRGVfMndDYlk
https://drive.google.com/open?id=0B2H9ECPSSfqIc0ZqT2lXOEhTX3M

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-07-11:

PASSED: Continuous integration, rev:693
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1210/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3065
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3065/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/681
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/207

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

review: Approve (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-07-14:

PASSED: Continuous integration, rev:694
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1213/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3077
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3077/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/684
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/210

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

review: Approve (continuous-integration)

Revision history for this message

Mihir Soni (mihirsoni) wrote on 2015-07-30:

Popey,

Any updates from design team regarding this ?

Revision history for this message

Gary.Wang (gary-wzl77) wrote on 2015-08-07:

Got feedback from UX-design team that
"
This solution works nicely and I think we should proceed with it.
...
"

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-08-07:

FAILED: Continuous integration, rev:695
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1223/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/220/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-08-07:

PASSED: Continuous integration, rev:707
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1224/
Executed test runs:
SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/221

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

review: Approve (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-08-21:

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/1405/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/978/console

review: Needs Fixing (continuous-integration)

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2015-08-21:

Text conflict in po/com.ubuntu.calendar.pot
1 conflicts encountered.

review: Needs Fixing

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-08-24:

PASSED: Continuous integration, rev:708
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1228/
Executed test runs:
SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/225

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

review: Approve (continuous-integration)

lp://qastaging/~gary-wzl77/ubuntu-calendar-app/show-week-number updated on 2015-10-07

710. By Kunal Parmar on 2015-08-28

resolves Bug #1473679
. Fixes: https://bugs.launchpad.net/bugs/1473679.

Approved by Alan Pope , Ubuntu Phone Apps Jenkins Bot.

711. By Kunal Parmar on 2015-08-28

resolves Bug #1479533 . Fixes: https://bugs.launchpad.net/bugs/1479533.

Approved by Alan Pope , Ubuntu Phone Apps Jenkins Bot.

712. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-09-04

Launchpad automatic translations update.

713. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-09-08

Launchpad automatic translations update.

714. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-09-09

Launchpad automatic translations update.

715. By Kunal Parmar on 2015-09-10

resolves Bug #1475747 . Fixes: https://bugs.launchpad.net/bugs/1475747.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

716. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-09-18

Launchpad automatic translations update.

717. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-10-07

Launchpad automatic translations update.

Revision history for this message

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote on 2015-10-22:

FAILED: Continuous integration, rev:708
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/8/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/49/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/8/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote on 2015-10-28:

PASSED: Continuous integration, rev:718
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/10/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/69/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/10/rebuild

review: Approve (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2015-10-28:

PASSED: Continuous integration, rev:718
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1234/
Executed test runs:
SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/231

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

review: Approve (continuous-integration)

lp://qastaging/~gary-wzl77/ubuntu-calendar-app/show-week-number updated on 2015-11-23

718. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-10-29

Launchpad automatic translations update.

719. By Kunal Parmar on 2015-10-29

Resolves Bug #1494394 . Fixes: https://bugs.launchpad.net/bugs/1494394.

Approved by Alan Pope , Jenkins Bot, Ubuntu Phone Apps Jenkins Bot.

720. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-11-06

Launchpad automatic translations update.

721. By Gary.Wang on 2015-11-07

Tab change will cause dynamic creation(Qt.ResolvedUrl) for qml object back and forth.Using Qt.CreateComponent for dynamic creation for the first time and reuse existing obj without re-creating. Fixes: https://bugs.launchpad.net/bugs/1309263.

Approved by Ubuntu Phone Apps Jenkins Bot, Jenkins Bot, Alan Pope .

722. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2015-11-08