Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

[WIP] Backport of web_timeline to 8.0

8.0
terrence 2018-04-09 19:55:35 +03:00 committed by Tom Blauwendraat
parent fa454eb9aa
commit 1495a48e4f
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
web_timeline/static/src/js/web_timeline.js
View File

@ -11,31 +11,31 @@ _.str.toBoolElse = function (str, elseValues, trueValues, falseValues) {
return ret; return ret;
}; };
odoo.define('web_timeline.TimelineView', function (require) { var moment = vis.moment;
"use strict";
var core = require('web.core'); openerp.web_timeline = function(instance) {
var form_common = require('web.form_common');
var Model = require('web.DataModel');
var time = require('web.time');
var View = require('web.View');
var widgets = require('web_calendar.widgets');
var _ = require('_');
var $ = require('$');
var _t = core._t; var core = instance.web.core;
var _lt = core._lt; var form_common = instance.web.form_common;
var QWeb = core.qweb; var Model = instance.web.Model;
var str_to_datetime = instance.str_to_datetime;
var View = instance.web.View;
var widgets = instance.web_calendar;
var _t = instance.web._t,
_lt = instance.web._lt,
QWeb = instance.web.qweb;
function isNullOrUndef(value) { function isNullOrUndef(value) {
return _.isUndefined(value) || _.isNull(value); return _.isUndefined(value) || _.isNull(value);
} }
var TimelineView = View.extend({ instance.web.views.add('timeline', 'instance.web_timeline.TimelineView');
instance.web_timeline.TimelineView = instance.web.View.extend({
template: "TimelineView", template: "TimelineView",
display_name: _lt('Timeline'), display_name: _lt('Timeline'),
icon: 'fa-clock-o', icon: 'fa-clock-o',
quick_create_instance: widgets.QuickCreate, quick_create_instance: instance.web_calendar.QuickCreate,
init: function (parent, dataset, view_id, options) { init: function (parent, dataset, view_id, options) {
this._super(parent); this._super(parent);
@ -222,12 +222,12 @@ odoo.define('web_timeline.TimelineView', function (require) {
attendees = []; attendees = [];
if (!all_day) { if (!all_day) {
date_start = time.auto_str_to_date(evt[this.date_start]); date_start = str_to_datetime(evt[this.date_start]);
date_stop = this.date_stop ? time.auto_str_to_date(evt[this.date_stop]) : null; date_stop = this.date_stop ? str_to_datetime(evt[this.date_stop]) : null;
} }
else { else {
date_start = time.auto_str_to_date(evt[this.date_start].split(' ')[0],'start'); date_start = str_to_datetime(evt[this.date_start].split(' ')[0],'start');
date_stop = this.date_stop ? time.auto_str_to_date(evt[this.date_stop].split(' ')[0],'stop') : null; date_stop = this.date_stop ? str_to_datetime(evt[this.date_stop].split(' ')[0],'stop') : null;
} }
if (!date_start){ if (!date_start){
@ -430,9 +430,10 @@ odoo.define('web_timeline.TimelineView', function (require) {
} }
var data = {}; var data = {};
data[self.fields_view.arch.attrs.date_start] = data[self.fields_view.arch.attrs.date_start] =
time.auto_date_to_str(start, self.fields[self.fields_view.arch.attrs.date_start].type); str_to_datetime(new moment(start).format('YYYY-m-DD hh:mm:ss'), self.fields[self.fields_view.arch.attrs.date_start].type);
data[self.fields_view.arch.attrs.date_stop] = data[self.fields_view.arch.attrs.date_stop] =
time.auto_date_to_str(end, self.fields[self.fields_view.arch.attrs.date_stop].type); str_to_datetime(new moment(end).format('YYYY-m-DD hh:mm:ss'), self.fields[self.fields_view.arch.attrs.date_stop].type);
data[self.fields_view.arch.attrs.default_group_by] = group; data[self.fields_view.arch.attrs.default_group_by] = group;
var id = item.evt.id; var id = item.evt.id;
this.dataset.write(id, data); this.dataset.write(id, data);
@ -510,7 +511,4 @@ odoo.define('web_timeline.TimelineView', function (require) {
this.scale_current_window(24 * 365); this.scale_current_window(24 * 365);
}, },
}); });
};
core.view_registry.add('timeline', TimelineView);
return TimelineView;
});