From 0928b2d4b61d270ac99e5b5b48b77fd300803acd Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 27 Sep 2011 11:14:43 +0530 Subject: [PATCH 1/4] [IMP] kanban :- no group by on field then fix aggregates problems. improve method reload record based on id in kanban view. bzr revid: ysa@tinyerp.com-20110927054443-6y7oc5zcdlsk0v26 --- addons/web_kanban/static/src/js/kanban.js | 42 ++++++++++--------- .../web_kanban/static/src/xml/web_kanban.xml | 10 +++-- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index df194e9f844..5ccb32ea7fc 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -218,7 +218,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ on_record_saved: function(r) { var id = this.form_dialog.form.datarecord.id; // TODO fme: reload record instead of all. need refactoring - this.do_actual_search(); + this.on_reload_record(id); }, do_change_color: function(record_id, $e) { var self = this, @@ -237,7 +237,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ data[$e.data('name')] = $(this).data('color'); self.dataset.write(id, data, {}, function() { // TODO fme: reload record instead of all. need refactoring - self.on_reload_record(id, data); + self.on_reload_record(id); }); $cpicker.remove(); }); @@ -245,28 +245,32 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ /** Reload one record in view. record_id : reload record id. - data : change value in particular record. */ - on_reload_record: function (record_id, data){ + on_reload_record: function (record_id){ var self = this; - for (var i=0, ii=this.all_display_data.length; i < ii; i++) { - for(j=0, jj=this.all_display_data[i].records.length; j < jj; j++) { - if (this.all_display_data[i].records[j].id == record_id) { - _.extend(this.all_display_data[i].records[j], data); - this.$element.find("#main_" + record_id).children().remove(); - this.$element.find("#main_" + record_id).append(this.qweb.render('kanban-box', { - record: this.do_transform_record(this.all_display_data[i].records[j]), - kanban_color: this.kanban_color, - kanban_gravatar: this.kanban_gravatar - })); - break; + this.dataset.read_ids([record_id], [], function (records) { + if (records.length > 0) { + for (var i=0, ii=self.all_display_data.length; i < ii; i++) { + for(j=0, jj=self.all_display_data[i].records.length; j < jj; j++) { + if (self.all_display_data[i].records[j].id == record_id) { + _.extend(self.all_display_data[i].records[j], records[0]); + self.$element.find("#main_" + record_id).children().remove(); + self.$element.find("#main_" + record_id).append(self.qweb.render('kanban-box', { + record: self.do_transform_record(self.all_display_data[i].records[j]), + kanban_color: self.kanban_color, + kanban_gravatar: self.kanban_gravatar + })); + break; + } + } } + self.$element.find("#main_" + record_id + " .oe_kanban_action").click(self.on_action_clicked); + self.$element.find("#main_" + record_id + " .oe_kanban_box_show_onclick_trigger").click(function() { + $(this).parent("#main_" + record_id + " .oe_kanban_box").find(".oe_kanban_box_show_onclick").toggle(); + }); } - } - this.$element.find("#main_" + record_id + " .oe_kanban_action").click(this.on_action_clicked); - this.$element.find("#main_" + record_id + " .oe_kanban_box_show_onclick_trigger").click(function() { - $(this).parent("#main_" + record_id + " .oe_kanban_box").find(".oe_kanban_box_show_onclick").toggle(); }); + }, do_delete: function (id) { var self = this; diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 4c98f42f8fe..ac8a369770f 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -14,14 +14,16 @@
-
- : -
+ +
+ : +
+ -

+

From cdfed193c4f2c224e998cda5cad22f0cb65cac07 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 27 Sep 2011 10:25:59 +0200 Subject: [PATCH 2/4] [IMP] Improved aggregates bzr revid: fme@openerp.com-20110927082559-f2o8eqimllnl6oie --- addons/web_kanban/static/src/xml/web_kanban.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index ac8a369770f..f751351a0f7 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -11,14 +11,14 @@ -
- -
- +
+
+ +
:
- +
From 41b2ff27843e234ecd3e669b0f0f127f65f690ef Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 27 Sep 2011 10:33:11 +0200 Subject: [PATCH 3/4] [REM] Removed todo's bzr revid: fme@openerp.com-20110927083311-jkw3ikfh8kujwop9 --- addons/web_kanban/static/src/js/kanban.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 5ccb32ea7fc..46173341361 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -217,7 +217,6 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ }, on_record_saved: function(r) { var id = this.form_dialog.form.datarecord.id; - // TODO fme: reload record instead of all. need refactoring this.on_reload_record(id); }, do_change_color: function(record_id, $e) { @@ -236,7 +235,6 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ var data = {}; data[$e.data('name')] = $(this).data('color'); self.dataset.write(id, data, {}, function() { - // TODO fme: reload record instead of all. need refactoring self.on_reload_record(id); }); $cpicker.remove(); @@ -308,7 +306,6 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({ if (!ui.item.attr("id")) { return false; } - // TODO fme: check what was this sequence if (self.fields_view.fields.sequence != undefined && ((self.source_index.index >= 0 && self.source_index.index != from) || (self.source_index.column && self.source_index.column != ui.item.parent().attr('id')))) { var child_record = ui.item.parent().children(); From afceb6fdfe184b5e7139ddb46324ad2776fe5761 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 27 Sep 2011 10:42:48 +0200 Subject: [PATCH 4/4] [FIX] Fixed aggregates when no enumerator is present bzr revid: fme@openerp.com-20110927084248-4omtwe9sc8n9b0pl --- addons/web_kanban/static/src/xml/web_kanban.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index f751351a0f7..8f3aaf457e9 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -15,7 +15,7 @@
-
+
: