[ADD] use sparklines

bzr revid: mat@openerp.com-20130412152150-8679huigt6cfmool

1 files changed, 24 insertions, 21 deletions

diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml
index 3a068dab045..540cd2287ac 100644
--- a/addons/gamification/static/src/xml/gamification.xml
+++ b/addons/gamification/static/src/xml/gamification.xml
@@ -10,29 +10,28 @@
             <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>
+                    <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></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_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>
-                            <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                        </p>
-                        <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p>
-                    </t>
-                    <t t-if="goal.type_condition == 'lower'">
-                        <p>
-                            <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_ponctual">
+                        <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>
                                 <t t-if="goal.type_unit"><t t-esc="goal.type_unit"/></t>
-                            )
-                        </p>
+                            </p>
+                            <!-- <p><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100"/></p> -->
+                        </t>
+                        <t t-if="goal.type_condition == 'lower'">
+                            <p>
+                                <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>
+                                )
+                            </p>
+                        </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" />
-                        </a> -->
                 </li>
                 </ul>
             </t>
@@ -42,6 +41,7 @@
                     <tr>
                         <th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
                             <t t-esc="planline.type_name"/>
+                            (Goal: <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="planline.target_goal" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>)
                             <t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
                                 <a class="oe_goal_action" t-att-id="planline.own_goal_id">modify</a>
                             </t>
@@ -50,19 +50,22 @@
                     <tr>
                         <th>#</th>
                         <th>Pers.</th>
-                        <th>compl.</th>
-                        <th>Current</th>
+                        <th>current</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
                         <th><t t-esc="goal.rank" /></th>
                         <td class="col1"><t t-esc="goal.user_name" /></td>
-                        <td class="col2"><progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
+                        <td class="col2">
+                            <span class="oe_goal_sparkline_piechart" t-att-data-completeness="goal.completeness"></span>
+                            <span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>
+                        </td>
+<!--                             <progress class="oe_goal_progress" t-att-value="goal.completeness" max="100" /></td>
                         <td class="col3">
                             <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>
+                        </td> -->
                     </tr>
                 </tbody>
                 </table>