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

[IMP] Misc improvements to calendar view 

bzr revid: fme@openerp.com-20111212150609-26i9afp0dlhf70et
This commit is contained in:
Fabien Meghazi 2011-12-12 16:06:09 +01:00
parent b82cb38fdc
commit d37e46f039
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/move.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 145 B

BIN
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/multi-days-bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 350 B

6
addons/web_calendar/static/src/css/web_calendar.css
View File

@ -227,9 +227,13 @@
position:absolute;
top:44px;
width:600px;
overflow-y:hidden;
overflow-y:auto;
overflow-x:hidden;
}
.openerp .oe_cal_month .dhx_cal_data {
overflow-y: hidden;
}
.openerp .dhx_cal_data tr td {
border-width:0px;

17
addons/web_calendar/static/src/js/calendar.js
View File

@ -123,10 +123,13 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
scheduler.attachEvent('onEventAdded', this.do_create_event);
scheduler.attachEvent('onEventDeleted', this.do_delete_event);
scheduler.attachEvent('onEventChanged', this.do_save_event);
scheduler.attachEvent('onDblClick', this.do_edit_event);
scheduler.attachEvent('onClick', this.do_edit_event);
scheduler.attachEvent('onBeforeLightbox', this.do_edit_event);
scheduler.attachEvent('onViewChange', function(mode, date) {
self.$element.removeClass('oe_cal_day oe_cal_week oe_cal_month').addClass('oe_cal_' + mode);
});
if (this.options.sidebar) {
this.mini_calendar = scheduler.renderCalendar({
container: this.sidebar.navigator.element_id,
@ -308,12 +311,16 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
var index = this.dataset.get_id_index(event_id);
if (index !== null) {
this.dataset.index = index;
this.form_dialog.form.do_show().then(function() {
self.form_dialog.open();
});
this.do_switch_view('page');
return false;
} else if (scheduler.getState().mode === 'month') {
this.do_create_event_with_formdialog(event_id);
var event_obj = scheduler.getEvent(event_id);
if (event_obj._length === 1) {
event_obj['start_date'].addHours(8);
event_obj['end_date'] = new Date(event_obj['start_date']);
event_obj['end_date'].addHours(1);
}
this.do_create_event_with_formdialog(event_id, event_obj);
// TODO: check dhtmlxscheduler problem here. At this line, scheduler
// event 'onEventChanged' bound to this.do_save_event() won't be fired !;
return false;