Browse Source

[ADD] Compute state of cooperative based on their shift presence

pull/19/head
Thibault Francois 7 years ago
parent
commit
3a90821c8f
  1. 1
      beesdoo_shift/__openerp__.py
  2. 12
      beesdoo_shift/data/cron.xml
  3. 152
      beesdoo_shift/models/cooperative_status.py
  4. 7
      beesdoo_shift/models/task.py
  5. 38
      beesdoo_shift/views/cooperative_status.xml
  6. 1
      beesdoo_shift/views/planning.xml
  7. 20
      beesdoo_shift/wizard/subscribe.py
  8. 1
      beesdoo_shift/wizard/subscribe.xml

1
beesdoo_shift/__openerp__.py

@ -20,6 +20,7 @@
'data': [ 'data': [
"data/stage.xml", "data/stage.xml",
"data/system_parameter.xml", "data/system_parameter.xml",
"data/cron.xml",
"security/group.xml", "security/group.xml",
"security/ir.model.access.csv", "security/ir.model.access.csv",
"views/task_template.xml", "views/task_template.xml",

12
beesdoo_shift/data/cron.xml

@ -0,0 +1,12 @@
<odoo>
<record id="ir_cron_update_today" model="ir.cron">
<field name="name">Update Cooperatoor status base on the date</field>
<field name="interval_number">24</field>
<field name="interval_type">hours</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False" />
<field name="model">cooperative.status</field>
<field name="function">_set_today</field>
<field name="args">()</field>
</record>
</odoo>

152
beesdoo_shift/models/cooperative_status.py

@ -2,28 +2,48 @@
from openerp import models, fields, api, _ from openerp import models, fields, api, _
from openerp.exceptions import ValidationError from openerp.exceptions import ValidationError
from datetime import timedelta
def add_days_delta(date_from, days_delta):
if not date_from:
return date_from
next_date = fields.Date.from_string(date_from) + timedelta(days=days_delta)
return fields.Date.to_string(next_date)
class ExemptReason(models.Model): class ExemptReason(models.Model):
_name = 'cooperative.exempt.reason' _name = 'cooperative.exempt.reason'
name = fields.Char(required=True) name = fields.Char(required=True)
class HistoryStatus(models.Model):
_name = 'cooperative.status.history'
_order= 'create_date desc'
status_id = fields.Many2one('cooperative.status')
cooperator_id = fields.Many2one('res.partner')
change = fields.Char()
type = fields.Selection([('status', 'Status Change'), ('counter', 'Counter Change')])
user_id = fields.Many2one('res.users', string="User")
class CooperativeStatus(models.Model): class CooperativeStatus(models.Model):
_name = 'cooperative.status' _name = 'cooperative.status'
_rec_name = 'cooperator_id' _rec_name = 'cooperator_id'
today = fields.Date(help="Field that allow to compute field and store them even if they are based on the current date")
cooperator_id = fields.Many2one('res.partner') cooperator_id = fields.Many2one('res.partner')
info_session = fields.Boolean('Information Session ?') info_session = fields.Boolean('Information Session ?')
info_session_date = fields.Datetime('Information Session Date') info_session_date = fields.Datetime('Information Session Date')
super = fields.Boolean("Super Cooperative") super = fields.Boolean("Super Cooperative")
sr = fields.Integer("Compteur shift regulier")
sc = fields.Integer("Compteur shift de compensation")
sr = fields.Integer("Compteur shift regulier", default=0)
sc = fields.Integer("Compteur shift de compensation", default=0)
time_holiday = fields.Integer("Holidays Days NB", default=0) time_holiday = fields.Integer("Holidays Days NB", default=0)
time_extension = fields.Integer("Extension Days NB", default=0) #Durée initial par défault sur ir_config_parameter
time_extension = fields.Integer("Extension Days NB", default=0, help="Addtional days to the automatic extension, 5 mean that you have a total of 15 extension days of default one is set to 10")
holiday_start_time = fields.Date("Holidays Start Day") holiday_start_time = fields.Date("Holidays Start Day")
alert_start_time = fields.Date("Alert Start Day") alert_start_time = fields.Date("Alert Start Day")
extension_start_time = fields.Date("Extension Start Day") extension_start_time = fields.Date("Extension Start Day")
#Champ compute #Champ compute
status = fields.Selection([('ok', 'Up to Date'), ('holiday', 'Holidays'), ('alert', 'Alerte'), ('unsubscribed', 'Unsubscribed')], compute="_compute_status", string="Cooperative Status")
working_mode = fields.Selection( working_mode = fields.Selection(
[ [
('regular', 'Regular worker'), ('regular', 'Regular worker'),
@ -33,32 +53,122 @@ class CooperativeStatus(models.Model):
string="Working mode" string="Working mode"
) )
exempt_reason_id = fields.Many2one('cooperative.exempt.reason', 'Exempt Reason') exempt_reason_id = fields.Many2one('cooperative.exempt.reason', 'Exempt Reason')
# cooperator_type = fields.Selection(related="cooperator_id.cooperator_type", store=True)
#
# def _auto_working_mode(self, vals):
# print "Auto Working mode"
# if vals.get('cooperator_type') == 'share_b':
# vals['working_mode'] = 'exempt'
#
# @api.model
# @api.returns('self', lambda value:value.id)
# def create(self, vals):
# self._auto_working_mode(vals)
# return super(CooperativeStatus, self).create(self, vals)
#
# @api.multi
# def _write(self, vals):
# self._auto_working_mode(vals)
# return super(CooperativeStatus, self)._write(vals)
status = fields.Selection([('ok', 'Up to Date'),
('holiday', 'Holidays'),
('alert', 'Alerte'),
('extension', 'Suspended (auto ext)'),
('extension_current', 'In extension'),
('suspended', 'Suspended'),
('unsubscribed', 'Unsubscribed')],
compute="_compute_status", string="Cooperative Status", store=True)
can_shop = fields.Boolean(compute='_compute_status', store=True)
history_ids = fields.One2many('cooperative.status.history', 'status_id', readonly=True)
@api.depends('today', 'sr', 'sc', 'time_holiday', 'holiday_start_time', 'time_extension', 'alert_start_time', 'extension_start_time')
def _compute_status(self): def _compute_status(self):
alert_delay = int(self.env['ir.config_parameter'].get_param('alert_delay', 28))
grace_delay = int(self.env['ir.config_parameter'].get_param('default_grace_delay', 10))
for rec in self: for rec in self:
ok = rec.sr >= 0 and rec.sc >= 0
grace_delay = grace_delay + rec.time_extension
if rec.sr < -1: #un subscribed
rec.status = 'unsubscribed'
rec.can_shop = False
#Transition to alert sr < 0 or stay in alert sr < 0 or sc < 0 and thus alert time is defined
elif not ok and rec.alert_start_time and rec.extension_start_time and rec.today <= add_days_delta(rec.extension_start_time, grace_delay):
rec.status = 'extension_current'
rec.can_shop = True
elif not ok and rec.alert_start_time and rec.extension_start_time and rec.today > add_days_delta(rec.extension_start_time, grace_delay):
rec.status = 'suspended'
rec.can_shop = False
elif not ok and rec.alert_start_time and rec.today > add_days_delta(rec.alert_start_time, alert_delay):
rec.status = 'extension'
rec.can_shop = False
elif (rec.sr < 0) or (not ok and rec.alert_start_time):
rec.status = 'alert'
rec.can_shop = True
#Check for holidays; Can be in holidays even in alert or other mode ?
elif rec.today >= rec.holiday_start_time and rec.today < add_days_delta(rec.holiday_start_time, rec.time_holiday):
rec.status = 'holiday'
rec.can_shop = True
elif ok or (not rec.alert_start_time and rec.sr >= 0):
rec.status = 'ok' rec.status = 'ok'
rec.can_shop = True
@api.multi
def write(self, vals):
"""
Overwrite write to historize the change
"""
for field in ['sr', 'sc', 'time_extension', 'extension_start_time', 'alert_start_time']:
if not field in vals:
continue
for rec in self:
data = {
'status_id': rec.id,
'cooperator_id': rec.cooperator_id.id,
'type': 'counter',
'user_id': self.env.context.get('real_uid', self.env.uid),
}
if vals.get(field, rec[field]) != rec[field]:
data['change'] = '%s: %s -> %s' % (field.upper(), rec[field], vals.get(field))
self.env['cooperative.status.history'].sudo().create(data)
return super(CooperativeStatus, self).write(vals)
def _state_change(self, new_state, old_stage):
if new_state == 'alert':
self.write({'alert_start_time': self.today, 'extension_start_time': False, 'time_extension': 0})
if new_state == 'ok': #reset alert start time if back to ok
self.write({'alert_start_time': False, 'extension_start_time': False, 'time_extension': 0})
if new_state == 'unsubscribed':
self.cooperator_id.sudo().write({'subscribed_shift_ids' : [(5,0,0)]})
self.env['beesdoo.shift.shift'].sudo().unsubscribe_from_today([self.cooperator_id.id], today=self.today)
@api.multi
def _write(self, vals):
"""
Overwrite write to historize the change of status
and make action on status change
"""
if 'status' in vals:
self._cr.execute('select id, status, sr, sc from "%s" where id in %%s' % self._table, (self._ids,))
result = self._cr.dictfetchall()
old_status_per_id = {r['id'] : r for r in result}
for rec in self:
if old_status_per_id[rec.id]['status'] != vals['status']:
data = {
'status_id': rec.id,
'cooperator_id': rec.cooperator_id.id,
'type': 'status',
'change': "STATUS: %s -> %s" % (old_status_per_id[rec.id]['status'], vals['status']),
'user_id': self.env.context.get('real_uid', self.env.uid),
}
self.env['cooperative.status.history'].sudo().create(data)
rec._state_change(vals['status'], old_status_per_id[rec.id]['status'])
return super(CooperativeStatus, self)._write(vals)
_sql_constraints = [ _sql_constraints = [
('cooperator_uniq', 'unique (cooperator_id)', _('You can only set one cooperator status per cooperator')), ('cooperator_uniq', 'unique (cooperator_id)', _('You can only set one cooperator status per cooperator')),
] ]
@api.model
def _set_today(self):
"""
Method call by the cron to update store value base on the date
"""
self.search([]).write({'today': fields.Date.today()})
@api.multi
def clear_history(self):
self.ensure_one()
self.history_ids.unlink()
class ResPartner(models.Model): class ResPartner(models.Model):
_inherit = 'res.partner' _inherit = 'res.partner'

7
beesdoo_shift/models/task.py

@ -50,3 +50,10 @@ class Task(models.Model):
} }
#TODO button to replaced someone #TODO button to replaced someone
@api.model
def unsubscribe_from_today(self, worker_ids, today=None):
today = today or fields.Date.today()
today = today + ' 00:00:00'
to_unsubscribe = self.search([('worker_id', 'in', worker_ids), ('start_time', '>=', today)])
to_unsubscribe.write({'worker_id': False})
#What about replacement ?

38
beesdoo_shift/views/cooperative_status.xml

@ -38,21 +38,42 @@
<header> <header>
<field name="status" widget="statusbar" /> <field name="status" widget="statusbar" />
</header> </header>
<group>
<group> <group>
<field name="cooperator_id" /> <field name="cooperator_id" />
<field name="info_session" />
<field name="info_session_date" />
<field name="working_mode" /> <field name="working_mode" />
<field name="exempt_reason_id" attrs="{'invisible':[('working_mode', '!=', 'exempt')]}"/> <field name="exempt_reason_id" attrs="{'invisible':[('working_mode', '!=', 'exempt')]}"/>
<field name="super" /> <field name="super" />
</group>
<group>
<field name="info_session" />
<field name="info_session_date" />
<field name="sr" /> <field name="sr" />
<field name="sc" /> <field name="sc" />
<field name="can_shop" />
</group>
<group>
<field name="time_holiday" /> <field name="time_holiday" />
<field name="time_extension" /> <field name="time_extension" />
<field name="holiday_start_time" /> <field name="holiday_start_time" />
<field name="alert_start_time" /> <field name="alert_start_time" />
<field name="extension_start_time" /> <field name="extension_start_time" />
</group> </group>
</group>
<group groups="base.group_no_one" col="3">
<separator string="For testing purpose only" colspan="3"/>
<field name="today" />
<button name="clear_history" type="object" string="Clear History" />
</group>
<separator string="History" colspan="2"/>
<field name="history_ids">
<tree>
<field name="create_date" string="Date" />
<field name="type" />
<field name="change" />
<field name="user_id" />
</tree>
</field>
</form> </form>
</field> </field>
</record> </record>
@ -86,6 +107,19 @@
groups="beesdoo_shift.group_shift_management" sequence="20" /> groups="beesdoo_shift.group_shift_management" sequence="20" />
<menuitem name="Cooperative Status" id="menu_status" parent="menu_status_top" <menuitem name="Cooperative Status" id="menu_status" parent="menu_status_top"
action="action_coop_status" groups="beesdoo_shift.group_cooperative_admin" /> action="action_coop_status" groups="beesdoo_shift.group_cooperative_admin" />
<!-- Actions -->
<record model="ir.actions.act_window" id="action_worker">
<field name="name">Worker</field>
<field name="res_model">res.partner</field>
<field name="view_mode">kanban,tree,form</field>
<field name="domain">[('cooperator_type', '=', 'share_a')]</field>
</record>
<menuitem name="Worker" id="menu_worker_top" parent="menu_root"
sequence="1" />
<menuitem name="Worker" id="menu_worker" parent="menu_worker_top"
action="action_worker" />
</odoo> </odoo>

1
beesdoo_shift/views/planning.xml

@ -79,4 +79,5 @@
<menuitem name="Planning Week" id="menu_planning" parent="menu_template_top" <menuitem name="Planning Week" id="menu_planning" parent="menu_template_top"
sequence="10" action="action_planning" /> sequence="10" action="action_planning" />
</odoo> </odoo>

20
beesdoo_shift/wizard/subscribe.py

@ -15,6 +15,9 @@ class Subscribe(models.TransientModel):
def _get_super(self): def _get_super(self):
return self.env['res.partner'].browse(self._context.get('active_id')).super return self.env['res.partner'].browse(self._context.get('active_id')).super
def _get_mode(self):
return self.env['res.partner'].browse(self._context.get('active_id')).working_mode
cooperator_id = fields.Many2one('res.partner', default=lambda self: self.env['res.partner'].browse(self._context.get('active_id')), required=True) cooperator_id = fields.Many2one('res.partner', default=lambda self: self.env['res.partner'].browse(self._context.get('active_id')), required=True)
info_session = fields.Boolean(string="Followed an information session", default=True) info_session = fields.Boolean(string="Followed an information session", default=True)
info_session_date = fields.Date(string="Date of information session", default=_get_date) info_session_date = fields.Date(string="Date of information session", default=_get_date)
@ -24,10 +27,11 @@ class Subscribe(models.TransientModel):
('regular', 'Regular worker'), ('regular', 'Regular worker'),
('irregular', 'Irregular worker'), ('irregular', 'Irregular worker'),
('exempt', 'Exempted'), ('exempt', 'Exempted'),
],
], default=_get_mode
) )
exempt_reason_id = fields.Many2one('cooperative.exempt.reason', 'Exempt Reason') exempt_reason_id = fields.Many2one('cooperative.exempt.reason', 'Exempt Reason')
shift_id = fields.Many2one('beesdoo.shift.template') shift_id = fields.Many2one('beesdoo.shift.template')
reset_counter = fields.Boolean(default=False)
@api.multi @api.multi
def subscribe(self): def subscribe(self):
@ -36,10 +40,16 @@ class Subscribe(models.TransientModel):
if self.cooperator_id == self.env.user.partner_id and not self.env.user.has_group('beesdoo_shift.group_cooperative_admin'): if self.cooperator_id == self.env.user.partner_id and not self.env.user.has_group('beesdoo_shift.group_cooperative_admin'):
raise UserError(_("You cannot subscribe yourself.")) raise UserError(_("You cannot subscribe yourself."))
self.ensure_one() self.ensure_one()
self = self.with_context(real_uid=self._uid)
if self.shift_id and self.shift_id.remaining_worker <= 0: if self.shift_id and self.shift_id.remaining_worker <= 0:
raise UserError(_('There is no remaining space for this shift')) raise UserError(_('There is no remaining space for this shift'))
if self.shift_id: if self.shift_id:
self.sudo().shift_id.worker_ids |= self.cooperator_id
#Remove existing shift then subscribe to the new shift
self.cooperator_id.sudo().write({'subscribed_shift_ids' : [(6,0, [self.shift_id.id])]})
if self.working_mode != 'regular':
#Remove existing shift then subscribe to the new shift
self.cooperator_id.sudo().write({'subscribed_shift_ids' : [(5,)]})
data = { data = {
'info_session' : self.info_session, 'info_session' : self.info_session,
'info_session_date': self.info_session_date, 'info_session_date': self.info_session_date,
@ -47,8 +57,12 @@ class Subscribe(models.TransientModel):
'exempt_reason_id' : self.exempt_reason_id.id, 'exempt_reason_id' : self.exempt_reason_id.id,
'super' : self.super, 'super' : self.super,
'cooperator_id': self.cooperator_id.id, 'cooperator_id': self.cooperator_id.id,
'sr' : 0, #set back to 0 if you subscribe a second time
'extension_start_time': False,
'alert_start_time': False,
'time_extension': 0,
} }
if self.reset_counter:
data['sr'] = 0
status_id = self.env['cooperative.status'].search([('cooperator_id', '=', self.cooperator_id.id)]) status_id = self.env['cooperative.status'].search([('cooperator_id', '=', self.cooperator_id.id)])
if status_id: if status_id:

1
beesdoo_shift/wizard/subscribe.xml

@ -12,6 +12,7 @@
<field name="exempt_reason_id" attrs="{'invisible':[('working_mode', '!=', 'exempt')]}"/> <field name="exempt_reason_id" attrs="{'invisible':[('working_mode', '!=', 'exempt')]}"/>
<field name="shift_id" domain="[('remaining_worker', '>', 0)]" attrs="{'invisible': [('working_mode', '!=', 'regular')]}"/> <field name="shift_id" domain="[('remaining_worker', '>', 0)]" attrs="{'invisible': [('working_mode', '!=', 'regular')]}"/>
<field name="super" /> <field name="super" />
<field name="reset_counter" />
</group> </group>
<footer> <footer>
<button type="object" name="subscribe" <button type="object" name="subscribe"

Loading…
Cancel
Save