From 3f8ccb69fc8e5836816f0b8fc1ea7d1c12e73dbb Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 17 Feb 2015 17:28:58 +0200 Subject: [PATCH] fix calendar shade color --- .../client/modules/crm/src/views/calendar/calendar.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/client/modules/crm/src/views/calendar/calendar.js b/frontend/client/modules/crm/src/views/calendar/calendar.js index 1411ef6009..544fb6d46c 100644 --- a/frontend/client/modules/crm/src/views/calendar/calendar.js +++ b/frontend/client/modules/crm/src/views/calendar/calendar.js @@ -152,8 +152,9 @@ Espo.define('Crm:Views.Calendar.Calendar', ['View', 'lib!FullCalendar'], functio fillColor: function (event) { var color = this.colors[event.scope]; - var d = event.end || event.start; - if (d.unix() < this.now.unix()) { + var d = event.dateEnd; + + if (d && this.getDateTime().toMoment(d).unix() < this.now.unix()) { color = this.shadeColor(color, 0.4); } event.color = color; @@ -194,7 +195,8 @@ Espo.define('Crm:Views.Calendar.Calendar', ['View', 'lib!FullCalendar'], functio }, convertToFcEvents: function (list) { - this.now = moment().utc(); + this.now = moment.tz(this.getDateTime().timeZone); + var events = []; list.forEach(function (o) { var event = this.convertToFcEvent(o);