[ADD] monetary field

bzr revid: mat@openerp.com-20130326154553-t8cacle6s1oll4r9

1 files changed, 19 insertions, 6 deletions

diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index d68b7320e90..bbd005e5c2a 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -9,19 +9,25 @@
             <t t-if="plan.visibility_mode == 'progressbar'">
                 <ul class="oe_goals_list">
                 <li t-foreach="plan.goals" t-as="goal">
-                    <a class="oe_goal_action" t-att-id="goal.id" t-att-title="goal.type_description">
-                        <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}"><t t-esc="goal.type_name" /></strong>
-                    </a>
+                    <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'">
+                        <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> -->
                     <p>
                         <t t-if="goal.type_condition == 'higher'">
+                            <t t-esc="goal.current" />/<span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
                             <progress t-att-value="goal.completeness" max="100"/>
                         </t>
                         <t t-if="goal.type_condition == 'lower'">
-                            <t t-esc="goal.current" /> (less than <t t-esc="goal.target_goal"/>)
+                            <t t-esc="goal.current" /> (less than 
+                                <span t-attf-class="#{goal.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                                <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
+                            )
                         </t>
                         <!-- <a class="oe_update_goal" rol="button" t-attf-id="{goal.id}">
                             <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QMWCRMG1/sI6gAAAR1JREFUKM910T9L1nEUBfCPP39S4pAuba0FDoEhbc6CLkEUvQMb7hKFDU29gCYPNFUoiH9WRwedhBB8CS1Bg7WEKKH12PJ94GnoTJfDOece7h3TkGQCk+hxVVVnjZ/Gz6q6TqJLMvTcxRG+4l0T38MXPE0yVlW6qhoa5jCLG/jQuEXM4BOWk+hb0n2sYQVdVX1uhvc4xRbe4rBPMo4n+I7NqroYqXmFXTzEC9zpcbOt3m8CIzVhkGSvGR50GMdtDPwfZzjHoGvCUyygH9YZqQW3MIXjHr9wgFU8axdRVZJMocNjHONbV1W/sYMf+Ig3SSZb8kts4xFeV9VF19JO8GpEdNnmFSxhv6oO8M+n1zGP51X1J8lsS1/FRpIe/gIpymSOkJCtuQAAAABJRU5ErkJggg==" alt="update" />
@@ -33,7 +39,11 @@
             <t t-if="plan.visibility_mode == 'board'">
                 <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline">
                     <tr>
-                    <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}"><t t-esc="planline.type_name"/>
+                        <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
+                            <t t-esc="planline.type_name"/>
+                            <t t-if="planline.type_computation_mode == 'manually'">
+                                <a class="oe_goal_action" t-att-id="goal.id">modify</a>
+                            </t>
                         </th>
                     </tr>
                     <tr>
@@ -46,7 +56,10 @@
                         <td><t t-esc="goal.rank" /></td>
                         <td><t t-esc="goal.user_name" /></td>
                         <td><progress t-att-value="goal.completeness" max="100" /></td>
-                        <td><t t-esc="goal.current" />/<t t-esc="goal.target_goal" /></td>
+                        <td>
+                            <t t-esc="goal.current" />/<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.target_goal"/></span>
+                            <t t-if="planline.type_unit"><t t-esc="planline.type_unit"/></t>
+                        </td>
                     </tr>
                 </table>
             </t>