Merge lp:~openerp-dev/openerp-web/trunk-improve-calendar-dragdrop-bth into lp:openerp-web

[Thibault Delavallée (OpenERP)]

[lp:~openerp-dev/openerp-web/trunk-improve-calendar-dragdrop-bth]

3758. By Jignesh Rathod(OpenERP) on 2013-06-17

Merge with latest web.

3759. By Bhumi Thakkar (Open ERP) on 2013-06-24

[MERGE]Merge lp:openerp-web.

3760. By Amit Bhavsar (Open ERP) on 2013-07-01

[MERGE] merge with latest trunk

3761. By Bhumi Thakkar (Open ERP) on 2013-07-02

[IMP]Get readonly modifiers from py file of date_start field of calendar view and set value of true or false to date_start field.

3762. By Bhumi Thakkar (Open ERP) on 2013-07-02

[MERGE]Merge lp:openerp-web.

3763. By Bhumi Thakkar (Open ERP) on 2013-07-09

[IMP]Get attrs of start_date field from calendar view.

3764. By Bhumi Thakkar (Open ERP) on 2013-07-11

[IMP]ON date_start field drag & drop will work and improved code.

3765. By Bhumi Thakkar (Open ERP) on 2013-07-11

[IMP]Improved code to remove exist data from object.

3766. By Bhumi Thakkar (Open ERP) on 2013-07-11

[MERGE]Merge lp:openerp-web.

3767. By Bhumi Thakkar (Open ERP) on 2013-07-11

[MERGE]Fixed issue of traceback on calendar view.

3768. By Bhumi Thakkar (Open ERP) on 2013-07-12

[IMP]Improved code for resize stop_date based on attribute of stop_date.

3769. By Bhumi Thakkar (Open ERP) on 2013-07-12

[MERGE]Merge lp:openerp-web.

3770. By Bhumi Thakkar (Open ERP) on 2013-07-16

[IMP]Improved code to pop up existing value and push updated value.

3771. By Bhumi Thakkar (Open ERP) on 2013-07-16

[MERGE]Merge lp:openerp-web.

3772. By Bhumi Thakkar (Open ERP) on 2013-07-16

[IMP]Improved code for reload dataset when create or update record.

3773. By Bhumi Thakkar (Open ERP) on 2013-08-13

[MERGE]Merge lp:openerp-web.

3774. By Bhumi Thakkar (Open ERP) on 2013-08-21

[IMP]Code Optimization.

3775. By Bhumi Thakkar (Open ERP) on 2013-08-21

[IMP]Code Optimization.

3776. By Bhumi Thakkar (Open ERP) on 2013-08-21

[MERGE]Merge lp:openerp-web.

3777. By Bhumi Thakkar (Open ERP) on 2013-10-29

[MERGE]Merge trunk.

3778. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

Unmerged revisions

3778. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

3777. By Bhumi Thakkar (Open ERP) on 2013-10-29

[MERGE]Merge trunk.

3776. By Bhumi Thakkar (Open ERP) on 2013-08-21

[MERGE]Merge lp:openerp-web.

3775. By Bhumi Thakkar (Open ERP) on 2013-08-21

[IMP]Code Optimization.

3774. By Bhumi Thakkar (Open ERP) on 2013-08-21

[IMP]Code Optimization.

3773. By Bhumi Thakkar (Open ERP) on 2013-08-13

[MERGE]Merge lp:openerp-web.

3772. By Bhumi Thakkar (Open ERP) on 2013-07-16

[IMP]Improved code for reload dataset when create or update record.

3771. By Bhumi Thakkar (Open ERP) on 2013-07-16

[MERGE]Merge lp:openerp-web.

3770. By Bhumi Thakkar (Open ERP) on 2013-07-16

[IMP]Improved code to pop up existing value and push updated value.

3769. By Bhumi Thakkar (Open ERP) on 2013-07-12

[MERGE]Merge lp:openerp-web.

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-10-18 12:32:53 +0000
+++ addons/web/static/src/css/base.css	2013-11-08 10:26:02 +0000
@@ -1440,6 +1440,11 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.openerp .oe_application .oe_breadcrumb_item:last-child {
+  max-width: 17em;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .openerp .oe_application .oe_breadcrumb_title > * {
   display: inline-block;
   overflow: hidden;
 
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-10-18 12:32:53 +0000
+++ addons/web/static/src/css/base.sass	2013-11-08 10:26:02 +0000
@@ -1157,6 +1157,10 @@
             max-width: 7em
             white-space: nowrap
             text-overflow: ellipsis
+        .oe_breadcrumb_item:last-child
+            max-width: 17em
+            white-space: nowrap
+            text-overflow: ellipsis
         .oe_breadcrumb_title > *
             display: inline-block
             overflow: hidden
 
=== modified file 'addons/web_calendar/static/src/js/calendar.js'
--- addons/web_calendar/static/src/js/calendar.js	2013-08-28 16:58:15 +0000
+++ addons/web_calendar/static/src/js/calendar.js	2013-11-08 10:26:02 +0000
@@ -66,12 +66,15 @@
         this._super();
     },
     load_calendar: function(data) {
+        var self = this;
         this.fields_view = data;
         this.$el.addClass(this.fields_view.arch.attrs['class']);
         this.calendar_fields = {};
+        this.res_event = [];
         this.ids = this.dataset.ids;
         this.color_values = [];
         this.info_fields = [];
+        this.field_modifiers = [];
 
         this.name = this.fields_view.name || this.fields_view.arch.attrs.string;
         this.view_id = this.fields_view.view_id;
@@ -83,7 +86,7 @@
         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 = 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] ?
@@ -96,7 +99,6 @@
             }
         }
         this.fields =  this.fields_view.fields;
-
         if (!this.date_start) {
             throw new Error(_t("Calendar view has not defined 'date_start' attribute."));
         }
@@ -117,7 +119,17 @@
         for (var fld = 0; fld < this.fields_view.arch.children.length; fld++) {
             this.info_fields.push(this.fields_view.arch.children[fld].attrs.name);
         }
-
+        var modifiers = [], modifiers_stop = [];
+        this.field_attrs_modifiers = [];
+        _.each(this.fields_view.arch.children, function(r) {
+            if (r.attrs.attrs) {
+                modifier = JSON.parse(r.attrs.modifiers || '{}')
+                if (r.attrs.name == self.date_start) 
+                    self.field_attrs_modifiers = modifier['readonly'];
+                if (r.attrs.name == self.date_stop) 
+                    self.field_stop_modifiers = modifier['readonly'];
+            }
+        });
         this.init_scheduler();
 
         if (!this.sidebar && this.options.$sidebar) {
@@ -125,6 +137,7 @@
             this.has_been_loaded.then(this.sidebar.appendTo(this.$el.find('.oe_calendar_sidebar_container')));
         }
         this.trigger('calendar_view_loaded', data);
+        
         return this.has_been_loaded.resolve();
     },
     init_scheduler: function() {
@@ -231,7 +244,30 @@
             }
            return false;
         });
-
+        scheduler.attachEvent('onBeforeDrag', function(event_id,mode,event) {
+            if (mode == "create") {
+                e = event || window.event; //e ||
+                scheduler.callEvent("onEmptyClick",[scheduler.getActionData(e).date, e]);
+            }
+            else{
+                for (i=0; i < self.res_event.length; i++) {
+                    if (self.res_event[i].id == event_id) {
+                        if (mode == "move") {
+                            result = (self.res_event[i].readonly==true || self.res_event[i].readonly==1) ? false : true;
+                            return result;
+                        } else if (mode == "resize") {
+                            var compute_domain = instance.web.form.compute_domain;
+                            var res = [];
+                            _.each(self.dataset_events[i], function(d, k){
+                                res[k] = {'value': d};
+                            });
+                            result = (compute_domain(self.field_stop_modifiers, res) == true) ? false : true;
+                            return result;
+                        }
+                    }
+                }
+            }
+        });
         this.refresh_scheduler();
 
         // Remove hard coded style attributes from dhtmlx scheduler
@@ -256,7 +292,12 @@
         scheduler.setCurrentView(scheduler._date);
     },
     reload_event: function(id) {
-        this.dataset.read_ids([id], _.keys(this.fields)).done(this.proxy('events_loaded'));
+        var self = this;
+        this.id = id;
+        this.dataset.read_ids([id], _.keys(this.fields)).done(function(events) {
+            _.each(events, function(event){self.dataset_events.push(event);});
+            self.events_loaded(events, false, true);
+        });
     },
     get_color: function(key) {
         if (this.color_map[key]) {
@@ -280,6 +321,16 @@
                 selection_label[value[0]] = value[1];
             });
         }
+        if (this.fields[this.date_start].states) {
+            var states = [];
+            var res = "";
+            _.each (this.fields[this.date_start].states, function(modifier, state) {
+                if (modifier[0][0] == "readonly")
+                    states.push(state);
+                res = (modifier[0][1] == false) ? ['state', 'not in', states] : ['state', 'in', states];
+            });
+            this.field_modifiers.push(res);
+        }
         for (var e = 0; e < events.length; e++) {
             var evt = events[e];
             if (!evt[this.date_start]) {
@@ -313,14 +364,28 @@
                     evt.textColor = '#000000';
                 }
             }
-
-            if (this.fields[this.date_start]['type'] == 'date') {
+            if (this.fields[this.date_start]['type'] == 'date' || this.fields[this.date_start]['type'] == 'datetime') {
                 evt[this.date_start] = instance.web.auto_str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
             }
             if (this.date_stop && evt[this.date_stop] && this.fields[this.date_stop]['type'] == 'date') {
                 evt[this.date_stop] = instance.web.auto_str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');
             }
-            res_events.push(this.convert_event(evt));
+            var converted_data = this.convert_event(evt);
+            res_events.push(converted_data);
+
+            if (events.length == 1) {
+                for (i=0; i<this.res_event.length; i++) {
+                    if (this.res_event[i].id == evt.id) {
+                        this.res_event.pop(this.res_event[i].id);
+                    }
+                }
+            }
+            if (events.length != this.res_event.length) {
+                this.res_event.push(converted_data);
+            }
+        }
+        if(events.length == this.res_event.length) {
+            this.res_event = res_events;
         }
         scheduler.parse(res_events, 'json');
         this.refresh_scheduler();
@@ -332,8 +397,8 @@
         var date_start = instance.web.str_to_datetime(evt[this.date_start]),
             date_stop = this.date_stop ? instance.web.str_to_datetime(evt[this.date_stop]) : null,
             date_delay = evt[this.date_delay] || 1.0,
+            readonly = this.process_modifiers(evt),
             res_text = '';
-
         if (this.info_fields) {
             res_text = _.map(this.info_fields, function(fld) {
                 if(evt[fld] instanceof Array)
@@ -348,7 +413,8 @@
             'start_date': date_start.toString('yyyy-MM-dd HH:mm:ss'),
             'end_date': date_stop.toString('yyyy-MM-dd HH:mm:ss'),
             'text': res_text.join(', '),
-            'id': evt.id
+            'id': evt.id,
+            'readonly': readonly
         };
         if (evt.color) {
             r.color = evt.color;
@@ -424,7 +490,6 @@
     current_mode: function() {
         return scheduler.getState().mode;
     },
-
     quick_save: function(event_id, event_obj) {
         var self = this;
         var data = this.get_event_data(event_obj);
@@ -464,6 +529,7 @@
     },
     slow_create: function(event_id, event_obj) {
         var self = this;
+        var def = $.Deferred();
         if (this.current_mode() === 'month') {
             event_obj['start_date'].addHours(8);
             if (event_obj._length === 1) {
@@ -477,7 +543,7 @@
         _.each(this.get_event_data(event_obj), function(val, field_name) {
             defaults['default_' + field_name] = val;
         });
-        var something_saved = false;
+        var something_saved = false, reload = false, created_id = null;
         var pop = new instance.web.form.FormOpenPopup(this);
         var pop_infos = this.get_form_popup_infos();
         pop.show_element(this.dataset.model, null, this.dataset.get_context(defaults), {
@@ -485,16 +551,24 @@
             disable_multiple_selection: true,
             view_id: pop_infos.view_id,
         });
-        pop.on('closed', self, function() {
-            if (!something_saved) {
-                scheduler.deleteEvent(event_id);
-            }
-        });
         pop.on('create_completed', self, function(id) {
             something_saved = true;
+            def.resolve(id).promise();
             self.dataset.ids.push(id);
+            created_id = id;
             scheduler.changeEventId(event_id, id);
-            self.reload_event(id);
+        });
+        pop.on('closed', self, function(id) {
+            $.when(def).then(function(id) {
+                if (something_saved) {
+                    reload = true;
+                    something_saved = false;
+                }
+            });
+            if (reload) {
+                self.reload_event(created_id);
+                reload = false;
+            }
         });
     },
     open_event: function(event_id) {
@@ -521,8 +595,12 @@
                 title: _.str.sprintf(_t("Edit: %s"), pop_infos.title),
                 view_id: pop_infos.view_id,
             });
-            pop.on('write_completed', self, function(){
-                self.reload_event(id_from_dataset);
+            var reload = false;
+            pop.on('closed', self, function() {
+                if(!reload){
+                    self.reload_event(id_from_dataset);
+                    reload = true;
+                }
             });
         }
     },
@@ -535,6 +613,17 @@
             this.dataset.unlink(this.dataset.ids[index]);
         }
     },
+    process_modifiers: function(field){
+        var compute_domain = instance.web.form.compute_domain;
+        var res = [];
+        _.each(field, function(d, k){
+            res[k] = {'value': d};
+        });
+        var result = false;
+        if (this.field_attrs_modifiers.length) result = compute_domain(this.field_attrs_modifiers, res);
+        else if (this.field_modifiers.length) result = compute_domain(this.field_modifiers, res);
+        return result;
+    },
 });
 
 instance.web_calendar.Sidebar = instance.web.Widget.extend({
 
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css	2013-10-02 09:37:30 +0000
+++ addons/web_kanban/static/src/css/kanban.css	2013-11-08 10:26:02 +0000
@@ -198,6 +198,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_add {
   top: -8px;
+  z-index: 1;
 }
 .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
   top: -2px;
 
=== modified file 'addons/web_kanban/static/src/css/kanban.sass'
--- addons/web_kanban/static/src/css/kanban.sass	2013-10-02 09:37:30 +0000
+++ addons/web_kanban/static/src/css/kanban.sass	2013-11-08 10:26:02 +0000
@@ -213,6 +213,7 @@
         position: relative
     .oe_kanban_add
         top: -8px
+        z-index: 1
     .oe_kanban_header .oe_dropdown_toggle
         top: -2px
         height: 14px