odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] gamification: update goals only from plan, one cron call 

bzr revid: mat@openerp.com-20130301154336-aqnq9tprxa7s9dim
This commit is contained in:
Martin Trigaux 2013-03-01 16:43:36 +01:00
parent 1401725d22
commit 453bbe06e3
3 changed files with 23 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/gamification/cron.xml
View File

@ -1,19 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<!-- Scheduler for goal checking-->
<record forcecreate="True" id="ir_cron_check_goal"
model="ir.cron">
<field name="name">Run Goal Checker</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field eval="False" name="doall" />
<field name="model">gamification.goal</field>
<field name="function">_update_all</field>
<field name="args">()</field>
</record>
<record forcecreate="True" id="ir_cron_check_plan"
model="ir.cron">
<field name="name">Run Goal Plan Checker</field>
@ -25,6 +12,5 @@
<field name="function">_update_all</field>
<field name="args">()</field>
</record>
</data>
</openerp>

18
addons/gamification/goal.py
View File

@ -38,7 +38,7 @@ class gamification_goal_type(osv.Model):
_order = "sequence"
_columns = {
'name': fields.char('Type Name', required=True),
'name': fields.char('Type Name', required=True, translate=True),
'description': fields.text('Description'),
'computation_mode': fields.selection([
('sum','Sum'),
@ -162,20 +162,6 @@ class gamification_goal(osv.Model):
}
def _update_all(self, cr, uid, context=None, ids=False):
"""Update every goal in progress or reached whose date is not passed"""
if not context: context = {}
if not ids:
ids = self.search(cr, uid, [
'&',
('state', 'in', ('inprogress','inprogress_update', 'reached')),
'|',
('end_date', '>=', fields.date.today()),
('end_date', '=', False)
])
return self.update(cr, uid, ids, context=context)
def update(self, cr, uid, ids, context=None):
"""Update the goals to recomputes values and change of states
@ -232,7 +218,7 @@ class gamification_goal(osv.Model):
else: # computation mode = count
res = obj.search(cr, uid, domain, context=context)
towrite = {'current': len(res)}
print(domain, res)
# check goal target reached
if (goal.type_id.condition == 'plus' \
and towrite['current'] >= goal.target_goal) \

35
addons/gamification/plan.py
View File

@ -70,7 +70,7 @@ class gamification_goal_plan(osv.Model):
_inherit = 'mail.thread'
_columns = {
'name' : fields.char('Plan Name', required=True),
'name' : fields.char('Plan Name', required=True, translate=True),
'user_ids' : fields.many2many('res.users',
string='Users',
help="list of users to which the goal will be set"),
@ -90,7 +90,7 @@ class gamification_goal_plan(osv.Model):
('yearly', 'Yearly')
],
string='Periodicity',
help='Period of automatic goal assigment, will be done manually if none is selected',
help='Period of automatic goal assigment. If none is selected, should be launched manually.',
required=True),
'state': fields.selection([
('draft', 'Draft'),
@ -114,14 +114,14 @@ class gamification_goal_plan(osv.Model):
('monthly','Monthly'),
('yearly', 'Yearly')
],
string="Frequency",
string="Report Frequency",
required=True),
'report_message_group_id' : fields.many2one('mail.group',
string='Send a copy to',
help='Group that will receive a copy of the report in addition to the user'),
'report_header' : fields.text('Report Header'),
'remind_update_delay' : fields.integer('Remind delay',
help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified.")
help="The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value or zero is specified.")
}
_defaults = {
@ -160,25 +160,32 @@ class gamification_goal_plan(osv.Model):
self.plan_subscribe_users(cr, uid, ids, [user.id for user in new_group.users], context=context)
return write_res
def _update_all(self, cr, uid, context=None, ids=False):
"""Update the plans
"""Update the plans and goals
Create the goals for planlines not linked to goals (eg: modified the
plan to add planlines)
:param list(int) ids: the ids of the plans to update, if False will
update only goals in progress."""
if not context: context = {}
if not ids:
ids = self.search(cr, uid, [('state', '=', 'inprogress')])
goal_obj = self.pool.get('gamification.goal')
planline_obj = self.pool.get('gamification.goal.planline')
self.generate_goals_from_plan(cr, uid, ids, context=context)
for plan in self.browse(cr, uid, ids, context):
for planline in plan.planline_ids:
goal_ids = goal_obj.search(cr, uid, [('planline_id', '=', planline.id)] , context=context)
goal_obj.update(cr, uid, goal_ids, context=context)
# update goals
goal_obj = self.pool.get('gamification.goal')
goal_ids = goal_obj.search(cr, uid, [
'&',
('state', 'in', ('inprogress','inprogress_update', 'reached')),
'|',
('end_date', '>=', fields.date.today()),
('end_date', '=', False)
], context=context)
goal_obj.update(cr, uid, goal_ids, context=context)
self.report_progress(cr, uid, ids, context=context)
def action_start(self, cr, uid, ids, context=None):
"""Start a draft goal plan
@ -362,6 +369,7 @@ class gamification_goal_plan(osv.Model):
planlines_boards.append({'goal_type':planline.type_id.name, 'board_goals':sorted_board})
body_html = template_env.get_template('group_progress.mako').render({'object':plan, 'planlines_boards':planlines_boards})
self.message_post(cr, uid, plan.id,
body=body_html,
partner_ids=[(6, 0, [user.partner_id.id for user in plan.user_ids])],
@ -387,7 +395,6 @@ class gamification_goal_plan(osv.Model):
}
body_html = template_env.get_template('personal_progress.mako').render(variables)
# FIXME huge blank space
self.message_post(cr, uid, plan.id,
body=body_html,
partner_ids=[(6, 0, [user.partner_id.id])],