summaryrefslogtreecommitdiff
path: root/addons/gamification/static/src
diff options
context:
space:
mode:
authorMartin Trigaux <mat@openerp.com>2013-04-10 12:14:54 +0200
committerMartin Trigaux <mat@openerp.com>2013-04-10 12:14:54 +0200
commitf70b0017f63fa9baef330e05e67517d2127e798e (patch)
treec43c4a73791d19e5829813665f571213a2cc6b09 /addons/gamification/static/src
parent4baed41a125cb64a76b09f4f0bbc1a64443dea30 (diff)
[IMP] fixing and UI
bzr revid: mat@openerp.com-20130410101454-nkt8mbt8qb13zrge
Diffstat (limited to 'addons/gamification/static/src')
-rw-r--r--addons/gamification/static/src/css/goal.css2
-rw-r--r--addons/gamification/static/src/js/gamification.js4
-rw-r--r--addons/gamification/static/src/xml/gamification.xml5
3 files changed, 4 insertions, 7 deletions
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 0856bd60135..f6c38ea1ccb 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -2,7 +2,7 @@
.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
width: 220px;
- min-height: 160px;
+ min-height: 150px;
}
.oe_kanban_badge_avatars {
diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js
index 220f69cdfd2..87550914ecc 100644
--- a/addons/gamification/static/src/js/gamification.js
+++ b/addons/gamification/static/src/js/gamification.js
@@ -125,14 +125,14 @@ openerp.gamification = function(instance) {
if (self.view.dataset.model === 'gamification.goal' && self.$el.find('.oe_goal_gauge').length == 1) {
var unique_id = _.uniqueId("goal_gauge_");
self.$el.find('.oe_goal_gauge').attr('id', unique_id);
-
+ console.log(self.record);
var g = new JustGage({
id: unique_id,
node: self.$el.find('.oe_goal_gauge').empty().get(0),
value: self.record.current.raw_value,
min: 0,
max: self.record.target_goal.raw_value,
- title: self.record.type_id.value,
+ // title: self.record.type_id.value,
relativeGaugeSize: true,
levelColors: [
"#f9c802",
diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 9dfebe14f62..3a068dab045 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,14 +10,11 @@
<t t-if="plan.visibility_mode == 'progressbar'">
<ul class="oe_goals_list">
<li t-foreach="plan.goals" t-as="goal">
+ <span class="oe_goal_sparkline_piechart"></span>
<strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}" t-att-title="goal.type_description"><t t-esc="goal.type_name" /></strong>
<t t-if="goal.computation_mode == 'manually' or goal.type_action">
<a class="oe_goal_action" t-att-id="goal.id">modify</a>
</t>
- <!-- <t t-if="goal.type_description">
- <a class="oe_show_description" t-att-id="goal.id">?</a>
- <p t-att-class="'oe_type_description oe_type_description_' + goal.id"><t t-esc="goal.type_description" /></p>
- </t> -->
<t t-if="goal.type_condition == 'higher'">
<p>
<t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>