From 8f05129bcda7de790b33b561330dcd881f5c8da2 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 12 Apr 2013 16:09:58 +0200
Subject: [PATCH] [IMP] display sent count instead of remaining

bzr revid: mat@openerp.com-20130412140958-nnsc7io1cs57qdq6
---
 addons/gamification/badge_view.xml          | 7 ++++---
 addons/gamification/static/src/css/goal.css | 5 ++++-
 addons/hr_gamification/badge_view.xml       | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/gamification/badge_view.xml b/addons/gamification/badge_view.xml
index 9b615963bb9..ef0cb37c71d 100644
--- a/addons/gamification/badge_view.xml
+++ b/addons/gamification/badge_view.xml
@@ -29,7 +29,7 @@
                     <group>
                         <field name="user_id" nolabel="1" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding" />
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or
@@ -134,6 +134,7 @@
                     <field name="stat_count"/>
                     <field name="stat_this_month"/>
                     <field name="unique_owner_ids"/>
+                    <field name="stat_my_monthly_sending"/>
                     <field name="remaining_sending" />
                     <field name="rule_max_number" />
                     <templates>
@@ -161,10 +162,10 @@
                                             <button type="action" name="%(action_grant_wizard)d" class="oe_highlight">Grant</button>
                                             <span class="oe_grey">
                                                 <t t-if="record.remaining_sending.value != -1">
-                                                    <t t-esc="record.remaining_sending.value"/>/<t t-esc="record.rule_max_number.value"/>
+                                                    <t t-esc="record.stat_my_monthly_sending.value"/>/<t t-esc="record.rule_max_number.value"/>
                                                 </t>
                                                 <t t-if="record.remaining_sending.value == -1">
-                                                    ∞
+                                                    <t t-esc="record.stat_my_monthly_sending.value"/>/∞
                                                 </t>
                                             </span>
                                         </t>
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css
index 90baa758808..c231f9447c1 100644
--- a/addons/gamification/static/src/css/goal.css
+++ b/addons/gamification/static/src/css/goal.css
@@ -52,7 +52,10 @@
 .openerp .oe_orange {
     color: orange;
 }
-
+/* compensate padding from .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell */
+.openerp .oe_form td .oe_no_padding {
+    margin-left: -6px;
+}
 
 /* Mail Sidebar */
 
diff --git a/addons/hr_gamification/badge_view.xml b/addons/hr_gamification/badge_view.xml
index df1d03b5fca..fac64711591 100644
--- a/addons/hr_gamification/badge_view.xml
+++ b/addons/hr_gamification/badge_view.xml
@@ -13,7 +13,7 @@
                     <group>
                         <field name="employee_id" nolabel="1" domain="[('user_id', '!=', False)]" />
                         <field name="badge_id" invisible="1"/>
-                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" />
+                        <field name="comment" nolabel="1" placeholder="Describe what they did and why it matters (will be public)" class="oe_no_padding"/>
                     </group>
                     <footer>
                         <button string="Grant Badge" type="object" name="action_grant_badge" class="oe_highlight" /> or