fix(weekViewWithTimes): more robust fix for event offsets

mattlewis92 · Jun 29, 2016 · 721b3fc · 721b3fc
1 parent 57d9e49
commit 721b3fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -85,6 +85,6 @@
     }
   },
   "dependencies": {
-    "calendar-utils": "0.0.2"
+    "calendar-utils": "0.0.3"
   }
 }
diff --git a/src/services/calendarHelper.js b/src/services/calendarHelper.js
@@ -313,7 +313,6 @@ angular
       var flattenedEvents = [];
       weekView.eventRows.forEach(function(row) {
         row.row.forEach(function(eventRow) {
-          eventRow.event.dayOffset = eventRow.offset;
           flattenedEvents.push(eventRow.event);
         });
       });
@@ -332,9 +331,13 @@ angular
       });
       weekView.eventRows = [{
         row: newEvents.map(function(event) {
-          var offset = event.dayOffset;
-          delete event.dayOffset;
-          return {event: event, offset: offset};
+          return {
+            event: event,
+            offset: calendarUtils.getDayOffset(
+              {start: event.startsAt, end: event.endsAt},
+              moment(viewDate).startOf('week')
+            )
+          };
         })
       }];
       return weekView;