Merge lp:~pkunal-parmar/ubuntu-calendar-app/EventBubble-Resize into lp:ubuntu-calendar-app

[Kunal Parmar]

Resolves Bug #1360325

Resizing event bubble when calendar resizes.

Resolves Bug #1360325

Resizing event bubble when calendar resizes.

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

PASSED: Continuous integration, rev:420
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/720/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1732
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/278

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me kunal.

Thanks for MR

review: Approve

[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/288/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1761/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1761/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/108

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Not sure if this is related with Jenkins failure,

Fail to connect with sync monitor: QDBusError("org.freedesktop.DBus.Error.ServiceUnknown", "The name com.canonical.SyncMonitor was not provided by any .service files")
}}}
/tmp/hudson7719098133570284605.sh: line 83: 26977 Terminated qmlscene /tmp/main.qml
+ autopilot_result=1
+ set -e

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

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

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:420
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/731/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1817
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1817/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/289

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

review: Approve (continuous-integration)

[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/295/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1849
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1849/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/115

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

What's going on here? It doesn't look like it even creates an event at all..

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/calendar_app/tests/test_new_event.py", line 99, in test_add_new_event_with_default_values
    day_view, test_event = self._add_event()
  File "/usr/lib/python2.7/dist-packages/calendar_app/tests/test_new_event.py", line 63, in _add_event
    start_num_events = len(day_view.get_events())
  File "/usr/lib/python2.7/dist-packages/autopilot/logging.py", line 46, in inner
    return f(instance, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/calendar_app/emulators.py", line 258, in get_events
    events.append(event.get_information())
  File "/usr/lib/python2.7/dist-packages/calendar_app/emulators.py", line 380, in get_information
    start_time, end_time = self._get_start_and_end_time()
  File "/usr/lib/python2.7/dist-packages/calendar_app/emulators.py", line 386, in _get_start_and_end_time
    start_time, end_time = time_label.text.split(' - ')
ValueError: need more than 1 value to unpack

[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/299/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1881
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1881/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/119

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'EventBubble.qml'
--- EventBubble.qml	2014-08-18 16:48:54 +0000
+++ EventBubble.qml	2014-08-29 00:50:44 +0000
@@ -28,6 +28,9 @@
     property int wideType: 1;
     property int narrowType: 2;
 
+    property int depthInRow: 0;
+    property int sizeOfRow:0
+
     property Flickable flickable;
 
     readonly property int minimumHeight: timeLabel.height + /*top-bottom margin*/ units.gu(2)
@@ -41,7 +44,21 @@
         gradientColor: "#F5F5F5"
     }
 
+    function resize() {
+        var offset = parent.width/sizeOfRow;
+        x = (depthInRow) * offset;
+        width = parent.width - x;
+    }
+
+    Connections{
+        target: parent
+        onWidthChanged:{
+            resize();
+        }
+    }
+
     onEventChanged: {
+        resize();
         setDetails();
     }
 

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2014-08-22 22:44:25 +0000
+++ TimeLineBase.qml	2014-08-29 00:50:44 +0000
@@ -66,20 +66,16 @@
         }
     }
 
-    function layoutEvents(array, depth) {
-        var width = bubbleOverLay.width;
-        var offset = width/(depth+1);
+    function layoutEvents(array, depth) {              
         for(var i=0; i < array.length ; ++i) {
             var schedule = array[i];
-            var x = (schedule.depth) * offset
-            var w = width - x;
             var event = intern.eventMap[schedule.id];
-            bubbleOverLay.createEvent(event , x, w);
+            bubbleOverLay.createEvent(event , schedule.depth, depth +1);
         }
     }
 
     function createEvents() {
-        if(!bubbleOverLay || bubbleOverLay == undefined) {
+        if(!bubbleOverLay || bubbleOverLay == undefined || model === undefined) {
             return;
         }
 
@@ -152,7 +148,7 @@
         return unUsedBubble;
     }
 
-    function createEvent( event, x, width ) {
+    function createEvent( event, depth, sizeOfRow ) {
         var eventBubble;
         if( isHashEmpty(intern.unUsedEvents) ) {
             eventBubble = delegate.createObject(bubbleOverLay);
@@ -171,8 +167,8 @@
         eventBubble.height = (height > eventBubble.minimumHeight) ? height:eventBubble.minimumHeight ;
 
         eventBubble.model = bubbleOverLay.model
-        eventBubble.x = x;
-        eventBubble.width = width;
+        eventBubble.depthInRow = depth;
+        eventBubble.sizeOfRow = sizeOfRow;
         eventBubble.event = event
         eventBubble.visible = true;
         eventBubble.clicked.connect( bubbleOverLay.showEventDetails );