diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py index 84bbec4..c3d9756 100644 --- a/beesdoo_website_shift/controllers/main.py +++ b/beesdoo_website_shift/controllers/main.py @@ -18,6 +18,11 @@ from openerp.addons.beesdoo_shift.models.cooperative_status import PERIOD class WebsiteShiftController(http.Controller): + def is_user_worker(self): + user = request.env['res.users'].browse(request.uid) + share_type = user.partner_id.cooperator_type + return share_type == 'share_a' + def is_user_irregular(self): user = request.env['res.users'].browse(request.uid) working_mode = user.partner_id.working_mode @@ -28,6 +33,11 @@ class WebsiteShiftController(http.Controller): working_mode = user.partner_id.working_mode return working_mode == 'regular' + def is_user_regular_without_shift(self): + user = request.env['res.users'].browse(request.uid) + return (not user.partner_id.subscribed_shift_ids.id + and self.is_user_regular()) + def is_user_exempted(self): user = request.env['res.users'].browse(request.uid) working_mode = user.partner_id.working_mode @@ -89,6 +99,11 @@ class WebsiteShiftController(http.Controller): 'beesdoo_website_shift.my_shift_irregular_worker', self.my_shift_irregular_worker(nexturl='/my/shift') ) + if self.is_user_regular_without_shift(): + return request.render( + 'beesdoo_website_shift.my_shift_regular_worker_without_shift', + self.my_shift_regular_worker_without_shift() + ) if self.is_user_regular(): return request.render( 'beesdoo_website_shift.my_shift_regular_worker', @@ -99,6 +114,11 @@ class WebsiteShiftController(http.Controller): 'beesdoo_website_shift.my_shift_exempted_worker', self.my_shift_exempted_worker() ) + if self.is_user_worker(): + return request.render( + 'beesdoo_website_shift.my_shift_new_worker', + {} + ) return request.render( 'beesdoo_website_shift.my_shift_non_worker', @@ -199,6 +219,12 @@ class WebsiteShiftController(http.Controller): return template_context + def my_shift_regular_worker_without_shift(self): + """ + Return template variables for 'beesdoo_website_shift.my_shift_regular_worker_without_shift' template + """ + return self.my_shift_worker_status() + def my_shift_regular_worker(self): """ Return template variables for 'beesdoo_website_shift.my_shift_regular_worker' template diff --git a/beesdoo_website_shift/i18n/fr_BE.po b/beesdoo_website_shift/i18n/fr_BE.po index 6164d57..1ee98ac 100644 --- a/beesdoo_website_shift/i18n/fr_BE.po +++ b/beesdoo_website_shift/i18n/fr_BE.po @@ -566,6 +566,12 @@ msgstr "Vous êtes un supercoopérateur" msgid "You don't have to participate to shift system." msgstr "Vous ne devez pas participer au système de shift." +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_new_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_regular_worker_without_shift +msgid "Please contact the members office to suscribe to shifts." +msgstr "Merci de contacter le bureau des membres pour vous inscrire à un créneau de travail." + #. module: beesdoo_website_shift #: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts msgid "Your next shifts" diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml index f938142..a3dde43 100644 --- a/beesdoo_website_shift/views/my_shift_website_templates.xml +++ b/beesdoo_website_shift/views/my_shift_website_templates.xml @@ -638,6 +638,32 @@ + + + + + + +