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

[IMP] display sent count instead of remaining 

bzr revid: mat@openerp.com-20130412140958-nnsc7io1cs57qdq6
This commit is contained in:
Martin Trigaux 2013-04-12 16:09:58 +02:00
parent ef8ab87cff
commit 8f05129bcd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/gamification/badge_view.xml
View File

@ -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>

5
addons/gamification/static/src/css/goal.css
View File

@ -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 */

2
addons/hr_gamification/badge_view.xml
View File

@ -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