odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Improved calendar's color handling 

bzr revid: fme@openerp.com-20110818191826-e0le9cm6xnw38wc2
This commit is contained in:
Fabien Meghazi 2011-08-18 21:18:26 +02:00
parent fa81a097f2
commit ed11f76ec5
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
addons/base_calendar/static/src/js/calendar.js
View File

@ -26,6 +26,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
'#fcaf3e', '#ef2929', '#ff00c9', '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f', '#fcaf3e', '#ef2929', '#ff00c9', '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f',
'#ff8e00', '#ff0000', '#b0008c', '#9000ff', '#0078ff', '#00ff00', '#e6ff00', '#ffff00', '#ff8e00', '#ff0000', '#b0008c', '#9000ff', '#0078ff', '#00ff00', '#e6ff00', '#ffff00',
'#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900' ]; '#905000', '#9b0000', '#840067', '#510090', '#0000c9', '#009b00', '#9abe00', '#ffc900' ];
this.color_map = {};
}, },
start: function() { start: function() {
this.rpc("/base_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id, 'toolbar': true}, this.on_loaded); this.rpc("/base_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id, 'toolbar': true}, this.on_loaded);
@ -136,17 +137,21 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
reload_event: function(id) { reload_event: function(id) {
this.dataset.read_ids([id], _.keys(this.fields), this.on_events_loaded); this.dataset.read_ids([id], _.keys(this.fields), this.on_events_loaded);
}, },
get_color: function(index) { get_color: function(key) {
index = index % this.COLOR_PALETTE.length; if (this.color_map[key]) {
return this.COLOR_PALETTE[index]; 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;
return color;
}, },
on_events_loaded: function(events, fn_filter, no_filter_reload) { on_events_loaded: function(events, fn_filter, no_filter_reload) {
var self = this; var self = this;
//To parse Events we have to convert date Format //To parse Events we have to convert date Format
var res_events = [], var res_events = [],
sidebar_items = [], sidebar_items = {};
sidebar_ids = [];
for (var e = 0; e < events.length; e++) { for (var e = 0; e < events.length; e++) {
var evt = events[e]; var evt = events[e];
if (!evt[this.date_start]) { if (!evt[this.date_start]) {
@ -157,21 +162,19 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({
if (this.color_field) { if (this.color_field) {
var filter = evt[this.color_field]; var filter = evt[this.color_field];
if (filter) { if (filter) {
var filter_item = { var filter_value = (typeof filter === 'object') ? filter[0] : filter;
value: (typeof filter === 'object') ? filter[0] : filter, if (typeof(fn_filter) === 'function' && !fn_filter(filter_value)) {
label: (typeof filter === 'object') ? filter[1] : filter
}
if (typeof(fn_filter) === 'function' && !fn_filter(filter_item.value)) {
continue; continue;
} }
var filter_index = _.indexOf(sidebar_ids, filter_item.value); var filter_item = {
if (filter_index === -1) { value: filter_value,
evt.color = filter_item.color = this.get_color(sidebar_ids.length); label: (typeof filter === 'object') ? filter[1] : filter,
sidebar_items.push(filter_item); color: this.get_color(filter_value)
sidebar_ids.push(filter_item.value);
} else {
evt.color = this.get_color(filter_index);
} }
if (!sidebar_items[filter_value]) {
sidebar_items[filter_value] = filter_item;
}
evt.color = filter_item.color;
evt.textColor = '#ffffff'; evt.textColor = '#ffffff';
} }
} }

6
addons/base_calendar/static/src/xml/base_calendar.xml
View File

@ -18,9 +18,9 @@
</div> </div>
</t> </t>
<t t-name="CalendarView.sidebar.responsible"> <t t-name="CalendarView.sidebar.responsible">
<div t-foreach="filters" t-as="filter" class="oe_calendar_responsible" t-attf-style="background: #{filter.color}"> <div t-foreach="filters" class="oe_calendar_responsible" t-attf-style="background: #{filters_value.color}">
<input type="checkbox" name="selection" t-att-value="filter.value"/> <input type="checkbox" name="selection" t-att-value="filters_value.value"/>
<span><t t-esc="filter.label"/></span> <span><t t-esc="filters_value.label"/></span>
</div> </div>
</t> </t>
</template> </template>