diff options
| author | Martin Trigaux <mat@openerp.com> | 2013-03-25 16:39:53 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@openerp.com> | 2013-03-25 16:39:53 +0100 |
| commit | 364612d0be52e6677a26f8a083d58b52d81c7f0a (patch) | |
| tree | fe732214c784cc83794c117b0a786d7b6ade6cbb /addons/gamification/static/src | |
| parent | 0ef116ce06e6795af661d924a211938f198a4289 (diff) | |
[IMP] use board view for sidebar
bzr revid: mat@openerp.com-20130325153953-zch12sfx62s5i6xc
Diffstat (limited to 'addons/gamification/static/src')
| -rw-r--r-- | addons/gamification/static/src/css/goal.css | 7 | ||||
| -rw-r--r-- | addons/gamification/static/src/js/gamification.js | 2 | ||||
| -rw-r--r-- | addons/gamification/static/src/xml/gamification.xml | 25 |
3 files changed, 30 insertions, 4 deletions
diff --git a/addons/gamification/static/src/css/goal.css b/addons/gamification/static/src/css/goal.css index 8757006aad1..8feb80ed4ad 100644 --- a/addons/gamification/static/src/css/goal.css +++ b/addons/gamification/static/src/css/goal.css @@ -58,6 +58,13 @@ .openerp .oe_mail_wall .oe_mail_wall_aside li { margin-bottom: 15px; } +.openerp .oe_mail_wall .oe_mail_wall_aside table { + margin: 10px 0; +} +.openerp .oe_mail_wall .oe_mail_wall_aside table progress { + width: 100%; + display: inline-block; +} .openerp .oe_mail_wall .oe_mail_wall_aside li progress { width: 80%; display: inline-block; diff --git a/addons/gamification/static/src/js/gamification.js b/addons/gamification/static/src/js/gamification.js index d24e0b4159c..28323b29421 100644 --- a/addons/gamification/static/src/js/gamification.js +++ b/addons/gamification/static/src/js/gamification.js @@ -1,5 +1,4 @@ openerp.gamification = function(instance) { - console.log("Debug statement: file loaded"); var QWeb = instance.web.qweb; instance.gamification.Sidebar = instance.web.Widget.extend({ @@ -31,7 +30,6 @@ openerp.gamification = function(instance) { goal_action['action'] = res; }); $.when(goal_action).done(function() { - console.log(goal_action); var action_manager = new instance.web.ActionManager(this); action_manager.do_action(goal_action.action); diff --git a/addons/gamification/static/src/xml/gamification.xml b/addons/gamification/static/src/xml/gamification.xml index 2019a9f86c8..be287bdccaf 100644 --- a/addons/gamification/static/src/xml/gamification.xml +++ b/addons/gamification/static/src/xml/gamification.xml @@ -5,7 +5,8 @@ <t t-name="gamification.goal_list_to_do"> <div t-foreach="widget.goals_info.info" t-as="plan"> <h3><t t-esc="plan.name"/></h3> - <ul class="oe_goals_list"> + <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"> <strong t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : goal.state == 'failed' ? 'oe_goal_failed' : ''}"><t t-esc="goal.type_name" /></strong> @@ -26,7 +27,27 @@ </a> </p> </li> - </ul> + </ul> + </t> + <t t-if="plan.visibility_mode == 'board'"> + <table width="100%" border="1" t-foreach="plan.planlines" t-as="planline"> + <tr> + <th colspan="4"><t t-esc="planline.goal_type"/></th> + </tr> + <tr> + <th>#</th> + <th>Pers.</th> + <th>compl.</th> + <th>Current</th> + </tr> + <tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.completness >= 100 ? 'oe_bold' : ''}"> + <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> + </tr> + </table> + </t> </div> </t> |