fix(weekViewWithTimes): put events in the correct columns

mattlewis92 · Jun 29, 2016 · 06b0181 · 06b0181
1 parent eb72854
commit 06b0181
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/services/calendarHelper.js b/src/services/calendarHelper.js
@@ -313,6 +313,7 @@ angular
       var flattenedEvents = [];
       weekView.eventRows.forEach(function(row) {
         row.row.forEach(function(eventRow) {
+          eventRow.event.dayOffset = eventRow.offset;
           flattenedEvents.push(eventRow.event);
         });
       });
@@ -331,7 +332,9 @@ angular
       });
       weekView.eventRows = [{
         row: newEvents.map(function(event) {
-          return {event: event};
+          var offset = event.dayOffset;
+          delete event.dayOffset;
+          return {event: event, offset: offset};
         })
       }];
       return weekView;

diff --git a/src/templates/calendarWeekView.html b/src/templates/calendarWeekView.html
@@ -56,7 +56,7 @@
             }">
             <div
               class="day-highlight"
-              ng-class="['dh-event-' + eventRow.event.type, eventRow.event.cssClass, eventRow.extendsLeft ? '' : 'border-left-rounded', eventRow.extendsRight ? '' : 'border-right-rounded']"
+              ng-class="['dh-event-' + eventRow.event.type, eventRow.event.cssClass, !vm.showTimes && eventRow.extendsLeft ? '' : 'border-left-rounded', !vm.showTimes && eventRow.extendsRight ? '' : 'border-right-rounded']"
               data-event-class
               mwl-draggable="eventRow.event.draggable === true"
               axis="vm.showTimes ? 'xy' : 'x'"

diff --git a/test/unit/services/calendarHelper.spec.js b/test/unit/services/calendarHelper.spec.js
@@ -627,7 +627,8 @@ describe('calendarHelper', function() {
             left: 0,
             startsAt: new Date('October 19, 2015 11:00:00'),
             endsAt: new Date('October 21, 2015 11:00:00')
-          }
+          },
+          offset: 1
         },
         {
           event: {
@@ -636,7 +637,8 @@ describe('calendarHelper', function() {
             left: 0,
             startsAt: new Date('October 20, 2015 11:00:00'),
             endsAt: new Date('October 21, 2015 11:00:00')
-          }
+          },
+          offset: 2
         },
         {
           event: {
@@ -645,7 +647,8 @@ describe('calendarHelper', function() {
             top: 658,
             height: 60,
             left: 150
-          }
+          },
+          offset: 2
         }
       ];