[IMP] better UI

bzr revid: mat@openerp.com-20130408141132-or43mhdl8d5ds7xb

addons/gamification/goal_base_data.xml

@@ -29,7 +29,7 @@
             <field name="computation_mode">count</field>
             <field name="model_id" eval="ref('base.model_res_company')" />
             <field name="domain">[('user_ids', 'in', user_id), ('name', '!=', 'Your Company')]</field>
-            <field name="action_id" eval="ref('base.action_res_company_form_my')" />
+            <field name="action_id" eval="ref('base.action_res_company_form')" />
             <field name="res_id_field">company_id.id</field>
         </record>
 

addons/gamification/goal_view.xml

@@ -23,12 +23,12 @@
             <field name="model">gamification.goal</field>
             <field name="arch" type="xml">
                 <tree string="Goal List" colors="red:state == 'failed';green:state == 'reached';grey:state == 'canceled'"> 
-                    <field name="type_id"/>
-                    <field name="user_id"/>
-                    <field name="current"/>
-                    <field name="target_goal"/>
+                    <field name="type_id" invisible="1" />
+                    <field name="user_id" invisible="1" />
                     <field name="start_date"/>
                     <field name="end_date"/>
+                    <field name="current"/>
+                    <field name="target_goal"/>
                     <field name="completeness" widget="progressbar"/>
                     <field name="state" invisible="1"/>
                     <field name="planline_id" invisible="1"/>

addons/gamification/plan.py

@@ -414,6 +414,10 @@ class gamification_goal_plan(osv.Model):
 
             board_goals = [goal for goal in goal_obj.browse(cr, uid, common_goal_ids, context=context)]
 
+            if len(board_goals) == 0:
+                # planline has no generated goals
+                continue
+
             # most complete first, current if same percentage (eg: if several 100%)
             sorted_board = enumerate(sorted(board_goals, key=lambda k: (k.completeness, k.current), reverse=True))
             planlines_boards.append({'goal_type': planline.type_id, 'board_goals': sorted_board})

addons/gamification/res_users.py

@@ -45,12 +45,12 @@ class res_users_gamification_group(osv.Model):
                 # board report should be grouped by planline for all users
                 goals_info = plan_obj.get_board_goal_info(cr, uid, plan, subset_goal_ids=False, context=context)
 
-                if not goals_info:
+                if len(goals_info) == 0:
+                    # plan with no valid planlines
                     continue
 
                 serialized_goals_info['planlines'] = []
                 for planline_board in goals_info:
-                    print("planline_board", planline_board.name)
                     vals = {'type_name': planline_board['goal_type'].name,
                             'type_description': planline_board['goal_type'].description,
                             'type_condition': planline_board['goal_type'].condition,
@@ -73,9 +73,6 @@ class res_users_gamification_group(osv.Model):
                             vals['own_goal_id'] = goal[1].id
                     serialized_goals_info['planlines'].append(vals)
 
-                if len(serialized_goals_info['planlines']) == 0:
-                    # plan with no valid planlines
-                    continue
             else:
                 # individual report are simply a list of goal
                 goals_info = plan_obj.get_indivual_goal_info(cr, uid, uid, plan, subset_goal_ids=False, context=context)
@@ -85,7 +82,6 @@ class res_users_gamification_group(osv.Model):
 
                 serialized_goals_info['goals'] = []
                 for goal in goals_info['goals']:
-                    print("goal", goal.type_id.name)
                     serialized_goals_info['goals'].append({
                         'id': goal.id,
                         'type_name': goal.type_id.name,
@@ -100,7 +96,6 @@ class res_users_gamification_group(osv.Model):
                         'current': goal.current,
                         'target_goal': goal.target_goal,
                     })
-                    print("goal", True if goal.type_id.action_id else False)
 
             all_goals_info.append(serialized_goals_info)
         return all_goals_info

addons/gamification/security/gamification_security.xml

@@ -34,11 +34,19 @@
             <field name="name">Manager has all rights on user's goals</field>
             <field name="model_id" ref="model_gamification_goal"/>
             <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
         </record>
         <record id="goal_plan_manager_visibility" model="ir.rule">
             <field name="name">Manager has all rights on goal plans</field>
             <field name="model_id" ref="model_gamification_goal_plan"/>
             <field name="groups" eval="[(4, ref('group_goal_manager'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
         </record>
 
     </data>

addons/hr_evaluation/hr_evaluation_view.xml

@@ -416,8 +416,8 @@
         <record id="goals_menu_groupby_act" model="ir.actions.act_window">
             <field name="res_model">gamification.goal</field>
             <field name="view_type">form</field>
-            <field name="name">Goals</field>
-            <field name="view_mode">tree,kanban,form</field>
+            <field name="name">Goals History</field>
+            <field name="view_mode">tree,kanban</field>
             <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
         </record>