From 36266e8bc9df548f5f5245970dc4c1501ae3adbc Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Fri, 25 Apr 2014 10:57:37 +0200 Subject: [PATCH 1/2] [FIX] Calendar - Use date AND datetime to store the event date. If allday, we use a date, else a datetime bzr revid: jke@openerp.com-20140425085737-a0zmym07ydk0fltj --- addons/web_calendar/static/src/js/web_calendar.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index 380df1f4d4c..d7130e9bb15 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -508,8 +508,8 @@ openerp.web_calendar = function(instance) { date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop]) : null; } else { - date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'date'); - date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'date').addMinutes(-1) : null; + date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'zstart'); + date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'zstart') : null; //.addSeconds(-1) : null; } if (this.info_fields) { @@ -643,9 +643,9 @@ openerp.web_calendar = function(instance) { event_end = new Date(event.start); } if (this.all_day) { - event_end = (new Date(event_end.getTime())).addDays(1); - date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),12); - date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),12); + //event_end = (new Date(event_end.getTime())).addDays(1); + date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate())); + date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate())); } else { date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7); From 20545be3dbaead42fa836a1a029a90f197cc864b Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Mon, 5 May 2014 17:43:43 +0200 Subject: [PATCH 2/2] [REF] Replace temp name by real name bzr revid: jke@openerp.com-20140505154343-7r6t02n51ts8m8j9 --- addons/web_calendar/static/src/js/web_calendar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index 83039900a7f..23b11254b53 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -514,8 +514,8 @@ openerp.web_calendar = function(instance) { date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop]) : null; } else { - date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'zstart'); - date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'zstart') : null; //.addSeconds(-1) : null; + date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'start'); + date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'start') : null; //.addSeconds(-1) : null; } if (this.info_fields) {