odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[fix] use justgage library from sale_crm 

bzr revid: mat@openerp.com-20130703135227-m409fmvh5t1ne3o6
This commit is contained in:
Martin Trigaux 2013-07-03 15:52:27 +02:00
parent 6c9f08cfbb
commit 258b58675c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/gamification/__openerp__.py
View File

@ -56,7 +56,8 @@ Both goals and badges are flexibles and can be adapted to a large range of modul
'css': ['static/src/css/gamification.css'],
'js': [
'static/src/js/gamification.js',
'static/lib/justgage/justgage.js',
# conficting with justgage from sale_crm
# 'static/lib/justgage/justgage.js',
],
'qweb': ['static/src/xml/gamification.xml'],
}

2
addons/gamification/goal_view.xml
View File

@ -163,7 +163,7 @@
</t>
<t t-if="record.type_display.raw_value == 'progress'">
<t t-if="record.type_condition.raw_value =='higher'">
<field name="current" widget="goal" options="{'max_field': 'target_goal', 'label_field': 'type_suffix'}"/>
<field name="current" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'target_goal', 'label_field': 'type_suffix'}" />
</t>
<t t-if="record.type_condition.raw_value != 'higher'">
<div t-attf-class="oe_goal_state #{record.current.raw_value == record.target_goal.raw_value+1 ? 'oe_orange' : record.current.raw_value &gt; record.target_goal.raw_value ? 'oe_red' : 'oe_green'}">