Merge lp:~openerp-dev/openerp-web/7.0-bug-1072709-fme into lp:openerp-web/7.0

[Fabien Meghazi (OpenERP)]

As I couldn't think of the best behavior for this very strange calendar feature ( day_length ), I used a very simple and naive algorithm.

[lp:~openerp-dev/openerp-web/7.0-bug-1072709-fme]

3871. By Fabien Meghazi (OpenERP) on 2013-03-28

[REM] Removed useless variable

[Fabien Meghazi (OpenERP) (fme)]

This feature will/shall not be re-implemented :
https://bugs.launchpad.net/openerp-web/+bug/1072709/comments/2

Unmerged revisions

3872. By Fabien Meghazi (OpenERP) on 2013-04-08

[MERGE] 7.0

3871. By Fabien Meghazi (OpenERP) on 2013-03-28

[REM] Removed useless variable

3870. By Fabien Meghazi (OpenERP) on 2013-03-28

[IMP] Improved day_length a bit

3869. By Fabien Meghazi (OpenERP) on 2013-03-28

[WIP] Start support for day_length

=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js	2013-03-21 22:54:02 +0000
+++ addons/web_calendar/static/src/js/calendar.js	2013-03-28 16:56:21 +0000
@@ -60,7 +60,6 @@
     load_calendar: function(data) {
         this.fields_view = data;
         this.$el.addClass(this.fields_view.arch.attrs['class']);
-        this.calendar_fields = {};
         this.ids = this.dataset.ids;
         this.color_values = [];
         this.info_fields = [];
@@ -75,8 +74,8 @@
         this.date_start = this.fields_view.arch.attrs.date_start;
         this.date_delay = this.fields_view.arch.attrs.date_delay;
         this.date_stop = this.fields_view.arch.attrs.date_stop;
+        this.day_length = parseInt(this.fields_view.arch.attrs.day_length, 10) || 8;
 
-        this.day_length = this.fields_view.arch.attrs.day_length || 8;
         this.color_field = this.fields_view.arch.attrs.color;
         this.color_string = this.fields_view.fields[this.color_field] ?
             this.fields_view.fields[this.color_field].string : _t("Filter");
@@ -93,17 +92,8 @@
             throw new Error(_t("Calendar view has not defined 'date_start' attribute."));
         }
 
-        //* Calendar Fields *
-        this.calendar_fields.date_start = {'name': this.date_start, 'kind': this.fields[this.date_start].type};
-
-        if (this.date_delay) {
-            if (this.fields[this.date_delay].type != 'float') {
-                throw new Error(_t("Calendar view has a 'date_delay' type != float"));
-            }
-            this.calendar_fields.date_delay = {'name': this.date_delay, 'kind': this.fields[this.date_delay].type};
-        }
-        if (this.date_stop) {
-            this.calendar_fields.date_stop = {'name': this.date_stop, 'kind': this.fields[this.date_stop].type};
+        if (this.date_delay && this.fields[this.date_delay].type != 'float') {
+            throw new Error(_t("Calendar view has a 'date_delay' type != float"));
         }
 
         for (var fld = 0; fld < this.fields_view.arch.children.length; fld++) {
@@ -321,7 +311,19 @@
             });
         }
         if (!date_stop && date_delay) {
-            date_stop = date_start.clone().addHours(date_delay);
+            // `day_length` is a strange feature considering we have no concept
+            // of working day timerange. Besides, there's no support for such
+            // a thing in dhtmlxscheduler.
+            var days = Math.floor(date_delay / this.day_length);
+            var remaining_seconds = (date_delay % this.day_length) * 3600;
+            if (!remaining_seconds) {
+                // On rounded number of days, remove one second in order to
+                // avoid spaning on one more day. Not exact but this is
+                // what people expect.
+                days -= 1;
+                remaining_seconds = this.day_length * 3600 - 1;
+            }
+            date_stop = date_start.clone().addDays(days).addSeconds(remaining_seconds);
         }
         var r = {
             'start_date': date_start.toString('yyyy-MM-dd HH:mm:ss'),