audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] web_timeline: Several improvements:

Browse Source 
* Avoid to display all items of group_by model
* Remove unnecessary readgroup
* Remove dependency on project. Modify module structure. Imporve readme file.
* Add setup.py
This commit is contained in:
Adrien Peiffer (ACSONE)
2016-04-08 16:02:32 +02:00
committed by Martin Nicolas Cuesta
parent 786da5f23b
commit 1d91e04b6f
8 changed files with 147 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,7 +247,6 @@ openerp.web_timeline = function(instance) {
var self = this;
self.last_domains = domains;
self.last_contexts = contexts;
// self.reload_gantt();
// select the group by
var n_group_bys = [];
if (this.fields_view.arch.attrs.default_group_by) {
@@ -263,14 +262,7 @@ openerp.web_timeline = function(instance) {
}));
fields = _.uniq(fields.concat(_.pluck(this.colors, "field").concat(n_group_bys)));
var group_by = self.fields[_.first(n_group_bys)]
var read_groups = new instance.web.DataSet(this, group_by.relation, group_by.context)
.name_search('', group_by.domain)
.then(function(groups){
self.groups = groups;
});
return $.when(this.has_been_loaded, read_groups).then(function() {
return $.when(this.has_been_loaded).then(function() {
return self.dataset.read_slice(fields, {
domain: domains,
context: contexts
@@ -304,18 +296,33 @@ openerp.web_timeline = function(instance) {
var self = this;
var data = [];
var groups = [];
groups.push({id:-1, content: _t('Undefined')})
_.each(tasks, function(event) {
data.push(self.event_data_transform(event));
});
_.each(self.groups, function(group){
groups.push({id: group[0], content: group[1]});
if (event[self.date_start]){
data.push(self.event_data_transform(event));
}
});
// get the groups
var split_groups = function(tasks, group_bys) {
if (group_bys.length === 0)
return tasks;
var groups = [];
groups.push({id:-1, content: _t('-')})
_.each(tasks, function(task) {
var group_name = task[_.first(group_bys)];
if (group_name) {
var group = _.find(groups, function(group) { return _.isEqual(group.id, group_name[0]); });
if (group === undefined) {
group = {id: group_name[0], content: group_name[1]};
groups.push(group);
}
}
});
return groups;
}
var groups = split_groups(tasks, group_bys);
this.timeline.setGroups(groups);
this.timeline.setItems(data);
this.timeline.setWindow(this.current_window);
//this.timeline.moveTo(new Date(), true);
//this.timeline.zoom(0.5, new Date());
},
do_show: function() {
@@ -394,7 +401,6 @@ openerp.web_timeline = function(instance) {
null,
{readonly: true, title: title}
);
//pop.on('closed', self, self.reload);
var form_controller = pop.view_form;
form_controller.on("load_record", self, function() {
var footer = pop.$el.closest(".modal").find(".modal-footer");