Merge lp:~openerp-dev/openobject-client-web/trunk-cal-events-readonly into lp:openobject-client-web/trunk

[Olivier Laurent (Open ERP)]

Some events have their 'starting date' and 'end date' read only depending on their state. For example, you cannot edit crm.meeting dates if it's state is 'done'.

But the calendar was not taking care of this and you could drag and drop events regardless of their state.

This branch is supposed to fix that.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

* New code should avoid using Mochikit functions when possible, and use jQuery instead (hasElementClass, getNodeAttribute)
* The call to self._is_event_droppable could probably go directly into the final TinyEvent call
* In the templates, TinyEvent.droppable is accessed 6 times (I think) and every single time it's in a conditional to decide on the right class to set. Maybe TinyEvent should have an additional droppable_class property which would directly return the right class for the event, no?

review: Needs Fixing

[lp:~openerp-dev/openobject-client-web/trunk-cal-events-readonly]

3716. By Olivier Laurent (Open ERP) on 2010-10-26

[IMP] calendar: simplified the way we access the 'state' attribute from fields

PS: thanks to Xavier

3717. By Olivier Laurent (Open ERP) on 2010-10-26

[FIX] gantt: calendar objects with server side readonly date fields should not be movable

3718. By Olivier Laurent (Open ERP) on 2010-10-26

[FIX] calendar, gantt: MochiKit -> jQuery

3719. By Olivier Laurent (Open ERP) on 2010-10-26

[FIX] calendar, gantt: MochiKit -> jQuery

3720. By Olivier Laurent (Open ERP) on 2010-10-26

[IMP] calendar: removed '_is_event_droppable' method

[Olivier Laurent (Open ERP) (olt)]

> * New code should avoid using Mochikit functions when possible, and use jQuery
> instead (hasElementClass, getNodeAttribute)

Ok. I did it but only for functions I added myself. I left the other one as is.

> * The call to self._is_event_droppable could probably go directly into the
> final TinyEvent call

Did it.

> * In the templates, TinyEvent.droppable is accessed 6 times (I think) and
> every single time it's in a conditional to decide on the right class to set.
> Maybe TinyEvent should have an additional droppable_class property which would
> directly return the right class for the event, no?

I started by adding an attribute to the div but I ran into some problems, which were probably related to something else. Since it's not always easy to debug javascript, I moved that atrribute to a new class. Perhaps that in the mean time, my problems were solved but I left that class. Now that code is running with the class, I could probably move it to an attribute again.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

> Ok. I did it but only for functions I added myself. I left the other one as is.

Yep, sensible, didn't expect you to fix everything.

Note that (for next time around maybe) jQuery's `hasClass` works on element sets, so

    jQuery(element).hasClass('is-not-droppable') || jQuery(element.parentNode).hasClass('is-not-droppable')

could also have been written

    jQuery([element, element.parentNode]).hasClass('is-not-droppable')

> Did it.

OK

> I started by adding an attribute to the div but I ran into some problems, which were probably related to something else. Since it's not always easy to debug javascript, I moved that atrribute to a new class. Perhaps that in the mean time, my problems were solved but I left that class. Now that code is running with the class, I could probably move it to an attribute again.

Class is OK, I didn't mean a DOM attribute, just that the code

    ${evt.droppable and 'is-droppable' or 'is-not-droppable'}

is repeated several time, and thus that maybe instead of having `evt.droppable` we could have `evt.droppable_class` with the right value and thus we could just write `${evt.droppable_class}`. Doesn't really matter.

review: Approve

[lp:~openerp-dev/openobject-client-web/trunk-cal-events-readonly]

3721. By Olivier Laurent (Open ERP) on 2010-10-27

[IMP] calendar, gantt: movability and resizeability (based on object 'state') are now separated

3722. By Olivier Laurent (Open ERP) on 2010-10-27

[IMP] calendar, gantt: minor modifs

=== modified file 'addons/view_calendar/static/javascript/calendar_gantt.js'
--- addons/view_calendar/static/javascript/calendar_gantt.js	2010-10-08 06:38:34 +0000
+++ addons/view_calendar/static/javascript/calendar_gantt.js	2010-10-27 09:48:00 +0000
@@ -18,28 +18,28 @@
 };
 
 GanttCalendar.prototype = {
-   
+
     __init__: function(options) {
-      
+
         this.options = MochiKit.Base.update({
-         
+
         }, options || {});
-      
+
         this.starts = MochiKit.DateTime.isoDate(getNodeAttribute('calGantt', 'dtStart'));
-      
+
         this.mode = openobject.dom.get('_terp_selected_mode').value;
         this.range = parseInt(getNodeAttribute('calGantt', 'dtRange')) || 7;
 
         this.scale = 0;
         this.header = new GanttCalendar.Header(this);
-      
+
         this.events = {};
-        this.groups = {};      
-      
+        this.groups = {};
+
         this._makeEvents();
-      
+
         MochiKit.DOM.removeElement('calBodySect');
-            
+
         var tbl = TABLE(null,
                 TBODY(null,
                         TR(null,
@@ -48,13 +48,13 @@
                         TR(null,
                                 TD({'width': 200, 'nowrap': 'nowrap'}, DIV({'id': 'calListC'})),
                                 TD({}, DIV({'id': 'calGridC'})))));
-      
+
         tbl.cellPadding = 0;
         tbl.cellSpacing = 0;
-      
+
         tbl.style.width = '100%';
         tbl.style.height = '100%';
-      
+
         MochiKit.DOM.appendChildNodes('calGantt', tbl);
 
         this.grid = new GanttCalendar.Grid(this);
@@ -65,7 +65,7 @@
         this.lc = openobject.dom.get('calListC');
 
         this.attachSignals();
-      
+
     },
 
     __delete__: function() {
@@ -96,21 +96,21 @@
     },
 
     onResize: function(evt) {
-        
+
         var h1 = getElementDimensions('calGroupC').h;
         var h2 = openobject.dom.get('calGridC').clientHeight;
 
         setElementDimensions('calList', {h: h1 > h2 ? h1 : h2});
         setElementDimensions('calGrid', {h: h1 > h2 ? h1 : h2});
     },
-      
+
     onScrollGrid: function(evt) {
         this.lc.scrollTop = this.gc.scrollTop;
         this.hc.scrollLeft = this.gc.scrollLeft;
     },
-   
+
     _makeEvents: function() {
-   
+
         this.events = {};
         this.groups = {};
 
@@ -118,7 +118,7 @@
         var groups = openobject.dom.select('div.calGroup', 'calGantt') || [];
 
         for (var i = 0; i < events.length; i++) {
-        
+
             var elem = events[i];
             var id = MochiKit.DOM.getNodeAttribute(elem, 'nRecordID');
 
@@ -142,7 +142,7 @@
         }
 
         for (var i = 0; i < groups.length; i++) {
-        
+
             var elem = groups[i];
             var id = MochiKit.DOM.getNodeAttribute(elem, 'nRecordID');
             var items = MochiKit.DOM.getNodeAttribute(elem, 'items');
@@ -208,7 +208,7 @@
             return;
         }
 
-        var dt = this.computeDates(element); 
+        var dt = this.computeDates(element);
 
         var pos = getElementPosition(element, 'calGrid');
         var dim = getElementDimensions(element);
@@ -243,25 +243,31 @@
         var dt = this.computeDates(element);
 
         var self = this;
-        var req = saveCalendarRecord(id, toISOTimestamp(dt.starts), toISOTimestamp(dt.ends));
-
-        req.addCallback(function(obj) {
-
-            if (obj.error) {
+
+        var recordmoveinfo = getRecordMovability(element);
+        if (recordmoveinfo.starts != toISOTimestamp(dt.starts) && recordmoveinfo.ends != toISOTimestamp(dt.ends)) {
+            if (recordmoveinfo.is_not_movable) {
                 self.grid.adjust();
-                return error_display(obj.error);
+                return error_display(_("This calendar object can no longer be moved !"));
+            } else {
+                var req = saveCalendarRecord(id, toISOTimestamp(dt.starts), toISOTimestamp(dt.ends));
+
+                req.addCallback(function(obj) {
+
+                    if (obj.error) {
+                        self.grid.adjust();
+                        return error_display(obj.error);
+                    }
+
+                    self.events[id].starts = toISOTimestamp(dt.starts);
+                    self.events[id].ends = toISOTimestamp(dt.ends);
+
+                    setNodeAttribute(element, 'dtstart', toISOTimestamp(dt.starts));
+                    setNodeAttribute(element, 'dtend', toISOTimestamp(dt.ends));
+                    self.grid.adjust();
+                });
             }
-
-            self.events[id].starts = toISOTimestamp(dt.starts);
-            self.events[id].ends = toISOTimestamp(dt.ends);
-
-            setNodeAttribute(element, 'dtstart', toISOTimestamp(dt.starts));
-            setNodeAttribute(element, 'dtend', toISOTimestamp(dt.ends));
-
-            //self.grid.adjust();
-            getCalendar();
-        });
-
+        }
     },
 
     onEventResized: function(resizable, evt) {
@@ -300,21 +306,26 @@
         se.setMinutes(m);
 
         var self = this;
-        var req = saveCalendarRecord(id, toISOTimestamp(ds), toISOTimestamp(se));
-
-        req.addCallback(function(obj) {
-
-            if (obj.error) {
+
+        var recordmoveinfo = getRecordMovability(element);
+        if (recordmoveinfo.is_not_resizeable) {
+            self.grid.adjust();
+            return error_display(_("This calendar object can no longer be resized !"));
+        } else {
+            var req = saveCalendarRecord(id, toISOTimestamp(ds), toISOTimestamp(se));
+
+            req.addCallback(function(obj) {
+
+                if (obj.error) {
+                    self.grid.adjust();
+                    return error_display(obj.error);
+                }
+
+                self.events[id].ends = toISOTimestamp(se);
+                setNodeAttribute(element, 'dtend', toISOTimestamp(se));
                 self.grid.adjust();
-                return error_display(obj.error);
-            }
-
-            self.events[id].ends = toISOTimestamp(se);
-            setNodeAttribute(element, 'dtend', toISOTimestamp(se));
-
-            //self.grid.adjust();
-            getCalendar();
-        });
+            });
+        }
     }
 };
 
@@ -388,11 +399,11 @@
         this.elements = [DIV({'class': 'calHeader'}, divs), DIV({'class': 'calHeader'}, subs)];
     },
 
-   
+
     __delete__: function() {
     },
 
-    adjust: function() {      
+    adjust: function() {
     }
 };
 
@@ -443,7 +454,7 @@
         });
 
         appendChildNodes('calListC', DIV({'id': 'calList'}, elements));
-        
+
         //XXX: MochiKit bug #140 (http://trac.mochikit.com/ticket/140)
         MochiKit.Position.includeScrollOffsets = true;
 
@@ -453,9 +464,9 @@
                 'only': ['calEventLabel'],
                 'containment': elements
             });
-        });     
+        });
     },
-   
+
     __delete__: function() {
         forEach(this._signals, function(s) {
             MochiKit.Signal.disconnect(s);
@@ -481,7 +492,6 @@
     },
 
     onToggle: function(element, group, evt) {
-
         var key = openobject.dom.get('_terp_model').value + '-' + group.model + '-' + group.id;
 
         var visible = this.stat[key];
@@ -549,7 +559,7 @@
 GanttCalendar.Grid.prototype = {
 
     __init__: function(calendar) {
-      
+
         this.calendar = calendar;
         this.starts = calendar.starts;
 
@@ -562,9 +572,9 @@
     __delete__: function() {
 
     },
-   
+
     _makeGrid: function() {
-      
+
         this.columns = [];
 
         var divs = [];
@@ -630,7 +640,7 @@
 GanttCalendar.GridColumn.prototype = {
 
     __init__: function(calendar, spec) {
-      
+
         this.calendar = calendar;
         this.spec = spec;
 
@@ -669,7 +679,7 @@
 
         var group = calendar.groups[id];
         var events = calendar.events;
-        
+
         this.id = id;
         this.title = group.title;
         this.model = group.model;
@@ -682,7 +692,7 @@
         var self = this;
         forEach(this.items, function(id) {
             var evt = events[id];
-            
+
             var div = DIV({
                 'nRecordID': id,
                 'dtStart': evt.starts,
@@ -723,7 +733,7 @@
     calculate_usages: function() {
 
         this.bars = [];
-        
+
         if (!this.events.length) {
             return;
         }
@@ -789,7 +799,7 @@
                     n += 1;
                 }
             });
-            
+
             div.style.backgroundColor = n == 1 ? "blue" : n > 1 ? "red" : "";
 
             return div;
@@ -835,7 +845,7 @@
         forEach(this.events, function(e) {
             e.adjust();
         });
-        
+
         var w = 0;
 
         forEach(this.calendar.header.specs, function(spec) {
@@ -941,7 +951,7 @@
         }
 
         var x = Math.round(x / snap) * snap;
-        
+
         return [x + 1, y];
     }
 };

=== modified file 'addons/view_calendar/static/javascript/calendar_month.js'
--- addons/view_calendar/static/javascript/calendar_month.js	2010-09-28 12:02:18 +0000
+++ addons/view_calendar/static/javascript/calendar_month.js	2010-10-27 09:48:00 +0000
@@ -404,23 +404,33 @@
         e = toISOTimestamp(new Date(e))
 
         var self = this;
-        var req = saveCalendarRecord(id, s, e);
-
-        req.addCallback(function(obj) {
-
-            if (obj.error) {
-                return error_display(obj.error);
+
+        // check that the object was really modified to avoid unnecessary warning popups:
+        var recordmoveinfo = getRecordMovability(draggable);
+        if (recordmoveinfo.starts != s && recordmoveinfo.ends != e) {
+            if (recordmoveinfo.is_not_movable){
+                self.calendar.onResize();
+                return error_display(_("This calendar object can no longer be moved !"));
+            } else {
+                var req = saveCalendarRecord(id, s, e);
+
+                req.addCallback(function(obj) {
+
+                    if (obj.error) {
+                        return error_display(obj.error);
+                    }
+
+                    record.starts = s;
+                    record.ends = e;
+
+                    self.calendar.makeEvents();
+                });
+                req.addBoth(function(obj) {
+                    self.calendar.onResize();
+                });
             }
-
-            record.starts = s;
-            record.ends = e;
-
-            self.calendar.makeEvents();
-        });
-
-        req.addBoth(function(obj) {
-            self.calendar.onResize();
-        });
+        }
+        self.calendar.onResize();
     },
 
     makeEventContainers : function() {

=== modified file 'addons/view_calendar/static/javascript/calendar_utils.js'
--- addons/view_calendar/static/javascript/calendar_utils.js	2010-08-19 14:11:12 +0000
+++ addons/view_calendar/static/javascript/calendar_utils.js	2010-10-27 09:48:00 +0000
@@ -154,7 +154,6 @@
 }
 
 function saveCalendarRecord(record_id, starts, ends) {
-
     var params = getFormParams('_terp_concurrency_info');
     MochiKit.Base.update(params, {
         '_terp_id': record_id,
@@ -203,3 +202,13 @@
         '_terp_context': openobject.dom.get('_terp_context').value
     });
 }
+
+function getRecordMovability(element) {
+    return {
+        starts: jQuery(element).attr('dtstart'),
+        ends : jQuery(element).attr('dtend'),
+        is_not_movable: jQuery(element, element.parentNode).hasClass('event-is-not-movable')
+        is_not_resizeable: jQuery(element, element.parentNode).hasClass('event-is-not-resizeable')
+    }
+}
+

=== modified file 'addons/view_calendar/static/javascript/calendar_week.js'
--- addons/view_calendar/static/javascript/calendar_week.js	2010-10-25 12:26:19 +0000
+++ addons/view_calendar/static/javascript/calendar_week.js	2010-10-27 09:48:00 +0000
@@ -84,7 +84,6 @@
     },
 
     onResizeEnd : function(resizable, evt) {
-
         var element = resizable.element;
 
         if (!hasElementClass(element, 'calEvent')) return;
@@ -98,10 +97,16 @@
 
         var self = this;
 
+        // check that the object was really modified to avoid unnecessary warning popups:
+        var recordmoveinfo = getRecordMovability(element);
+        if (recordmoveinfo.is_not_resizeable) {
+            self.dayGrid.adjust();
+            return error_display(_("This calendar object can no longer be resized !"));
+        }
+
         var req = saveCalendarRecord(id, toISOTimestamp(dt), toISOTimestamp(e));
 
         req.addCallback(function(obj) {
-
             if (obj.error) {
                 return error_display(obj.error);
             }
@@ -245,7 +250,6 @@
     },
 
     onDrop : function(draggable, droppable, evt) {
-
         var dt = MochiKit.DateTime.isoDate(getNodeAttribute(droppable, 'dtDay'));
         var id = getNodeAttribute(draggable, 'nRecordID');
 
@@ -263,23 +267,34 @@
         e = toISOTimestamp(new Date(e))
 
         var self = this;
-        var req = saveCalendarRecord(id, s, e);
-
-        req.addCallback(function(obj) {
-
-            if (obj.error) {
-                return error_display(obj.error);
+
+        var recordmoveinfo = getRecordMovability(draggable);
+
+        // check that the object was really modified to avoid unnecessary warning popups:
+        if (recordmoveinfo.starts != s && recordmoveinfo.ends != e) {
+            if (recordmoveinfo.is_not_movable) {
+                self.adjust();
+                return error_display(_("This calendar object can no longer be moved !"));
+            } else {
+                var req = saveCalendarRecord(id, s, e);
+
+                req.addCallback(function(obj) {
+
+                    if (obj.error) {
+                        return error_display(obj.error);
+                    }
+
+                    record.starts = s;
+                    record.ends = e;
+
+                    self.makeEvents();
+                });
+                req.addBoth(function(obj) {
+                    self.adjust();
+                });
             }
-
-            record.starts = s;
-            record.ends = e;
-
-            self.makeEvents();
-        });
-
-        req.addBoth(function(obj) {
-            self.adjust();
-        });
+        }
+        self.adjust();
     },
 
     onMouseDown : function(evt) {
@@ -405,7 +420,7 @@
                 grid: this,                     // reference to the grid
                 calendar: self.calendar,        // reference to the calendar
                 events: [],                     // events in the day container
-            	rows: []                        // mark used rows
+                rows: []                        // mark used rows
             }
         }
 
@@ -638,10 +653,10 @@
     },
 
     onDrop : function(draggable, droppable, evt) {
-
         var dt = MochiKit.DateTime.isoDate(getNodeAttribute(droppable, 'dtDay'));
         var id = getNodeAttribute(draggable, 'nRecordID');
 
+
         var y = parseInt(draggable.style.top);
         var h = parseInt(draggable.style.height) + 2;
 
@@ -655,6 +670,17 @@
         e = new Date(e);
 
         var self = this;
+
+
+        // check that the object was really modified to avoid unnecessary warning popups:
+        var recordmoveinfo = getRecordMovability(draggable);
+        if (recordmoveinfo.starts != toISOTimestamp(s) && recordmoveinfo.ends != toISOTimestamp(e)) {
+            if (recordmoveinfo.is_not_movable) {
+                self.adjust();
+                return error_display(_("This calendar object can no longer be moved !"));
+            }
+        }
+
         var req = saveCalendarRecord(id, toISOTimestamp(s), toISOTimestamp(e));
 
         req.addCallback(function(obj) {
@@ -676,7 +702,7 @@
             t.shift();
             t = t.join(' - ');
 
-            title.innerHTML = s.strftime('%I:%M %P') + ' - ' + t;
+            title.innerHTML = s.strftime('%H:%M') + ' - ' + t;
         });
 
         req.addBoth(function(obj) {

=== modified file 'addons/view_calendar/widgets/_base.py'
--- addons/view_calendar/widgets/_base.py	2010-10-25 09:07:29 +0000
+++ addons/view_calendar/widgets/_base.py	2010-10-27 09:48:00 +0000
@@ -75,7 +75,7 @@
     record = {}
     record_id = False
 
-    def __init__(self, record, starts, ends, title='', description='', dayspan=0, color=None):
+    def __init__(self, record, starts, ends, title='', description='', dayspan=0, color=None, classes=None):
 
         super(TinyEvent, self).__init__()
 
@@ -95,6 +95,8 @@
         self.create_uid = ustr(record.get('create_uid'))
         self.write_uid = ustr(record.get('write_uid'))
         self.write_date = ustr(record.get('write_date'))
+        self.classes = classes and ' '.join(classes) or ''
+
 
 class ICalendar(TinyWidget):
     """ Base Calendar calss
@@ -174,7 +176,7 @@
         self.info_fields = self.parse(root, view['fields'])
 
         fields = view['fields']
-        fields = fields.keys() + [self.date_start, self.date_stop, self.date_delay, self.color_field]
+        fields = fields.keys() + [self.date_start, self.date_stop, self.date_delay, self.color_field, 'state']
 
         fields = list(set([x for x in fields if x]))
 
@@ -228,9 +230,11 @@
         proxy = rpc.RPCProxy(self.model)
 
         if self.date_stop:
+            # use the correct algorithm:
             domain = self.domain + [(self.date_start, '<=', days[-1].isoformat() + ' 23:59:59'),
                                     (self.date_stop, '>=', days[0].isoformat() + ' 00:00:00')]
         else:
+            # cannot use the correct algorithm, use the old one:
             first = days[0].month2.prev()[0] #HACK: add prev month
             domain = self.domain + [(self.date_start, '>', first.isoformat()),
                                     (self.date_start, '<', days[-1].next().isoformat())]
@@ -271,6 +275,7 @@
         ids = proxy.search(domain, 0, 0, order_by, ctx)
 
         result = proxy.read(ids, self.fields.keys()+['__last_update'], ctx)
+
         self._update_concurrency_info(self.model, result)
         self.concurrency_info = ConcurrencyInfo(self.model, ids)
         if self.color_field:
@@ -310,7 +315,6 @@
         return result
 
     def get_event_widget(self, event):
-
         title = ''       # the title
         description = [] # the description
         if self.info_fields:
@@ -377,19 +381,37 @@
 
         color_key = event.get(self.color_field)
         color = self.colors.get(color_key)
+        classes = self._get_classes(event)
 
         title = title.strip()
         description = ', '.join(description).strip()
         if isinstance(event['id'], int):
             event_log = rpc.session.execute('object', 'execute', self.model, 'perm_read', [event['id']])[0]
-            
+
             event['create_date'] = event_log['create_date']
             event['create_uid'] = event_log['create_uid'][1]
             if isinstance(event_log['write_uid'], tuple):
                 event_log['write_uid'] = event_log['write_uid'][1]
             event['write_uid'] = event_log['write_uid']
             event['write_date'] = event_log['write_date']
-        return TinyEvent(event, starts, ends, title, description, dayspan=span, color=(color or None) and color[-1])
+        return TinyEvent(event, starts, ends, title, description, dayspan=span, color=(color or None) and color[-1], classes=classes)
+
+    def _get_classes(self, event):
+        """Get css classes which handle movable and/or resizable events"""
+        classes = []
+
+        event_state = event.get('state')
+        if event_state:
+            # check if that event cannot be moved:
+            if self.date_start and dict(self.fields[self.date_start].get('states', {}).get(event_state, [])).get('readonly'):
+                classes.append('event-is-not-movable')
+            # check if that event cannot be resized:
+            date_to_check = self.date_stop or self.date_delay
+            if date_to_check:
+                if dict(self.fields[date_to_check].get('states', {}).get(event_state, [])).get('readonly'):
+                    classes.append('event-is-not-resizeable')
+
+        return classes
 
 
 class TinyCalendar(ICalendar):

=== modified file 'addons/view_calendar/widgets/templates/day.mako'
--- addons/view_calendar/widgets/templates/day.mako	2010-10-21 15:25:44 +0000
+++ addons/view_calendar/widgets/templates/day.mako	2010-10-27 09:48:00 +0000
@@ -63,7 +63,7 @@
                                         nWriteDate="${evt.write_date}"
                                         nWriteId="${evt.write_uid}"
                                         style="background-color: ${evt.color}" 
-                                        class="calEvent allDay">${evt.title}</div>
+                                        class="calEvent allDay ${evt.classes}">${evt.title}</div>
                             % endif
                         % endfor
                     </div>
@@ -79,7 +79,7 @@
                             nWriteDate="${evt.write_date}"
                             nWriteId="${evt.write_uid}" 
                             style="background-color: ${evt.color}" 
-                            class="calEvent noAllDay">
+                            class="calEvent noAllDay ${evt.classes}">
                            <div style="height: 10px;" class="calEventTitle">${evt.starts.strftime('%I:%M %P')} - ${evt.title}</div>
                            <div class="calEventDesc">${evt.description}</div>
                            <div class="calEventGrip"></div>

=== modified file 'addons/view_calendar/widgets/templates/gantt.mako'
--- addons/view_calendar/widgets/templates/gantt.mako	2010-10-21 15:25:44 +0000
+++ addons/view_calendar/widgets/templates/gantt.mako	2010-10-27 09:48:00 +0000
@@ -68,7 +68,7 @@
                         />
                     % endfor
                     % for evt in events:
-                    <div class="calEvent"
+                    <div class="calEvent ${evt.classes}"
                         nRecordID="${evt.record_id}"
                         nDaySpan="${evt.dayspan}"
                         dtStart="${str(evt.starts)}"

=== modified file 'addons/view_calendar/widgets/templates/month.mako'
--- addons/view_calendar/widgets/templates/month.mako	2010-10-21 15:25:44 +0000
+++ addons/view_calendar/widgets/templates/month.mako	2010-10-27 09:48:00 +0000
@@ -51,7 +51,7 @@
                     <div id="calBodySect">
                         % for evt in events:
                             % if evt.dayspan > 0:
-                                <div class="calEvent"
+                                <div class="calEvent ${evt.classes}"
                                     nRecordID="${evt.record_id}"
                                     nDaySpan="${evt.dayspan}"
                                     dtStart="${str(evt.starts)}"
@@ -64,7 +64,7 @@
                                     style="background-color: ${evt.color}">${evt.title}</div>
                             % endif
                             % if evt.dayspan == 0:
-                                <div class="calEvent calEventInfo"
+                                <div class="calEvent calEventInfo ${evt.classes}"
                                     nRecordID="${evt.record_id}"
                                     nDaySpan="${evt.dayspan}"
                                     dtStart="${str(evt.starts)}"

=== modified file 'addons/view_calendar/widgets/templates/week.mako'
--- addons/view_calendar/widgets/templates/week.mako	2010-10-21 15:25:44 +0000
+++ addons/view_calendar/widgets/templates/week.mako	2010-10-27 09:48:00 +0000
@@ -51,33 +51,33 @@
                     <div id="calAllDaySect">
                         % for evt in events:
                             % if evt.dayspan > 0:
-                                <div nRecordID="${evt.record_id}" 
-                                    nDaySpan="${evt.dayspan}" 
-                                    dtStart="${str(evt.starts)}" 
-                                    dtEnd="${str(evt.ends)}" 
+                                <div nRecordID="${evt.record_id}"
+                                    nDaySpan="${evt.dayspan}"
+                                    dtStart="${str(evt.starts)}"
+                                    dtEnd="${str(evt.ends)}"
                                     title="${evt.description}"
                                     nCreationDate="${evt.create_date}"
                                     nCreationId="${evt.create_uid}"
                                     nWriteDate="${evt.write_date}"
-                                    nWriteId="${evt.write_uid}" 
-                                    style="background-color: ${evt.color};" 
-                                    class="calEvent allDay">${evt.title}</div>
+                                    nWriteId="${evt.write_uid}"
+                                    style="background-color: ${evt.color};"
+                                    class="calEvent allDay ${evt.classes}">${evt.title}</div>
                             % endif
                         % endfor
                     </div>
                     <div id="calBodySect">
                         % for evt in events:
                             % if evt.dayspan == 0:
-                        <div nRecordID="${evt.record_id}" 
-                            dtStart="${str(evt.starts)}" 
+                        <div nRecordID="${evt.record_id}"
+                            dtStart="${str(evt.starts)}"
                             dtEnd="${str(evt.ends)}"
                             nCreationDate="${evt.create_date}"
                             nCreationId="${evt.create_uid}"
                             nWriteDate="${evt.write_date}"
                             nWriteId="${evt.write_uid}"
-                            style="background-color: ${evt.color};" 
-                            class="calEvent noAllDay">
-                           <div style="height: 10px;" class="calEventTitle">${evt.starts.strftime('%I:%M %P')} - ${evt.title}</div>
+                            style="background-color: ${evt.color};"
+                            class="calEvent noAllDay ${evt.classes}">
+                           <div style="height: 10px;" class="calEventTitle">${evt.starts.strftime('%H:%M')} - ${evt.title}</div>
                            <div class="calEventDesc">${evt.description}</div>
                            <div class="calEventGrip"></div>
                         </div>

=== modified file 'addons/view_calendar/widgets/widgets.py'
--- addons/view_calendar/widgets/widgets.py	2010-10-25 12:26:19 +0000
+++ addons/view_calendar/widgets/widgets.py	2010-10-27 09:48:00 +0000
@@ -142,8 +142,6 @@
         self.month = Month(y, m)
         self.events = self.get_events(self.month.days)
 
-
-
         self.selected_day = _get_selection_day(Day(y, m, 1), self.selected_day, 'month')
 
         minical = MiniCalendar(self.selected_day)