diff --git a/bemade_sports_clinic/data/demo/sports_clinic_demo_data.xml b/bemade_sports_clinic/data/demo/sports_clinic_demo_data.xml index 743fc0f..96af970 100644 --- a/bemade_sports_clinic/data/demo/sports_clinic_demo_data.xml +++ b/bemade_sports_clinic/data/demo/sports_clinic_demo_data.xml @@ -16,7 +16,7 @@ H3C 3J7 - +1 (514) 343-6111 + +1 (514) 343-6111 https://www.umontreal.ca @@ -35,15 +35,15 @@ head_coach - + Stretch Carabinier streth.carabinier@carabins.umontreal.ca - - + + - head_trainer + head_therapist Jean @@ -73,10 +73,10 @@ head_coach - - + + - head_trainer + head_therapist Jeanne @@ -161,10 +161,10 @@ - - - trainer - trainer + + + therapist + therapist @@ -174,7 +174,7 @@ - + diff --git a/bemade_sports_clinic/i18n/fr_CA.po b/bemade_sports_clinic/i18n/fr_CA.po index dfeadea..138b7f6 100644 --- a/bemade_sports_clinic/i18n/fr_CA.po +++ b/bemade_sports_clinic/i18n/fr_CA.po @@ -41,7 +41,7 @@ msgstr "Une équipe ne peut avoir qu'un seul entraineur chef." #. odoo-python #: code:addons/bemade_sports_clinic/models/sports_team.py:0 #, python-format -msgid "A team can have only one head trainer." +msgid "A team can have only one head therapist." msgstr "Une équipe ne peut avoir qu'un seul thérapeute en chef." #. module: bemade_sports_clinic @@ -269,9 +269,9 @@ msgid "Head Coach" msgstr "Entraîneur chef" #. module: bemade_sports_clinic -#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team__head_trainer_id -#: model:ir.model.fields.selection,name:bemade_sports_clinic.selection__sports_team_staff__role__head_trainer -msgid "Head Trainer" +#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team__head_therapist_id +#: model:ir.model.fields.selection,name:bemade_sports_clinic.selection__sports_team_staff__role__head_therapist +msgid "Head Therapist" msgstr "Thérapeute en chef" #. module: bemade_sports_clinic @@ -281,7 +281,7 @@ msgstr "Entraîneur chef :" #. module: bemade_sports_clinic #: model_terms:ir.ui.view,arch_db:bemade_sports_clinic.sports_team_view_kanban -msgid "Head trainer:" +msgid "Head therapist:" msgstr "Thérapeute en chef :" #. module: bemade_sports_clinic @@ -481,7 +481,7 @@ msgstr "Date limite de mon activité" #: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_patient_contact__name #: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_patient_injury__patient_name #: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team__head_coach_name -#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team__head_trainer_name +#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team__head_therapist_name #: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team__name #: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team_staff__name msgid "Name" @@ -615,11 +615,11 @@ msgid "Patients" msgstr "Patients" #. module: bemade_sports_clinic -#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_patient__phone -#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_patient_contact__phone -#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team_staff__phone -msgid "Phone" -msgstr "Téléphone" +#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_patient__mobile +#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_patient_contact__mobile +#: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team_staff__mobile +msgid "Mobile" +msgstr "Mobile" #. module: bemade_sports_clinic #: model:ir.model.fields,field_description:bemade_sports_clinic.field_sports_team__player_count @@ -824,10 +824,15 @@ msgid "Total Players" msgstr "Total des joueurs" #. module: bemade_sports_clinic -#: model:ir.model.fields.selection,name:bemade_sports_clinic.selection__sports_team_staff__role__trainer -msgid "Trainer" +#: model:ir.model.fields.selection,name:bemade_sports_clinic.selection__sports_team_staff__role__therapist +msgid "Therapist" msgstr "Thérapeute" +#. module: bemade_sports_clinic +#: model:ir.model.fields.selection,name:bemade_sports_clinic.selection__sports_team_staff__role__doctor +msgid "Doctor" +msgstr "Docteur" + #. module: bemade_sports_clinic #: model:res.groups,name:bemade_sports_clinic.group_sports_clinic_treatment_professional msgid "Treatment Professional" diff --git a/bemade_sports_clinic/models/patient.py b/bemade_sports_clinic/models/patient.py index b4eaec9..02b41a6 100644 --- a/bemade_sports_clinic/models/patient.py +++ b/bemade_sports_clinic/models/patient.py @@ -19,7 +19,7 @@ class Patient(models.Model): age = fields.Integer(compute='_compute_age', groups="bemade_sports_clinic.group_sports_clinic_treatment_professional", tracking=True) - phone = fields.Char(unaccent=False, + mobile = fields.Char(unaccent=False, groups="bemade_sports_clinic.group_sports_clinic_user", tracking=True) email = fields.Char(groups="bemade_sports_clinic.group_sports_clinic_user", @@ -154,7 +154,7 @@ class PatientContact(models.Model): ('father', 'Father'), ('other', 'Other'), ], required=True) - phone = fields.Char(unaccent=False, required=True) + mobile = fields.Char(unaccent=False, required=True) patient_id = fields.Many2one(comodel_name='sports.patient', string='Patient') diff --git a/bemade_sports_clinic/models/sports_team.py b/bemade_sports_clinic/models/sports_team.py index 341f74c..c418b07 100644 --- a/bemade_sports_clinic/models/sports_team.py +++ b/bemade_sports_clinic/models/sports_team.py @@ -23,10 +23,10 @@ class SportsTeam(models.Model): compute='_compute_head_coach', store=True) head_coach_name = fields.Char(related='head_coach_id.name') - head_trainer_id = fields.Many2one(comodel_name='res.partner', - compute='_compute_head_trainer', + head_therapist_id = fields.Many2one(comodel_name='res.partner', + compute='_compute_head_therapist', store=True) - head_trainer_name = fields.Char(related='head_trainer_id.name') + head_therapist_name = fields.Char(related='head_therapist_id.name') website = fields.Char() @api.depends('patient_ids.is_injured') @@ -43,10 +43,10 @@ class SportsTeam(models.Model): rec.head_coach_id = staff.partner_id if staff else False @api.depends('staff_ids.role') - def _compute_head_trainer(self): + def _compute_head_therapist(self): for rec in self: - staff = rec.staff_ids.filtered(lambda r: r.role == 'head_trainer') - rec.head_trainer_id = staff.partner_id if staff else False + staff = rec.staff_ids.filtered(lambda r: r.role == 'head_therapist') + rec.head_therapist_id = staff.partner_id if staff else False class TeamStaff(models.Model): @@ -59,12 +59,13 @@ class TeamStaff(models.Model): required=True, domain=[('is_company', '=', False)]) role = fields.Selection(selection=[ ('head_coach', 'Head Coach'), - ('head_trainer', 'Head Trainer'), + ('head_therapist', 'Head Therapist'), ('coach', 'Coach'), - ('trainer', 'Trainer'), + ('therapist', 'Therapist'), + ('doctor', 'Doctor'), ('other', 'Other') ], required=True) - phone = fields.Char(related='partner_id.phone', readonly=False) + mobile = fields.Char(related='partner_id.mobile', readonly=False) name = fields.Char(related='partner_id.name', readonly=False) parent_id = fields.Many2one(related='partner_id.parent_id', readonly=False, string="Organization", domain=[('is_company', '=', True)]) @@ -74,20 +75,19 @@ class TeamStaff(models.Model): _sql_constraints = [('team_staff_unique', 'unique(team_id, partner_id)', 'Each partner can only be related to a given team once.')] - @api.constrains('role') def _constrain_role(self): teams = self.mapped('team_id') for team in teams: if len(team.staff_ids.filtered(lambda r: r.role == 'head_coach')) > 1: raise ValidationError(_("A team can have only one head coach.")) - if len(team.staff_ids.filtered(lambda r: r.role == 'head_trainer')) > 1: - raise ValidationError(_("A team can have only one head trainer.")) + if len(team.staff_ids.filtered(lambda r: r.role == 'head_therapist')) > 1: + raise ValidationError(_("A team can have only one head therapist.")) - @api.onchange('phone') - def _onchange_phone_validation(self): - if self.phone: - self.phone = self.partner_id._phone_format(self.phone, force_format='INTERNATIONAL') + @api.onchange('mobile') + def _onchange_mobile_validation(self): + if self.mobile: + self.mobile = self.partner_id._phone_format(self.mobile, force_format='INTERNATIONAL') @api.depends('user_ids', 'user_ids.groups_id') def _compute_has_portal_access(self): diff --git a/bemade_sports_clinic/views/sports_patient_views.xml b/bemade_sports_clinic/views/sports_patient_views.xml index c8d0825..86de288 100644 --- a/bemade_sports_clinic/views/sports_patient_views.xml +++ b/bemade_sports_clinic/views/sports_patient_views.xml @@ -11,7 +11,7 @@ - + @@ -108,7 +108,7 @@ - + diff --git a/bemade_sports_clinic/views/sports_team_views.xml b/bemade_sports_clinic/views/sports_team_views.xml index 92ab3e2..50ccca2 100644 --- a/bemade_sports_clinic/views/sports_team_views.xml +++ b/bemade_sports_clinic/views/sports_team_views.xml @@ -8,13 +8,13 @@ - + - + @@ -27,7 +27,7 @@ - + @@ -48,8 +48,8 @@ name="head_coach_name"/> - Head trainer: + Head therapist: @@ -78,7 +78,7 @@ - + @@ -106,7 +106,7 @@ - + - +