fix: resolve schedule rendering issues on month view (nhn#646) (nhn#647)

* fix: when resize schedule, fix reverted schedule on monthly view (nhn#646 issue 1)

* fix : resolve midnight schedule on monthly view(nhn#646 issue2)

* test: resolve broken TC
(for monthly mouse position)

* refactor: apply PR feedbacks

* fix: add datetime import

* fix: resolve midnight schedule issue

* refactor: remove whitespace

src/js/common/datetime.js

@@ -644,6 +644,12 @@ datetime = {
         var withinDay = diffDays === -1 && diffHours < 24 && datetime.isStartOfDay(end);
 
         return !datetime.isSameDate(start, end) && !withinDay;
+    },
+
+    renderEnd: function(start, end) {
+        return datetime.hasMultiDates(start, end) && datetime.isStartOfDay(end) ?
+            datetime.convertStartDayToLastDay(end) :
+            datetime.end(end);
     }
 };
 

src/js/controller/viewMixin/core.js

@@ -156,7 +156,7 @@ var Core = {
      * @param {function} [iteratee] - iteratee function invoke each view models
      */
     positionViewModels: function(start, end, matrices, iteratee) {
-        var ymdListToRender, endTime;
+        var ymdListToRender;
 
         ymdListToRender = util.map(
             datetime.range(start, end, datetime.MILLISECONDS_PER_DAY),
@@ -168,22 +168,21 @@ var Core = {
         forEachArr(matrices, function(matrix) {
             forEachArr(matrix, function(column) {
                 forEachArr(column, function(viewModel, index) {
-                    var ymd, dateLength;
+                    var ymd, dateLength, startDate, endDate;
 
                     if (!viewModel) {
                         return;
                     }
 
-                    ymd = datetime.format(viewModel.getStarts(), 'YYYYMMDD');
-                    endTime = viewModel.hasMultiDates ?
-                        datetime.end(viewModel.getEnds()) :
-                        datetime.convertStartDayToLastDay(viewModel.getEnds());
+                    startDate = viewModel.getStarts();
+                    endDate = viewModel.getEnds();
                     dateLength = datetime.range(
-                        datetime.start(viewModel.getStarts()),
-                        endTime,
+                        datetime.start(startDate),
+                        datetime.renderEnd(startDate, endDate),
                         datetime.MILLISECONDS_PER_DAY
                     ).length;
 
+                    ymd = datetime.format(startDate, 'YYYYMMDD');
                     viewModel.top = index;
                     viewModel.left = util.inArray(ymd, ymdListToRender);
                     viewModel.width = dateLength;

src/js/controller/viewMixin/month.js

@@ -163,7 +163,7 @@ var Month = {
 
             if (!model.isAllDay && viewModel.hasMultiDates) {
                 viewModel.renderStarts = datetime.start(start);
-                viewModel.renderEnds = datetime.convertStartDayToLastDay(end);
+                viewModel.renderEnds = datetime.renderEnd(start, end);
             }
         });
     },

src/js/controller/viewMixin/week.js

@@ -212,6 +212,7 @@ var Week = {
      * @returns {function} - filtering function
      */
     _makeHourRangeFilter: function(hStart, hEnd) {
+        // eslint-disable-next-line complexity
         return function(schedule) {
             var ownHourStart = schedule.model.start;
             var ownHourEnd = schedule.model.end;
@@ -241,9 +242,12 @@ var Week = {
     _addMultiDatesInfo: function(vColl) {
         vColl.each(function(viewModel) {
             var model = viewModel.model;
+            var start = model.getStarts();
+            var end = model.getEnds();
+
             viewModel.hasMultiDates = true;
-            viewModel.renderStarts = datetime.start(model.getStarts());
-            viewModel.renderEnds = datetime.convertStartDayToLastDay(model.getEnds());
+            viewModel.renderStarts = datetime.start(start);
+            viewModel.renderEnds = datetime.renderEnd(start, end);
         });
     },
 

src/js/handler/month/core.js

@@ -1,3 +1,4 @@
+/* eslint-disable complexity */
 /**
  * @fileoverview Module for calculate date by month view and mouse event object
  * @author NHN FE Development Lab <dl_javascript@nhn.com>
@@ -7,7 +8,8 @@
 var util = require('tui-code-snippet');
 var common = require('../../common/common'),
     domutil = require('../../common/domutil'),
-    domevent = require('../../common/domevent');
+    domevent = require('../../common/domevent'),
+    datetime = require('../../common/datetime');
 var mfloor = Math.floor;
 
 /**
@@ -91,7 +93,7 @@ function getMousePosDate(monthView) {
             y: y,
             sizeX: dayCount,
             sizeY: weekCount,
-            date: date,
+            date: datetime.end(date),
             weekdayView: weekdayView,
             triggerEvent: mouseEvent.type
         };

src/js/view/popup/scheduleCreationPopup.js

@@ -676,21 +676,17 @@ ScheduleCreationPopup.prototype._validateForm = function(title, startDate, endDa
  * @returns {RangeDate} Returns the start and end time data that is the range date
  */
 ScheduleCreationPopup.prototype._getRangeDate = function(startDate, endDate, isAllDay) {
-    if (isAllDay) {
-        startDate.setHours(0, 0, 0);
-        endDate = datetime.isStartOfDay(endDate) ?
-            datetime.convertStartDayToLastDay(endDate) :
-            endDate.setHours(23, 59, 59);
-    }
+    var start = isAllDay ? datetime.start(startDate) : startDate;
+    var end = isAllDay ? datetime.renderEnd(startDate, endDate) : endDate;
 
     /**
      * @typedef {object} RangeDate
      * @property {TZDate} start start time
      * @property {TZDate} end end time
      */
     return {
-        start: new TZDate(startDate),
-        end: new TZDate(endDate)
+        start: new TZDate(start),
+        end: new TZDate(end)
     };
 };
 

test/app/handler/month/core.spec.js

@@ -68,7 +68,7 @@ describe('handler:MonthCore', function() {
             y: 0,
             sizeX: 7,
             sizeY: 2,
-            date: new TZDate('2015-12-27T00:00:00+09:00'),
+            date: new TZDate('2015-12-27T23:59:59+09:00'),
             weekdayView: w1,
             triggerEvent: 'click'
         });
@@ -84,7 +84,7 @@ describe('handler:MonthCore', function() {
             y: 1,
             sizeX: 7,
             sizeY: 2,
-            date: new TZDate('2016-01-08T00:00:00+09:00'),
+            date: new TZDate('2016-01-08T23:59:59+09:00'),
             weekdayView: w2,
             triggerEvent: 'click'
         });