From 73ff1e657dcd2f4e4a53cf040692e9bd20c73775 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 16 Aug 2013 18:37:10 +0530 Subject: [PATCH 1/6] [FIX] show error messge when we move recored in kanban. bzr revid: tpa@tinyerp.com-20130816130710-ec5x1k7tn86dejk1 --- addons/web_kanban/static/src/js/kanban.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 6f47f9c128d..7dd7c56a0b6 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -436,7 +436,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ new_group.do_save_sequences(); }).fail(function(error, evt) { evt.preventDefault(); - alert(_t("An error has occured while moving the record to this group: ") + data.message); + alert(_t("An error has occured while moving the record to this group: ") + error.data.message); self.do_reload(); // TODO: use draggable + sortable in order to cancel the dragging when the rcp fails }); } From 3cdc986c0c7b7908c8c97176086b599cfa97f531 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 16 Sep 2013 18:38:25 +0530 Subject: [PATCH 2/6] [IMP] improved code to pass tooltip delay in option and added function so we can set requred help in inherited modules. bzr revid: tpa@tinyerp.com-20130916130825-pciwsn0doshstrp2 --- .../static/src/js/kanban_gauge.js | 28 +++++++++++++------ .../static/src/js/kanban_sparkline.js | 7 +++-- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js index cb2faf6874b..60cbdf1ddd8 100644 --- a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js +++ b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js @@ -4,7 +4,8 @@ openerp.web_kanban_gauge = function (instance) { * Kanban widgets: GaugeWidget * */ - +var _t = instance.web._t, + _lt = instance.web._lt; instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({ className: "oe_gauge", start: function() { @@ -77,13 +78,19 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({ $input.focus() .keydown(function (event) { event.stopPropagation(); - if (event.keyCode == 13 || event.keyCode == 9) { - if ($input.val() != value) { - parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () { - parent.do_reload(); - }); - } else { - $div.remove(); + if(isNaN($input.val())){ + self.do_warn(_t("Wrong value entered!"), _t("Only Integer Value should be valid.")); + $div.remove(); + } else { + if (event.keyCode == 13 || event.keyCode == 9) { + var val = self.parse_client($input.val()); + if ($input.val() != value) { + parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () { + parent.do_reload(); + }); + } else { + $div.remove(); + } } } }) @@ -112,6 +119,11 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({ } } }, + + parse_client: function(value) { + return openerp.web.parse_value(value, { type:"integer" }); + }, + }); instance.web_kanban.fields_registry.add("gauge", "instance.web_kanban.GaugeWidget"); diff --git a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js index de21cbba945..68703d90585 100644 --- a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js +++ b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js @@ -20,15 +20,18 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten barWidth: 4, barSpacing: 1, barColor: '#96d854', - tooltipFormat: '{{offset:offset}} {{value}}', + tooltipFormat: self.set_offset(), tooltipValueLookups: { 'offset': tooltips } }, self.options); self.$el.sparkline(value, sparkline_options); - self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'}); + self.$el.tipsy({'delayIn': self.options.delayIn || 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'}); }, 0); }, + set_offset: function(){ + return '{{offset:offset}} {{value}}'; + } }); instance.web_kanban.fields_registry.add("sparkline_bar", "instance.web_kanban.SparklineBarWidget"); From cce3b9138bc58afbd3ed9502c7ce50d588230e2d Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 11 Oct 2013 12:57:44 +0530 Subject: [PATCH 3/6] [IMP] improved code to set suffix in tooltip. bzr revid: tpa@tinyerp.com-20131011072744-pz4mcxbr4qbdrg79 --- .../static/src/js/kanban_sparkline.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js index db10299ddd2..630d5812f39 100644 --- a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js +++ b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js @@ -13,6 +13,11 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten setTimeout(function () { var value = _.pluck(self.field.value, 'value'); var tooltips = _.pluck(self.field.value, 'tooltip'); + var suffix = self.options.tooltip_suffix || ""; + if (self.options.tooltip_suffix_field) { + suffix = self.getParent().record[self.options.tooltip_suffix_field].raw_value; + } + var tooltipformat = _.str.sprintf("{{offset:offset}}: {{value}} %s", suffix); var sparkline_options = _.extend({ type: 'bar', barWidth: 5, @@ -20,7 +25,7 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten barWidth: 4, barSpacing: 1, barColor: '#96d854', - tooltipFormat: self.set_offset(), + tooltipFormat: tooltipformat, chartRangeMin: 0, tooltipValueLookups: { 'offset': tooltips @@ -30,9 +35,6 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten self.$el.tipsy({'delayIn': self.options.delayIn || 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'}); }, 0); }, - set_offset: function(){ - return '{{offset:offset}} {{value}}'; - } }); instance.web_kanban.fields_registry.add("sparkline_bar", "instance.web_kanban.SparklineBarWidget"); From 416c47f3244ee6c01cd9f5a7406879fe9c99ec69 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 23 Oct 2013 17:06:52 +0530 Subject: [PATCH 4/6] [FIX] replace integer with float in validation bzr revid: tpa@tinyerp.com-20131023113652-rj74krv1lecyp2xf --- addons/web_kanban_gauge/static/src/js/kanban_gauge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js index 60cbdf1ddd8..0d8a21ef638 100644 --- a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js +++ b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js @@ -121,7 +121,7 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({ }, parse_client: function(value) { - return openerp.web.parse_value(value, { type:"integer" }); + return openerp.web.parse_value(value, { type:"float" }); }, }); From bd45d6b47b4e702c6a2cc5394889decdcb272d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 5 Dec 2013 16:03:37 +0100 Subject: [PATCH 5/6] [CLEAN] web_kanban_gauge: removed unnecessary code before merging bzr revid: tde@openerp.com-20131205150337-5lwc6w7whrtlwp5d --- addons/web_kanban_gauge/static/src/js/kanban_gauge.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js index 0d8a21ef638..9713f2180e5 100644 --- a/addons/web_kanban_gauge/static/src/js/kanban_gauge.js +++ b/addons/web_kanban_gauge/static/src/js/kanban_gauge.js @@ -83,7 +83,6 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({ $div.remove(); } else { if (event.keyCode == 13 || event.keyCode == 9) { - var val = self.parse_client($input.val()); if ($input.val() != value) { parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () { parent.do_reload(); @@ -119,11 +118,6 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({ } } }, - - parse_client: function(value) { - return openerp.web.parse_value(value, { type:"float" }); - }, - }); instance.web_kanban.fields_registry.add("gauge", "instance.web_kanban.GaugeWidget"); From 93ce6e7ab5a53d54ed1da8635a8a3466c3701259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 5 Dec 2013 16:13:55 +0100 Subject: [PATCH 6/6] [CLEAN] web_kanban_sparkline: removed tootip_suffix_field, not used and not necessary bzr revid: tde@openerp.com-20131205151355-p2vtq5s1etv145my --- .../web_kanban_sparkline/static/src/js/kanban_sparkline.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js index 630d5812f39..1d185b7cacd 100644 --- a/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js +++ b/addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js @@ -14,10 +14,6 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten var value = _.pluck(self.field.value, 'value'); var tooltips = _.pluck(self.field.value, 'tooltip'); var suffix = self.options.tooltip_suffix || ""; - if (self.options.tooltip_suffix_field) { - suffix = self.getParent().record[self.options.tooltip_suffix_field].raw_value; - } - var tooltipformat = _.str.sprintf("{{offset:offset}}: {{value}} %s", suffix); var sparkline_options = _.extend({ type: 'bar', barWidth: 5, @@ -25,7 +21,7 @@ instance.web_kanban.SparklineBarWidget = instance.web_kanban.AbstractField.exten barWidth: 4, barSpacing: 1, barColor: '#96d854', - tooltipFormat: tooltipformat, + tooltipFormat: '{{offset:offset}} {{value}} ' + suffix, chartRangeMin: 0, tooltipValueLookups: { 'offset': tooltips