diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-04-10 17:30:31 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-04-10 17:30:31 +0200 |
| commit | 1e9805fbfd0936cd228fb7177cc8519d2554432f (patch) | |
| tree | 749d5d0a0f68922baf25d2dc59c3954aeb0a18b4 /addons/gamification/static/src/js | |
| parent | ff12c44391021e0d9792d18b576fd0fe9fe90e0d (diff) | |
[IMP] use suffix in kanban and better view
bzr revid: mat@openerp.com-20130410153031-s6op7d7wyfdzrcti
Diffstat (limited to 'addons/gamification/static/src/js')
| -rw-r--r-- | addons/gamification/static/src/js/gamification.js | 17 | ||||
| -rw-r--r-- | addons/gamification/static/src/js/justgage.js | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js index 87550914ecc..c743d39282a 100644 --- a/addons/gamification/static/src/js/gamification.js +++ b/addons/gamification/static/src/js/gamification.js @@ -38,8 +38,6 @@ openerp.gamification = function(instance) { action_manager.do_action(goal_action.action).done(function () { self.get_goal_todo_info(); }); - - //var form = action_manager.dialog_widget.views.form.controller; }); } }, @@ -132,13 +130,24 @@ openerp.gamification = function(instance) { value: self.record.current.raw_value, min: 0, max: self.record.target_goal.raw_value, - // title: self.record.type_id.value, relativeGaugeSize: true, + humanFriendly: true, + // add space between value and symbol + // textRenderer: function(value) { + // symbol = self.record.type_suffix.raw_value; + // humannbr = humanFriendlyNumber(value, 0) + // if ((humannbr + symbol).length > 6) { + // return humannbr; + // } else { + // return humannbr + " " + symbol; + // } + // }, + label: self.record.type_suffix.raw_value, levelColors: [ "#f9c802", "#ff0000", "#a9d70b" - ] + ], }); } }); diff --git a/addons/gamification/static/src/js/justgage.js b/addons/gamification/static/src/js/justgage.js index 7464e4120e1..52b5c6ea0c3 100644 --- a/addons/gamification/static/src/js/justgage.js +++ b/addons/gamification/static/src/js/justgage.js @@ -615,10 +615,10 @@ } else if(obj.config.humanFriendly) { obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol; } else { - obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals); + obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol; } - obj.txtValue.attr("text", obj.originalValue + obj.config.symbol); + obj.txtValue.attr("text", obj.originalValue); setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY); } |