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

[FIX] all kinds of fixes related to backporting

8.0
Tom Blauwendraat 2018-12-03 18:18:28 +01:00
parent ae95aed58b
commit 46a43f61d3
2 changed files with 91 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,8 +185,8 @@ openerp.web_timeline = function(instance) {
onMove: self.on_move, onMove: self.on_move,
onUpdate: self.on_update, onUpdate: self.on_update,
onRemove: self.on_remove, onRemove: self.on_remove,
orientation: 'both',
}; };
self.timeline = new vis.Timeline(self.$timeline.empty().get(0)); self.timeline = new vis.Timeline(self.$timeline.empty().get(0));
self.timeline.setOptions(options); self.timeline.setOptions(options);
if(self.mode && self['on_scale_' + self.mode + '_clicked']) if(self.mode && self['on_scale_' + self.mode + '_clicked'])
@ -242,6 +242,7 @@ openerp.web_timeline = function(instance) {
} else { } else {
group = -1; group = -1;
} }
_.each(self.colors, function(color){ _.each(self.colors, function(color){
if(eval("'" + evt[color.field] + "' " + color.opt + " '" + color.value + "'")) if(eval("'" + evt[color.field] + "' " + color.opt + " '" + color.value + "'"))
self.color = color.color; self.color = color.color;
@ -278,6 +279,8 @@ openerp.web_timeline = function(instance) {
return self.fields_view.arch.attrs[key] || ''; return self.fields_view.arch.attrs[key] || '';
})); }));
fields.push(this.fields_view.arch.attrs.name);
fields = _.uniq(fields.concat(_.pluck(this.colors, "field").concat(n_group_bys))); fields = _.uniq(fields.concat(_.pluck(this.colors, "field").concat(n_group_bys)));
return $.when(this.has_been_loaded).then(function() { return $.when(this.has_been_loaded).then(function() {
return self.dataset.read_slice(fields, { return self.dataset.read_slice(fields, {
@ -302,19 +305,22 @@ openerp.web_timeline = function(instance) {
var ids = _.pluck(events, "id"); var ids = _.pluck(events, "id");
return this.dataset.name_get(ids).then(function(names) { return this.dataset.name_get(ids).then(function(names) {
var nevents = _.map(events, function(event) { var nevents = _.map(events, function(event) {
return _.extend({__name: _.detect(names, function(name) { return name[0] == event.id; })[1]}, event); return _.extend({__name: _.detect(names, function(name) {
return name[0] == event.id;
})[1]}, event);
}); });
return self.on_data_loaded_2(nevents, group_bys); return self.on_data_loaded_2(nevents, group_bys);
}); });
}, },
on_data_loaded_2: function(events, group_bys) { on_data_loaded_2: function(events, group_bys) {
var self = this; var self = this;
var data = []; var data = [];
var groups = []; var groups = [];
_.each(events, function(event) { _.each(events, function(event) {
if (event[self.date_start]){ if (event[self.date_start]){
data.push(self.event_data_transform(event)); var item = self.event_data_transform(event);
item.content = event.timeline_name;
data.push(item);
} }
}); });
// get the groups // get the groups
@ -366,32 +372,35 @@ openerp.web_timeline = function(instance) {
}, },
on_add: function(item, callback) { on_add: function(item, callback) {
var self = this; var self = this,
var context = this.dataset.get_context(); pop = new instance.web.form.SelectCreatePopup(this),
// Initialize default values for creation context = this.get_popup_context(item);
var default_context = {} pop.on("elements_selected", self, function(element_ids) {
default_context['default_'.concat(this.date_start)] = item.start; self.reload().then(function() {
default_context['default_'.concat(this.date_stop)] = moment(item.start).add(1, 'hours').toDate(); self.timeline.focus(element_ids);
if (item.group > 0) { });
default_context['default_'.concat(this.last_group_bys[0])] = item.group; });
} pop.select_element(
context.add(default_context); self.dataset.model,
// Show popup {
var dialog = new form_common.FormViewDialog(this, { title: _t("Create"),
res_model: this.dataset.model, initial_view: "form",
res_id: null, },
context: context, null,
view_id: +this.open_popup_action, context
}).open(); );
dialog.on('create_completed', this, this.create_completed);
return false;
}, },
write_completed: function(id) { get_popup_context: function(item) {
this.dataset.trigger("dataset_changed", id); var context = {};
this.current_window = this.timeline.getWindow(); context['default_'.concat(this.date_start)] = item.start;
this.reload(); context['default_'.concat(this.date_stop)] = item.start.clone()
this.timeline.setWindow(this.current_window); .addHours(this.date_delay || 1);
if (item.group != -1) {
context['default_'.concat(this.last_group_bys[0])] = item.group;
}
return context
}, },
on_update: function(item, callback) { on_update: function(item, callback) {
@ -408,33 +417,69 @@ openerp.web_timeline = function(instance) {
} }
} }
else { else {
var dialog = new form_common.FormViewDialog(this, {
res_model: this.dataset.model, var id_cast = parseInt(id).toString() == id ? parseInt(id) : id;
res_id: parseInt(id).toString() == id ? parseInt(id) : id, var pop = new instance.web.form.FormOpenPopup(self);
context: this.dataset.get_context(), pop.on('write_completed', self, self.reload);
title: title, pop.show_element(
view_id: +this.open_popup_action, self.dataset.model,
}).open(); id_cast,
dialog.on('write_completed', this, this.write_completed); null,
{readonly: true, title: title}
);
var form_controller = pop.view_form;
form_controller.on("load_record", self, function() {
var footer = pop.$el.closest(".modal").find(".modal-footer");
footer.find('.oe_form_button_edit,.oe_form_button_save').remove();
footer.find(".oe_form_button_cancel").prev().remove();
footer.find('.oe_form_button_cancel').before("<span> or </span>");
button_edit = _.str.sprintf("<button class='oe_button oe_form_button_edit oe_bold oe_highlight'><span> %s </span></button>",_t("Edit"));
button_save = _.str.sprintf("<button class='oe_button oe_form_button_save oe_bold oe_highlight'><span> %s </span></button>",_t("Save"));
footer.prepend(button_edit + button_save);
footer.find('.oe_form_button_save').hide();
footer.find('.oe_form_button_edit').on('click', function() {
form_controller.to_edit_mode();
footer.find('.oe_form_button_edit,.oe_form_button_save').toggle();
});
footer.find('.oe_form_button_save').on('click', function() {
form_controller.save();
form_controller.to_view_mode();
footer.find('.oe_form_button_edit,.oe_form_button_save').toggle();
});
var chatter = pop.$el.closest(".modal").find(".oe_chatter");
if(chatter.length){
var chatter_toggler = $($.parseHTML(_.str.sprintf('<div class="oe_chatter_toggle fa fa-plus-circle"><span> %s </span><div class="oe_chatter_content"></div></div>', _t("Messages"))));
chatter.before(chatter_toggler)
var chatter_content = chatter_toggler.find(".oe_chatter_content");
chatter_content.prepend(chatter);
chatter_content.toggle();
chatter_toggler.click(function(){
chatter_content.toggle();
chatter_toggler.toggleClass('fa-plus-circle fa-minus-circle');
});
}
});
} }
return false; return false;
}, },
on_move: function(item, callback) { on_move: function(item, callback) {
var self = this; var self = this;
var start = item.start; var start = new moment(item.start);
var end = item.end; var end = new moment(item.end);
var group = false; var group = false;
if (item.group != -1) { if (item.group != -1) {
group = item.group; group = item.group;
} }
var data = {}; var data = {};
data[self.fields_view.arch.attrs.date_start] = data[self.fields_view.arch.attrs.date_start] =
str_to_datetime(new moment(start).format('YYYY-MM-DD hh:mm:ss'), str_to_datetime(start.utc().format('YYYY-MM-DD hh:mm:ss'),
self.fields[self.fields_view.arch.attrs.date_start].type); 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] =
str_to_datetime(new moment(end).format('YYYY-MM-DD hh:mm:ss'), str_to_datetime(end.utc().format('YYYY-MM-DD hh:mm:ss'),
self.fields[self.fields_view.arch.attrs.date_stop].type); 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;
@ -463,7 +508,6 @@ openerp.web_timeline = function(instance) {
return this.on_group_click(e); return this.on_group_click(e);
} }
}, },
on_group_click: function(e) { on_group_click: function(e) {
if (e.group == -1) if (e.group == -1)
{ {

8
web_timeline/views/web_timeline.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <openerp>
<data>
<template id="assets_backend" name="web_timeline assets" inherit_id="web.assets_backend"> <template id="assets_backend" name="web_timeline assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" href="/web_timeline/static/lib/vis/vis.css"/> <link rel="stylesheet" href="/web_timeline/static/lib/vis/vis.css"/>
@ -10,5 +10,5 @@
<script type="text/javascript" src="/web_timeline/static/src/js/web_timeline.js"/> <script type="text/javascript" src="/web_timeline/static/src/js/web_timeline.js"/>
</xpath> </xpath>
</template> </template>
</data>
</odoo> </openerp>