Merge lp:~twstd-dev/ubuntu-calendar-app/1359323 into lp:ubuntu-calendar-app

[twstd]

A fix for Bug #1359323

A fix for Bug #1359323

[Mihir Soni (mihirsoni)]

Hi,

Thanks for MR, I guess you misunderstood the bug.

No Upcoming events should be visible when user have calendar enable and there are no events.

when you've no calendar enabled then it should say , You have no calendars enabled.

review: Needs Fixing

[Mihir Soni (mihirsoni)]

It looks great, just one small fix I have mentioned in inline code comment ,please check.

review: Needs Fixing

[twstd (twstd-dev)]

Updated

[Mihir Soni (mihirsoni)]

thanks a lot for your MR.
It works great,though i got some two bugs I found. I'll report them.

review: Approve

[Mihir Soni (mihirsoni)]

I'll wait for Jenkins to run and then will Top approve this MR.

[twstd (twstd-dev)]

> i got some two bugs I found. I'll report them.

Bring them on! % )

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

FAILED: Continuous integration, rev:418
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~twstd-dev/ubuntu-calendar-app/1359323/+merge/232140/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/716/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1708
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1708/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/274

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Looks like a commit message got added :-) Re-approved.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/287/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1741/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1741/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/107

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

This merge fails to run autopilot successfully in jenkins on the desktop and fails on my nexus 4 locally. Can you please look at the AP failures?

http://paste.ubuntu.com/8214040/

review: Needs Fixing

[Kunal Parmar (pkunal-parmar)]

added one comment

[lp:~twstd-dev/ubuntu-calendar-app/1359323]

419. By twstd on 2014-09-02

Replace hardcoded margin value with responsive unit

[twstd (twstd-dev)]

good call!

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

FAILED: Continuous integration, rev:419
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/727/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1791/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1791/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/285

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:419
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/736/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1848
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/294

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:419
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/764/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/185
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/322

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

FInally , Jenkins has resolved issues.

review: Approve

=== modified file 'AgendaView.qml'
--- AgendaView.qml	2014-08-28 13:05:12 +0000
+++ AgendaView.qml	2014-09-02 19:04:40 +0000
@@ -35,6 +35,14 @@
         eventList.positionViewAtBeginning();
     }
 
+    function hasEnabledCalendars() {
+        var enabled_calendars = eventListModel.getCollections().filter( function( item ) {
+            return item.extendedMetaData( "collection-selected" );
+        } );
+
+        return !!enabled_calendars.length;
+    }
+
     EventListModel {
         id: eventListModel
         startPeriod: currentDay.midnight();
@@ -58,12 +66,35 @@
         z:2
     }
 
-    Label{
-        text: i18n.tr("No upcoming events")
-        visible: eventListModel.itemCount === 0
+    Label {
+        id: noEventsOrCalendarsLabel
+        text: {
+            var default_title = i18n.tr( "No upcoming events" );
+
+            if ( !root.hasEnabledCalendars() ) {
+                default_title = i18n.tr("You have no calendars enabled")
+            }
+
+            return default_title;
+        }
+        visible: !root.hasEnabledCalendars() || !eventListModel.itemCount
         anchors.centerIn: parent
     }
 
+    Button {
+        text: i18n.tr( "Enbale calendars" )
+        visible: !root.hasEnabledCalendars()
+        anchors.top: noEventsOrCalendarsLabel.bottom
+        anchors.horizontalCenter: noEventsOrCalendarsLabel.horizontalCenter
+        anchors.topMargin: units.gu( 1.5 )
+        color: UbuntuColors.orange
+
+        onClicked: {
+            pageStack.push(Qt.resolvedUrl("CalendarChoicePopup.qml"),{"model":eventModel});
+            pageStack.currentPage.collectionUpdated.connect(eventModel.delayedApplyFilter);
+        }
+    }
+
     ListView{
         id: eventList
         model: eventListModel