diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py index c5ef960d4b4..806d5a766ec 100644 --- a/addons/gamification/goal.py +++ b/addons/gamification/goal.py @@ -187,14 +187,13 @@ class gamification_goal(osv.Model): help="In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in goal plan). Ignored in case of non-manual goal or goal not linked to a plan."), 'type_description': fields.related('type_id','description', - type='char', - string='Type Description'), + type='char', string='Type Description'), 'type_unit': fields.related('type_id', 'unit', - type='char', - string='Type Description'), + type='char', string='Type Description'), 'type_condition': fields.related('type_id', 'condition', - type='char', - string='Type Condition'), + type='char', string='Type Condition'), + 'type_suffix': fields.related('type_id', 'full_suffix', + type="char", string="Suffix"), } _defaults = { diff --git a/addons/gamification/goal_view.xml b/addons/gamification/goal_view.xml index 693512ca1d3..b8511dd96f4 100644 --- a/addons/gamification/goal_view.xml +++ b/addons/gamification/goal_view.xml @@ -137,6 +137,9 @@ + + +
@@ -145,10 +148,20 @@

- - -
+

+ + + +

+

+ + From + + + To + +

diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index f6c38ea1ccb..7481a853295 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -2,7 +2,10 @@ .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal, .openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge { width: 220px; - min-height: 150px; + min-height: 200px; +} +.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal p { + text-align: center; } .oe_kanban_badge_avatars { @@ -18,7 +21,12 @@ } .oe_goal_gauge { width:200px; - height:150px; + height:130px; + margin: auto; + margin-bottom: -30px; +} +.oe_goal_gauge svg { + margin-top: -30px; } 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); }