From ca712230e2b0cf2927971ce3a8715e9ae8a015e7 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 15 Feb 2013 14:09:21 +0100 Subject: [PATCH] [ADD] plan views for gamification moduel bzr revid: mat@openerp.com-20130215130921-ca64o47syxn6vob1 --- addons/hr_goal/__openerp__.py | 1 + addons/hr_goal/goal.py | 6 ++- addons/hr_goal/view/definition.xml | 15 ------ addons/hr_goal/view/menu.xml | 12 ++--- addons/hr_goal/view/plan.xml | 73 ++++++++++++++++++++++++++++++ addons/hr_goal/view/preset.xml | 13 ------ 6 files changed, 85 insertions(+), 35 deletions(-) delete mode 100644 addons/hr_goal/view/definition.xml create mode 100644 addons/hr_goal/view/plan.xml delete mode 100644 addons/hr_goal/view/preset.xml diff --git a/addons/hr_goal/__openerp__.py b/addons/hr_goal/__openerp__.py index cc2a70dffbb..896a5b4eb01 100644 --- a/addons/hr_goal/__openerp__.py +++ b/addons/hr_goal/__openerp__.py @@ -29,6 +29,7 @@ 'data': [ 'view/type.xml', 'view/goal.xml', + 'view/plan.xml', 'view/menu.xml', ], 'installable': True, diff --git a/addons/hr_goal/goal.py b/addons/hr_goal/goal.py index ae2c773fff9..03a1f741440 100644 --- a/addons/hr_goal/goal.py +++ b/addons/hr_goal/goal.py @@ -155,8 +155,12 @@ class gamification_goal_plan(osv.Model): _columns = { 'name' : fields.char('Plan name', required=True), 'user_ids' : fields.many2many('res.users', - string='Definition', + string='Users', help="list of users to which the goal will be set"), + 'planline_ids' : fields.one2many('gamification.goal.planline', + 'plan_id', + string='Planline', + help="list of goals that will be set"), 'group_id' : fields.many2one('res.groups', string='Group'), 'period' : fields.selection(GAMIFICATION_PERIOD_STATUS, string='Period', diff --git a/addons/hr_goal/view/definition.xml b/addons/hr_goal/view/definition.xml deleted file mode 100644 index 47241f6710b..00000000000 --- a/addons/hr_goal/view/definition.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Goal definitions - hr.goal.definition - tree,form - - - - - - - \ No newline at end of file diff --git a/addons/hr_goal/view/menu.xml b/addons/hr_goal/view/menu.xml index e699f445591..f26feb1ffef 100644 --- a/addons/hr_goal/view/menu.xml +++ b/addons/hr_goal/view/menu.xml @@ -1,13 +1,13 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/addons/hr_goal/view/plan.xml b/addons/hr_goal/view/plan.xml new file mode 100644 index 00000000000..3d9760bd37d --- /dev/null +++ b/addons/hr_goal/view/plan.xml @@ -0,0 +1,73 @@ + + + + + + Goal plans + gamification.goal.plan + tree,form + + + + Goal plans list + gamification.goal.plan + + + + + + + + + + + Goal plan form + gamification.goal.plan + +
+ +

+ +

+ + + + + + + + + + + + + + + + + + + + +
+ X +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
\ No newline at end of file diff --git a/addons/hr_goal/view/preset.xml b/addons/hr_goal/view/preset.xml deleted file mode 100644 index 270149b812e..00000000000 --- a/addons/hr_goal/view/preset.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - Presets - hr.goal.preset - tree,form - - - - - \ No newline at end of file