[REF] Manage event color by css and not inline-style

bzr revid: jke@openerp.com-20131202142002-40tz3pslyxybib5q

4 files changed, 710 insertions, 44 deletions

diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.css b/addons/web_calendar/static/src/css/web_fullcalendar.css
index f31e1b9f0a5..b6a1f89df49 100644
--- a/addons/web_calendar/static/src/css/web_fullcalendar.css
+++ b/addons/web_calendar/static/src/css/web_fullcalendar.css
@@ -17,7 +17,345 @@
   size: 18px !important;
 }
 
-.fc-event-hori {
-	//border-width : 0px 0px 0px 0px;
+.cal_opacity {
+  opacity: 0.7;
 }
 
+.event_color_1 {
+  background-color: #a4bdfc;
+  color: #0d0d0d;
+}
+
+.event_color_2 {
+  background-color: #7ae7bf;
+  color: #0d0d0d;
+}
+
+.event_color_3 {
+  background-color: #dbadff;
+  color: #0d0d0d;
+}
+
+.event_color_4 {
+  background-color: #ff887c;
+  color: #0d0d0d;
+}
+
+.event_color_5 {
+  background-color: #fbd75b;
+  color: #0d0d0d;
+}
+
+.event_color_6 {
+  background-color: #ffb878;
+  color: #0d0d0d;
+}
+
+.event_color_7 {
+  background-color: #46d6db;
+  color: #0d0d0d;
+}
+
+.event_color_8 {
+  background-color: #e1e1e1;
+  color: #0d0d0d;
+}
+
+.event_color_9 {
+  background-color: #5484ed;
+  color: #0d0d0d;
+}
+
+.event_color_10 {
+  background-color: #51b749;
+  color: #0d0d0d;
+}
+
+.event_color_11 {
+  background-color: #dc2127;
+  color: #0d0d0d;
+}
+
+.calendar_color_1 {
+  border-color: #ac725e;
+  background-color: #ac725e;
+  color: #0d0d0d;
+}
+
+.calendar_color_2 {
+  border-color: #d06b64;
+  background-color: #d06b64;
+  color: #0d0d0d;
+}
+
+.calendar_color_3 {
+  border-color: #f83a22;
+  background-color: #f83a22;
+  color: #0d0d0d;
+}
+
+.calendar_color_4 {
+  border-color: #fa573c;
+  background-color: #fa573c;
+  color: #0d0d0d;
+}
+
+.calendar_color_5 {
+  border-color: #ff7537;
+  background-color: #ff7537;
+  color: #0d0d0d;
+}
+
+.calendar_color_6 {
+  border-color: #ffad46;
+  background-color: #ffad46;
+  color: #0d0d0d;
+}
+
+.calendar_color_7 {
+  border-color: #42d692;
+  background-color: #42d692;
+  color: #0d0d0d;
+}
+
+.calendar_color_8 {
+  border-color: #16a765;
+  background-color: #16a765;
+  color: #0d0d0d;
+}
+
+.calendar_color_9 {
+  border-color: #7bd148;
+  background-color: #7bd148;
+  color: #0d0d0d;
+}
+
+.calendar_color_10 {
+  border-color: #b3dc6c;
+  background-color: #b3dc6c;
+  color: #0d0d0d;
+}
+
+.calendar_color_11 {
+  border-color: #fbe983;
+  background-color: #fbe983;
+  color: #0d0d0d;
+}
+
+.calendar_color_12 {
+  border-color: #fad165;
+  background-color: #fad165;
+  color: #0d0d0d;
+}
+
+.calendar_color_13 {
+  border-color: #92e1c0;
+  background-color: #92e1c0;
+  color: #0d0d0d;
+}
+
+.calendar_color_14 {
+  border-color: #9fe1e7;
+  background-color: #9fe1e7;
+  color: #0d0d0d;
+}
+
+.calendar_color_15 {
+  border-color: #9fc6e7;
+  background-color: #9fc6e7;
+  color: #0d0d0d;
+}
+
+.calendar_color_16 {
+  border-color: #4986e7;
+  background-color: #4986e7;
+  color: #0d0d0d;
+}
+
+.calendar_color_17 {
+  border-color: #9a9cff;
+  background-color: #9a9cff;
+  color: #0d0d0d;
+}
+
+.calendar_color_18 {
+  border-color: #b99aff;
+  background-color: #b99aff;
+  color: #0d0d0d;
+}
+
+.calendar_color_19 {
+  border-color: #c2c2c2;
+  background-color: #c2c2c2;
+  color: #0d0d0d;
+}
+
+.calendar_color_20 {
+  border-color: #cabdbf;
+  background-color: #cabdbf;
+  color: #0d0d0d;
+}
+
+.calendar_color_21 {
+  border-color: #cca6ac;
+  background-color: #cca6ac;
+  color: #0d0d0d;
+}
+
+.calendar_color_22 {
+  border-color: #f691b2;
+  background-color: #f691b2;
+  color: #0d0d0d;
+}
+
+.calendar_color_23 {
+  border-color: #cd74e6;
+  background-color: #cd74e6;
+  color: #0d0d0d;
+}
+
+.calendar_color_24 {
+  border-color: #a47ae2;
+  background-color: #a47ae2;
+  color: #0d0d0d;
+}
+
+.underline_ecolor_1 {
+  border-bottom: 4px solid #a4bdfc;
+}
+
+.underline_ecolor_2 {
+  border-bottom: 4px solid #7ae7bf;
+}
+
+.underline_ecolor_3 {
+  border-bottom: 4px solid #dbadff;
+}
+
+.underline_ecolor_4 {
+  border-bottom: 4px solid #ff887c;
+}
+
+.underline_ecolor_5 {
+  border-bottom: 4px solid #fbd75b;
+}
+
+.underline_ecolor_6 {
+  border-bottom: 4px solid #ffb878;
+}
+
+.underline_ecolor_7 {
+  border-bottom: 4px solid #46d6db;
+}
+
+.underline_ecolor_8 {
+  border-bottom: 4px solid #e1e1e1;
+}
+
+.underline_ecolor_9 {
+  border-bottom: 4px solid #5484ed;
+}
+
+.underline_ecolor_10 {
+  border-bottom: 4px solid #51b749;
+}
+
+.underline_ecolor_11 {
+  border-bottom: 4px solid #dc2127;
+}
+
+.underline_color_1 {
+  border-bottom: 4px solid #ac725e;
+}
+
+.underline_color_2 {
+  border-bottom: 4px solid #d06b64;
+}
+
+.underline_color_3 {
+  border-bottom: 4px solid #f83a22;
+}
+
+.underline_color_4 {
+  border-bottom: 4px solid #fa573c;
+}
+
+.underline_color_5 {
+  border-bottom: 4px solid #ff7537;
+}
+
+.underline_color_6 {
+  border-bottom: 4px solid #ffad46;
+}
+
+.underline_color_7 {
+  border-bottom: 4px solid #42d692;
+}
+
+.underline_color_8 {
+  border-bottom: 4px solid #16a765;
+}
+
+.underline_color_9 {
+  border-bottom: 4px solid #7bd148;
+}
+
+.underline_color_10 {
+  border-bottom: 4px solid #b3dc6c;
+}
+
+.underline_color_11 {
+  border-bottom: 4px solid #fbe983;
+}
+
+.underline_color_12 {
+  border-bottom: 4px solid #fad165;
+}
+
+.underline_color_13 {
+  border-bottom: 4px solid #92e1c0;
+}
+
+.underline_color_14 {
+  border-bottom: 4px solid #9fe1e7;
+}
+
+.underline_color_15 {
+  border-bottom: 4px solid #9fc6e7;
+}
+
+.underline_color_16 {
+  border-bottom: 4px solid #4986e7;
+}
+
+.underline_color_17 {
+  border-bottom: 4px solid #9a9cff;
+}
+
+.underline_color_18 {
+  border-bottom: 4px solid #b99aff;
+}
+
+.underline_color_19 {
+  border-bottom: 4px solid #c2c2c2;
+}
+
+.underline_color_20 {
+  border-bottom: 4px solid #cabdbf;
+}
+
+.underline_color_21 {
+  border-bottom: 4px solid #cca6ac;
+}
+
+.underline_color_22 {
+  border-bottom: 4px solid #f691b2;
+}
+
+.underline_color_23 {
+  border-bottom: 4px solid #cd74e6;
+}
+
+.underline_color_24 {
+  border-bottom: 4px solid #a47ae2;
+}
diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.sass b/addons/web_calendar/static/src/css/web_fullcalendar.sass
index a93ae0652b6..65624a6d590 100644
--- a/addons/web_calendar/static/src/css/web_fullcalendar.sass
+++ b/addons/web_calendar/static/src/css/web_fullcalendar.sass
@@ -1,5 +1,42 @@
 @charset "utf-8"
 
+$color1: #ac725e
+$color2: #d06b64
+$color3: #f83a22
+$color4: #fa573c
+$color5: #ff7537
+$color6: #ffad46
+$color7: #42d692
+$color8: #16a765
+$color9: #7bd148
+$color10: #b3dc6c
+$color11: #fbe983
+$color12: #fad165
+$color13: #92e1c0
+$color14: #9fe1e7
+$color15: #9fc6e7
+$color16: #4986e7
+$color17: #9a9cff
+$color18: #b99aff
+$color19: #c2c2c2
+$color20: #cabdbf
+$color21: #cca6ac
+$color22: #f691b2
+$color23: #cd74e6
+$color24: #a47ae2
+$ecolor1: #a4bdfc
+$ecolor2: #7ae7bf
+$ecolor3: #dbadff
+$ecolor4: #ff887c
+$ecolor5: #fbd75b
+$ecolor6: #ffb878
+$ecolor7: #46d6db
+$ecolor8: #e1e1e1
+$ecolor9: #5484ed
+$ecolor10:#51b749
+$ecolor11: #dc2127
+$fontcolor: #0d0d0d 
+
 .openerp
     .oe_view_manager_view_calendar
         position: relative
@@ -16,4 +53,281 @@
 .attendee_head
     float: right
     margin-left: 1px
-    size: 18px !important
\ No newline at end of file
+    size: 18px !important
+    
+
+.cal_opacity 
+    opacity: 0.7
+            
+.event_color_1
+    background-color: $ecolor1
+    color: $fontcolor
+        
+.event_color_2
+    background-color: $ecolor2
+    color: $fontcolor
+        
+.event_color_3
+    background-color: $ecolor3
+    color: $fontcolor
+        
+.event_color_4
+    background-color: $ecolor4
+    color: $fontcolor
+    
+.event_color_5
+    background-color: $ecolor5
+    color: $fontcolor
+    
+.event_color_6
+    background-color: $ecolor6
+    color: $fontcolor
+    
+.event_color_7
+    background-color: $ecolor7
+    color: $fontcolor
+    
+.event_color_8
+    background-color: $ecolor8
+    color: $fontcolor
+    
+.event_color_9
+    background-color: $ecolor9
+    color: $fontcolor
+    
+.event_color_10
+    background-color: $ecolor10
+    color: $fontcolor
+    
+.event_color_11
+    background-color: $ecolor11
+    color: $fontcolor    
+    
+.calendar_color_1
+    border-color: $color1  
+    background-color: $color1
+    color: $fontcolor
+    
+.calendar_color_2
+    border-color: $color2
+    background-color: $color2
+    color: $fontcolor
+    
+.calendar_color_3
+    border-color: $color3
+    background-color: $color3
+    color: $fontcolor
+    
+.calendar_color_4
+    border-color: $color4
+    background-color: $color4
+    color: $fontcolor
+    
+.calendar_color_5
+    border-color: $color5
+    background-color: $color5
+    color: $fontcolor
+    
+.calendar_color_6
+    border-color: $color6
+    background-color: $color6
+    color: $fontcolor
+    
+.calendar_color_7
+    border-color: $color7
+    background-color: $color7
+    color: $fontcolor
+    
+.calendar_color_8
+    border-color: $color8
+    background-color: $color8
+    color: $fontcolor
+    
+.calendar_color_9
+    border-color: $color9
+    background-color: $color9
+    color: $fontcolor
+    
+.calendar_color_10
+    border-color: $color10
+    background-color: $color10
+    color: $fontcolor
+    
+.calendar_color_11
+    border-color: $color11
+    background-color: $color11
+    color: $fontcolor
+    
+.calendar_color_12
+    border-color: $color12
+    background-color: $color12
+    color: $fontcolor
+        
+.calendar_color_13
+    border-color: $color13
+    background-color: $color13
+    color: $fontcolor
+    
+.calendar_color_14
+    border-color: $color14
+    background-color: $color14
+    color: $fontcolor
+    
+.calendar_color_15
+    border-color: $color15
+    background-color: $color15
+    color: $fontcolor
+    
+.calendar_color_16
+    border-color: $color16
+    background-color: $color16
+    color: $fontcolor
+    
+.calendar_color_17
+    border-color: $color17
+    background-color: $color17
+    color: $fontcolor
+    
+.calendar_color_18
+    border-color: $color18
+    background-color: $color18
+    color: $fontcolor
+    
+.calendar_color_19
+    border-color: $color19
+    background-color: $color19
+    color: $fontcolor
+    
+.calendar_color_20
+    border-color: $color20
+    background-color: $color20
+    color: $fontcolor
+    
+.calendar_color_21
+    border-color: $color21
+    background-color: $color21
+    color: $fontcolor
+    
+.calendar_color_22
+    border-color: $color22
+    background-color: $color22
+    color: $fontcolor
+    
+.calendar_color_23
+    border-color: $color23
+    background-color: $color23
+    color: $fontcolor
+
+.calendar_color_24
+    border-color: $color24
+    background-color: $color24
+    color: $fontcolor
+
+
+
+.underline_ecolor_1
+    border-bottom: 4px solid $ecolor1
+    
+.underline_ecolor_2
+    border-bottom: 4px solid $ecolor2
+    
+.underline_ecolor_3
+    border-bottom: 4px solid $ecolor3
+    
+.underline_ecolor_4
+    border-bottom: 4px solid $ecolor4
+    
+.underline_ecolor_5
+    border-bottom: 4px solid $ecolor5
+    
+.underline_ecolor_6
+    border-bottom: 4px solid $ecolor6
+    
+.underline_ecolor_7
+    border-bottom: 4px solid $ecolor7
+    
+.underline_ecolor_8
+    border-bottom: 4px solid $ecolor8
+    
+.underline_ecolor_9
+    border-bottom: 4px solid $ecolor9
+    
+.underline_ecolor_10
+    border-bottom: 4px solid $ecolor10
+    
+.underline_ecolor_11
+    border-bottom: 4px solid $ecolor11
+    
+        
+.underline_color_1
+    border-bottom: 4px solid $color1
+    
+.underline_color_2
+    border-bottom: 4px solid $color2
+    
+.underline_color_3
+    border-bottom: 4px solid $color3
+    
+.underline_color_4
+    border-bottom: 4px solid $color4
+    
+.underline_color_5
+    border-bottom: 4px solid $color5
+    
+.underline_color_6
+    border-bottom: 4px solid $color6
+    
+.underline_color_7
+    border-bottom: 4px solid $color7
+    
+.underline_color_8
+    border-bottom: 4px solid $color8
+    
+.underline_color_9
+    border-bottom: 4px solid $color9
+    
+.underline_color_10
+    border-bottom: 4px solid $color10
+    
+.underline_color_11
+    border-bottom: 4px solid $color11
+    
+.underline_color_12
+    border-bottom: 4px solid $color12
+        
+.underline_color_13
+    border-bottom: 4px solid $color13
+    
+.underline_color_14
+    border-bottom: 4px solid $color14
+    
+.underline_color_15
+    border-bottom: 4px solid $color15
+    
+.underline_color_16
+    border-bottom: 4px solid $color16
+    
+.underline_color_17
+    border-bottom: 4px solid $color17
+    
+.underline_color_18
+    border-bottom: 4px solid $color18
+    
+.underline_color_19
+    border-bottom: 4px solid $color19
+    
+.underline_color_20
+    border-bottom: 4px solid $color20
+    
+.underline_color_21
+    border-bottom: 4px solid $color21
+    
+.underline_color_22
+    border-bottom: 4px solid $color22
+    
+.underline_color_23
+    border-bottom: 4px solid $color23
+
+.underline_color_24
+    border-bottom: 4px solid $color24
+        
\ No newline at end of file
diff --git a/addons/web_calendar/static/src/js/fullcalendar.js b/addons/web_calendar/static/src/js/fullcalendar.js
index c46327ecd39..ec43fdb2969 100644
--- a/addons/web_calendar/static/src/js/fullcalendar.js
+++ b/addons/web_calendar/static/src/js/fullcalendar.js
@@ -289,47 +289,48 @@ openerp.web_calendar = function(instance) {
             
                 if (this.useContacts) {
                     new instance.web.Model("res.users").query(["partner_id"]).filter([["id", "=",this.dataset.context.uid]]).first()
-                            .done(
-                                function(result) { 
-                                    var sidebar_items = {};
-                                    var filter_value = result.partner_id[0];
-                                    var filter_item = {
+                        .done(
+                            function(result) { 
+                                var sidebar_items = {};
+                                var filter_value = result.partner_id[0];
+                                var filter_item = {
+                                        value: filter_value,
+                                        label: result.partner_id[1] + " [Me]",
+                                        color: self.get_color(filter_value)
+                                    };
+                                sidebar_items[filter_value] = filter_item ;
+                                filter_item = {
+                                        value: -1,
+                                        label: "All partners [All]",
+                                        color: self.get_color(-1)
+                                    };
+                                sidebar_items[-1] = filter_item ;
+
+                                new instance.web.Model("web_calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
+                                    _.each(result, function(item) {
+                                        filter_value = item.partner_id[0];
+                                        filter_item = {
                                             value: filter_value,
-                                            label: result.partner_id[1] + " [Me]",
+                                            label: item.partner_id[1],
                                             color: self.get_color(filter_value)
                                         };
-                                    sidebar_items[filter_value] = filter_item ;
-                                    filter_item = {
-                                            value: -1,
-                                            label: "All partners [All]",
-                                            color: self.get_color(-1)
-                                        };
-                                    sidebar_items[-1] = filter_item ;
-
-                                    new instance.web.Model("web_calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
-                                        _.each(result, function(item) {
-                                            filter_value = item.partner_id[0];
-                                            filter_item = {
-                                                value: filter_value,
-                                                label: item.partner_id[1],
-                                                color: self.get_color(filter_value)
-                                            };
-                                            sidebar_items[filter_value] = filter_item ;
-                                        });
-                                        
-                                        self.allFilters = sidebar_items;
-                                        self.sidebar.filter.events_loaded(sidebar_items);
-                                        self.sidebar.filter.addUpdateButton();
-                                    }).done(function () { 
-                                        self.$calendar.fullCalendar('refetchEvents');            
+                                        sidebar_items[filter_value] = filter_item ;
                                     });
-                                }
-                             );
-                                          
-                }                            
+                                    
+                                    self.allFilters = sidebar_items;
+                                    self.sidebar.filter.events_loaded(sidebar_items);
+                                    self.sidebar.filter.addUpdateButton();
+                                }).done(function () { 
+                                    self.$calendar.fullCalendar('refetchEvents');            
+                                });
+                            }
+                         );               
+                };
+                
+                
             }
             self.$calendar.fullCalendar(self.get_fc_init_options());
-                            
+
             
             return $.when();
         },
@@ -392,6 +393,15 @@ openerp.web_calendar = function(instance) {
             if (this.color_map[key]) {
                 return this.color_map[key];
             }
+            var index = ((_.keys(this.color_map).length + 4) % 24) + 1;
+            this.color_map[key] = index;
+            return index;
+        },
+        
+        old_get_color: function(key) {
+            if (this.color_map[key]) {
+                return this.color_map[key];
+            }
             var index = _.keys(this.color_map).length % this.COLOR_PALETTE.length;
             var color = this.COLOR_PALETTE[index];
             this.color_map[key] = color;
@@ -551,17 +561,20 @@ openerp.web_calendar = function(instance) {
                 'attendees':attendees
             };
             
+
             if (!self.useContacts || self.all_filters[evt[this.color_field]] != undefined) {
                 if (this.color_field && evt[this.color_field]) {
                     var color_key = evt[this.color_field];
                     if (typeof color_key === "object") {
                         color_key = color_key[0];
                     }
-                    r.color = this.get_color(color_key);                
+                    //r.color = this.get_color(color_key);
+                    r.className = 'cal_opacity calendar_color_'+ this.get_color(color_key);                                
                 }
             }
             else  { // if form all, get color -1
-                r.color = self.all_filters[-1].color;
+//                r.color = self.all_filters[-1].color;
+                  r.className = 'cal_opacity calendar_color_'+ self.all_filters[-1].color;
             }
             
             return r;
@@ -1222,6 +1235,7 @@ openerp.web_calendar = function(instance) {
             }
             var loaded = $.Deferred();
             this.calendar_view.on("calendar_view_loaded", self, function() {
+                alert('Why never here ?');
                 self.initial_is_loaded.resolve();
                 loaded.resolve();
             });
@@ -1418,7 +1432,7 @@ openerp.web_calendar = function(instance) {
                 }).then( function(result) { return self.do_action(result); });
             });
             
-        }
+        },
     });
 
 };
diff --git a/addons/web_calendar/static/src/xml/web_fullcalendar.xml b/addons/web_calendar/static/src/xml/web_fullcalendar.xml
index d844a8d17e6..3deb1379b64 100644
--- a/addons/web_calendar/static/src/xml/web_fullcalendar.xml
+++ b/addons/web_calendar/static/src/xml/web_fullcalendar.xml
@@ -11,7 +11,7 @@
             </td>
             <td class='oe_calendar_sidebar_container'>
                  
-            </td>
+            </td>            
         </tr>
     </table>
   </t>
@@ -21,7 +21,7 @@
            <div class="oe_calendar_mini" />
            <div class="oe_calendar_filter">
                <h3><t t-esc="widget.getParent().color_string"/></h3>
-           </div>
+           </div>           
        </div>
    </t>
    <t t-name="CalendarView.sidebar.responsible">
@@ -34,7 +34,7 @@
                <t t-if="filters_value.value != -1">
                    <img t-att-src="'/web/binary/image?model=res.partner&amp;field=image_small&amp;id=' + filters_value.value"  width="24px" height="24px"/>     
                </t>
-               <span t-attf-style="border-bottom: 4px solid #{filters_value.color}"><t t-esc="filters_value.label" /></span>
+               <span t-attf-class="cal_opacity underline_color_#{filters_value.color}" ><t t-esc="filters_value.label" /></span>
                
            </div>
        </div>