From 99d78ac7aff0991c76925c0f5a875203c902bc37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Wed, 31 Jan 2018 17:10:46 +0100 Subject: [PATCH 01/11] [IMP] website_shift: Next shifts for regular Refactor the generation of the next shift for regular worker. Fix: no next shifts shown when the worker is a new worker and doesn't have any past shift Fix: no next shifts shown when the next shift of the worker is not generated yet. --- beesdoo_website_shift/controllers/main.py | 151 +++++------------- .../views/my_shift_website_templates.xml | 32 ++-- 2 files changed, 56 insertions(+), 127 deletions(-) diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py index a18a609..a3e6e5b 100644 --- a/beesdoo_website_shift/controllers/main.py +++ b/beesdoo_website_shift/controllers/main.py @@ -265,42 +265,56 @@ class WebsiteShiftController(http.Controller): ('worker_id', '=', cur_user.partner_id.id)], order="start_time, task_template_id, task_type_id", ) - # We don't use record to show the next shift as we need to add - # fictive one for regular worker. I say 'fictive' one because - # the next shifts for the regular worker are generated on a - # PERIOD basis and database doesn't contain more than a PERIOD - # of shift. So a regular worker will always see only one - # next shift, the one that is generated and stored in the - # database. Meaning that if we want to show the next shifts - # for an entire year, we need to compute the dates for the next - # shifts and create it. But we want to keep it 'fictive', - # meaning that we don't want to write them in the database. - # So here we convert recordset into Shift object. + # Create a list of record in order to add new record to it later subscribed_shifts = [] - for shift_rec in subscribed_shifts_rec: - shift = Shift(shift_rec) - subscribed_shifts.append(shift) - # We want to keep a copy of the shift that will serve as a - # master to create the fictive shifts. - if shift_rec.worker_id in shift_rec.task_template_id.worker_ids: - main_shift = shift - main_shift_rec = shift_rec + for rec in subscribed_shifts_rec: + subscribed_shifts.append(rec) # In case of regular worker, we compute his fictive next shifts # according to the regular_next_shift_limit - if self.is_user_regular() and subscribed_shifts and main_shift: + if self.is_user_regular(): + # Compute main shift + nb_subscribed_shifts = len(subscribed_shifts) + if nb_subscribed_shifts > 0: + main_shift = subscribed_shifts[-1] + else: + task_template = request.env['beesdoo.shift.template'].sudo().search( + [('worker_ids', 'in', cur_user.partner_id.id)], + limit=1, + ) + main_shift = request.env['beesdoo.shift.shift'].sudo().search( + [('task_template_id', '=', task_template[0].id)], + order="start_time desc", + limit=1, + ) + # Get config regular_next_shift_limit = int(request.env['ir.config_parameter'].get_param( 'beesdoo_website_shift.regular_next_shift_limit')) - for i in range(1, regular_next_shift_limit): + + for i in range(nb_subscribed_shifts, regular_next_shift_limit): # Compute the new date for the created shift - start_time = fields.Datetime.from_string(main_shift_rec.start_time) + start_time = fields.Datetime.from_string(main_shift.start_time) start_time = (start_time + timedelta(days=i*PERIOD)).strftime(DATETIME_FORMAT) + end_time = fields.Datetime.from_string(main_shift.end_time) + end_time = (end_time + timedelta(days=i*PERIOD)).strftime(DATETIME_FORMAT) # Create the fictive shift - shift = copy(main_shift) - shift.id = -i # We give negative id 'caus this shift doesn't exist in database - shift.start_day = start_time - shift.start_date = start_time + shift = main_shift.new() + shift.name = main_shift.name + shift.task_template_id = shift.task_template_id + shift.planning_id = main_shift.planning_id + shift.task_type_id = main_shift.task_type_id + shift.worker_id = main_shift.worker_id + shift.stage_id = main_shift.stage_id + shift.super_coop_id = main_shift.super_coop_id + shift.color = main_shift.color + shift.is_regular = main_shift.is_regular + shift.replaced_id = main_shift.replaced_id + shift.revert_info = main_shift.revert_info + # Set new date + shift.start_time = start_time + shift.end_time = end_time + # Add the fictive shift to the list of shift subscribed_shifts.append(shift) return { @@ -350,88 +364,3 @@ class WebsiteShiftController(http.Controller): return { 'status': cur_user.partner_id.cooperative_status_ids, } - - -class Shift(object): - """ - Represent a shift with all useful information in a format that is directly printable in a template - """ - - def __init__(self, shift_rec=None): - self.id = 0 - self._start_day = '' - self._start_date = '' - self._start_time = '' - self._end_time = '' - self.task_type_name = '' - self.super_coop_name = '' - self.super_coop_phone = '' - self.super_coop_email = '' - if shift_rec: - self.update(shift_rec) - - def update(self, shift_rec=None): - """ Fill in self with data in the given record""" - if shift_rec: - self.id = shift_rec.id - self.start_day = shift_rec.start_time - self.start_date = shift_rec.start_time - self.start_time = shift_rec.start_time - self.end_time = shift_rec.end_time - if shift_rec.task_type_id: - self.task_type_name = shift_rec.task_type_id.name - if shift_rec.super_coop_id: - self.super_coop_name = shift_rec.super_coop_id.name - self.super_coop_phone = shift_rec.super_coop_id.phone - self.super_coop_email = shift_rec.super_coop_id.email - - # Properties - @property - def start_day(self): - return self._start_day - - @property - def start_date(self): - return self._start_date - - @property - def start_time(self): - return self._start_time - - @property - def end_time(self): - return self._end_time - - # Setters - @start_day.setter - def start_day(self, datetime_str): - self._start_day = datetime.strptime(datetime_str, DATETIME_FORMAT).strftime('%A') - - @start_date.setter - def start_date(self, datetime_str): - self._start_date = datetime.strptime(datetime_str, DATETIME_FORMAT).strftime('%d %B %Y') - - @start_time.setter - def start_time(self, datetime_str): - self._start_time = datetime.strptime(datetime_str, DATETIME_FORMAT).strftime('%H:%M') - - @end_time.setter - def end_time(self, datetime_str): - self._end_time = datetime.strptime(datetime_str, DATETIME_FORMAT).strftime('%H:%M') - - # Deleters - @start_day.deleter - def start_day(self): - del self._start_day - - @start_date.deleter - def start_date(self): - del self._start_date - - @start_time.deleter - def start_time(self): - del self._start_time - - @end_time.deleter - def end_time(self): - del self._end_time diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml index d520122..d05f6b6 100644 --- a/beesdoo_website_shift/views/my_shift_website_templates.xml +++ b/beesdoo_website_shift/views/my_shift_website_templates.xml @@ -135,15 +135,15 @@
- - - - + + - +
- +

- +

-
+
- - + +
From 67cbfce2afadf5ed792f891a705e88e142f6f3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Wed, 31 Jan 2018 17:22:50 +0100 Subject: [PATCH 02/11] [ADD] website_shift: Help texts --- .../views/my_shift_website_templates.xml | 112 +++++++++++++++++- 1 file changed, 111 insertions(+), 1 deletion(-) diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml index d05f6b6..2c578b3 100644 --- a/beesdoo_website_shift/views/my_shift_website_templates.xml +++ b/beesdoo_website_shift/views/my_shift_website_templates.xml @@ -458,6 +458,102 @@ + + + + + + + + + @@ -504,25 +503,31 @@ name="Help Text for Regular Worker">

Alert: - You did not perform your last shift. You should do one or two compensatory shift depending on your situation. To - know how many compensatory shift you should do, please contact your super-cooperator. You don't have to sign up to - a shift in order to do your compensatory shift. Simply choose a shift that that suits you. You can shop. + If you are in alert status, that means you didn't do your last shift. You have + until your next scheduled shift to do your compensation shift according to your situation. + Your compensation is either simple or double. If you don't how how many compensation shifts you have to do, please contact your supercooperator. + To do your compensation shift, no need to subscribe in advance : you come at the beginning of the shift that best suits you. + Add your name and the indication "compensation shift" on the attendance list. + No panic, you still can come and shop, so can your eaters if you have any.

Suspended: - You did not perform your last shift and you did not perform your compensatory shifts. You can not shop anymore. - But don't panic, contact us at the store and you will receive an extension of two weeks to do your compensatory - shift. To do you compensatory shifts, simply sign up to a shift as before you where in Alert. + If you are suspended, that means you didn't come to a shift and you didn't do you compensation shifts in the delay (4 weeks). + You cannot shop (so as your eaters). But no need to panic : a two-weeks delay is activable on demand at the entrance of the supermarket. + You will be able to shop during 2 more weeks and to put your situation in order. + To do your compensation shift, no need to subscribe in advance : you come at the beginning of the shift that best suits you. + Add your name and the indication "compensation shift" on the attendance list.

- Extension: - You did not perform your last shift and you did not perform your compensation shifts. You can shop. You have - days to do your shifts otherwise you will be Suspended. + Auto-Extension: + You didn't manage to do your compensation shifts in the delay but you benefit from the auto-extension. + This is two more weeks to do your compensation shifts. You can shop. + If you don't do your compensation shifts, you'll be suspended.

Unsubscribed: - You did not perform your last two shifts. You are unsubscribed from the shift system. You can not shop anymore, - neither work at the store. If you want to subscribe again, please contact us. + You did not attend two consecutive shifts. You are now unsubscribed. You cannot shop (nor can your eaters) nor come to work. + To subscribe again, please contact membre@bees-coop.be or come to the members office during the opening hours.

@@ -531,26 +536,31 @@ name="Help Text for Irregular Worker">

Alert: - You did not perform enough shifts in advance. Your shift counter is negative (-2). You should perform two shifts - during the next four weeks in order to be Up To Date. To do you compensatory shifts, simply sign up to a shift as - before you where in Alert. You can still shop. + If you are in alert status, that means you didn't anticipate enough shifts. + Your counter is now negative, directly to -2. + You have 4 weeks to do 2 shifts to be up to date. + For the compensation shifts, subscribe like you do for a normal shift. + Be careful, in addition to these 2 shifts, don't forget to do your normal shift in the same delay to prevent to be in the same situation next month.

Suspended: - You did not perform enough shifts in advance and you did not perform your compensatory shifts. You can not shop - anymore. But don't panic, contact us at the store and you will receive an extension of two weeks to do your - compensatory shift. To do you compensatory shifts, simply sign up to a shift as before you where in Alert. + You did not anticipate enough shifts and you did not come back to a normal situation in the delay. + You cannot shop anymore, nor can your eaters. + But no need to panic : a two-weeks delay is activable on demand at the entrance of the supermarket. + You will be able to shop during 2 more weeks and to put your situation in order. + For the compensation shifts, subscribe like you do for a normal shift.

- Extension: - You did not perform enough shifts in advance and you did not perform your compensatory shifts. You can shop. You - have days to do your shifts otherwise you will be Suspended. + Auto-Extension: + You didn't manage to do your compensation shifts in the delay but you benefit from the auto-extension. + This is two more weeks to do your compensation shifts. You can shop. + If you don't do your compensation shifts, you'll be suspended.

Unsubscribed: - It's been more than height weeks since you last worked at the store or you have missed 2 consecutive shifts. You - are unsubscribed from the shift system. You can not shop anymore, neither work at the store. If you want to - subscribe again, please contact us. + Your counter is negative and you haven't come to work for more than 8 weeks. + You are unsubscribed. You cannot shop nor can your eaters. + To subscribe again of if it's a mistake, please contact membre@bees-coop.be or come to the members office during the opening hours.

From 992ebb9b333b8302aa6ab597b068ef3a1ba64675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Tue, 27 Mar 2018 13:23:52 +0200 Subject: [PATCH 04/11] [IMP] website_shift: Help texts translation Add translation for the help texts. --- beesdoo_website_shift/i18n/fr_BE.po | 615 +++++++++++++++++++++++++--- 1 file changed, 554 insertions(+), 61 deletions(-) diff --git a/beesdoo_website_shift/i18n/fr_BE.po b/beesdoo_website_shift/i18n/fr_BE.po index 2d4e825..40d9922 100644 --- a/beesdoo_website_shift/i18n/fr_BE.po +++ b/beesdoo_website_shift/i18n/fr_BE.po @@ -2,8 +2,6 @@ # This file contains the translation of the following modules: # * beesdoo_portal_shift # -# Tanslators: -# Rémy Taymans , 2017 msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" @@ -19,104 +17,599 @@ msgstr "" "Language: fr_BE\n" "X-Generator: Poedit 1.8.11\n" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template -msgid "Available Tasks Templates for Regular Workers" -msgstr "Créneaux disponibles pour les travailleurs réguliers" +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +msgid "\n" +" Subscribed" +msgstr "\n" +" Inscrit" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +msgid "\n" +" Subscribed" +msgstr "\n" +" Inscrit" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +msgid "\n" +" Super Cooperator Info" +msgstr "\n" +" Info Supercoopérateur" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +msgid "\n" +" Subscribe" +msgstr "\n" +" Inscription" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +msgid "\n" +" Subscribe" +msgstr "\n" +" Inscription" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template +msgid "NSC : This flag tells you that the shift needs a Super Co-operator" +msgstr "NSC : Ceci vous informe que le créneau n'a pas encore de supercoopérateur." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_irregular_worker +msgid "Alert:\n" +" If you are in alert status, that means you didn't anticipate enough shifts.\n" +" Your counter is now negative, directly to -2.\n" +" You have 4 weeks to do 2 shifts to be up to date.\n" +" For the compensation shifts, subscribe like you do for a normal shift.\n" +" Be careful, in addition to these 2 shifts, don't forget to do your normal shift in the same delay to prevent to be in the same situation next month." +msgstr "Alerte :\n" +"Si vous êtes en alerte, c'est que vous n'avez pas anticipé assez de shifts. Votre compteur est donc passé en négatif, directement à -2. Vous avez donc 4 semaines pour effectuer deux shifts pour vous remettre à jour. Pour les shifts de rattrapage, inscrivez-vous comme pour tout shift normal. Attention, en plus de ces deux shifts de retard, n’oubliez pas de faire votre shift normal dans les mêmes délais, pour éviter d’avoir le même problème le mois prochain." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_regular_worker +msgid "Alert:\n" +" If you are in alert status, that means you didn't do your last shift. You have\n" +" until your next scheduled shift to do your compensation shift according to your situation.\n" +" Your compensation is either simple or double. If you don't how how many compensation shifts you have to do, please contact your supercooperator.\n" +" To do your compensation shift, no need to subscribe in advance : you come at the beginning of the shift that best suits you.\n" +" Add your name and the indication \"compensation shift\" on the attendance list.\n" +" No panic, you still can come and shop, so can your eaters if you have any." +msgstr "Alerte : \n" +"Si vous êtes en alerte c'est que vous n'avez pas effectué votre dernier shift. Vous avez donc jusqu'à votre prochain shift de prévu pour faire votre compensation suivant la situation. Celle-ci sera simple ou double. Si vous ne savez pas si vous avez une simple ou une double compensation, contactez votre supercoopérateur. Pour les shifts de compensation, pas besoin d'inscription : vous vous présentez au début d'un shift au créneau qui vous convient le mieux. Ajoutez sur la feuille de présence votre nom/prénom + “shift de compensation”.\n" +"Mais pas de panique, vous pouvez toujours venir faire vos courses (ainsi que vos mangeurs le cas échéant)." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_regular_worker +msgid "Auto-Extension:\n" +" You didn't manage to do your compensation shifts in the delay but you benefit from the auto-extension.\n" +" This is two more weeks to do your compensation shifts. You can shop.\n" +" If you don't do your compensation shifts, you'll be suspended." +msgstr "Délai de grâce :\n" +"Vous n'êtes pas parvenu à effectuer vos compensations dans les délais mais vous bénéficiez d’un délai de grâce. Il s’agit de deux semaines supplémentaires pour effectuer vos compensations tout en continuant de pouvoir faire vos courses. Si vous ne les effectuez pas, vous serez suspendu·e." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_past_shifts +msgid "Info ! You don't have any past shift." +msgstr "Info ! Vous n'avez pas de shift passé." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_common +msgid "Info! If you do not agree with your status, please contact the members office by mail (membre@bees-coop.be) or during the open hours of the office (Monday 5PM to 7:30PM, Wednesday 5PM to 7:30 PM and Friday 2:30PM to 5 PM)." +msgstr "Info ! Si vous n’êtes pas d’accord avec votre statut, il peut s’agir d’une erreur de notre part. Contactez alors le bureau des membres par mail (membre@bees-coop.be) ou en personne pendant les heures d'ouverture du bureau : le lundi de 17h00 à 19h30, le mercredi de 17h à 19h30 et le vendredi de 14h30 à 17h (à l'étage du magasin)." -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_regular_worker +msgid "Suspended:\n" +" If you are suspended, that means you didn't come to a shift and you didn't do you compensation shifts in the delay (4 weeks).\n" +" You cannot shop (so as your eaters). But no need to panic : a two-weeks delay is activable on demand at the entrance of the supermarket.\n" +" You will be able to shop during 2 more weeks and to put your situation in order.\n" +" To do your compensation shift, no need to subscribe in advance : you come at the beginning of the shift that best suits you.\n" +" Add your name and the indication \"compensation shift\" on the attendance list." +msgstr "Suspendu·e :\n" +"Si vous êtes suspendu·e, c’est que vous avez raté un shift et vous n'avez pas effectué votre/vos shifts de compensation dans les délais prévus (4 semaines). Vous ne pouvez plus faire vos courses (tout comme vos mangeurs). Mais pas de panique : un délai de grâce de 2 semaines est activable sur simple demande à l’accueil du magasin. Celui-ci vous octroie 2 semaines supplémentaires pour faire vos course et vous remettre en ordre. Si vous ne savez pas si vous avez une simple ou une double compensation, contactez votre supercoopérateur. Pour les shifts de compensation, pas besoin d'inscription : vous vous présentez au début d'un shift au créneau qui vous convient le mieux. Ajoutez sur la feuille de présence votre nom/prénom + “shift de compensation”." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_irregular_worker +msgid "Suspended:\n" +" You did not anticipate enough shifts and you did not come back to a normal situation in the delay.\n" +" You cannot shop anymore, nor can your eaters.\n" +" But no need to panic : a two-weeks delay is activable on demand at the entrance of the supermarket.\n" +" You will be able to shop during 2 more weeks and to put your situation in order.\n" +" For the compensation shifts, subscribe like you do for a normal shift." +msgstr "Suspendu·e:\n" +"Vous n'avez pas anticipé suffisamment de shifts et n’avez pas rattrapé votre retard dans les délais prévus. Vous ne pouvez plus faire vos courses (tout comme vos mangeurs). Mais pas de panique, nous pouvons vous proposer un délai de grâce de 2 semaines pour effectuer vos shifts de rattrapage. Vous pouvez le demander à l'accueil du magasin. Cela vous permettra de garder le droit de faire vos courses dans ce délai. Pour les shifts de rattrapage, inscrivez-vous comme pour tout shift normal." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_regular_worker +msgid "Unsubscribed:\n" +" You did not attend two consecutive shifts. You are now unsubscribed. You cannot shop (nor can your eaters) nor come to work.\n" +" To subscribe again, please contact membre@bees-coop.be or come to the members office during the opening hours." +msgstr "Désinscrit·e :\n" +"Vous avez raté deux shifts consécutifs. Vous êtes donc désinscrit·e. Vous ne pouvez plus venir faire vos courses (tout comme vos mangeurs), ni venir travailler. Pour vous réinscrire, contactez membre@bees-coop.be ou passez au bureau des membres pendant les heures d'ouverture." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_irregular_worker +msgid "Unsubscribed:\n" +" Your counter is negative and you haven't come to work for more than 8 weeks.\n" +" You are unsubscribed. You cannot shop nor can your eaters.\n" +" To subscribe again of if it's a mistake, please contact membre@bees-coop.be or come to the members office during the opening hours." +msgstr "Désinscrit·e :\n" +"Vous êtes en négatif sur votre compteur et vous n'êtes pas venu travailler depuis plus de 8 semaines.\n" +"Vous êtes donc désinscrit·e. Vous ne pouvez plus venir faire vos courses (tout comme vos mangeurs). Pour vous réinscrire ou si c'est une erreur de notre part, contactez membre@bees-coop.be ou passez au bureau des membres pendant les heures d'ouverture." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_common +msgid "Up To Date:\n" +" That's perfect! You are in order. Thanks a lot. You can come and shop, so can your eaters if you have any." +msgstr "A jour :\n" +"C'est parfait! Vous êtes en ordre de travail. Merci beaucoup. Vous pouvez venir faire vos courses (ainsi que vos mangeurs le cas échéant)." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +msgid "Warning ! For the moment public holidays are not taken into account. If your shift\n" +" occures during a public holiday, you do not have to do it." +msgstr "Attention ! Pour le moment, les congés publics ne sont pas pris en compte. Si votre shift tombe durant un congé public, vous ne devez pas le faire." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +msgid "Warning ! You have not yet signed up to a shift." +msgstr "Attention ! Vous n'êtes inscrit à aucun shift." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.view_website_shift_config_irregular +#: model:ir.ui.view,arch_db:beesdoo_website_shift.view_website_shift_config_regular +msgid "Apply" +msgstr "Appliquer" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +msgid "Are you shure you want to subscribe to this shift?" +msgstr "Etes-vous sûr de vouloir vous inscrire à ce shift ?" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_irregular_worker +msgid "Available Shifts" +msgstr "Shifts disponibles" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_irregular_worker msgid "Available Shifts for Irregular Workers" msgstr "Shifts disponibles pour les travailleurs volants" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template +msgid "Available Spaces" +msgstr " Places disponibles" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template +msgid "Available Tasks Templates for Regular Workers" +msgstr "Créneaux disponibles pour les travailleurs réguliers" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_worker_status_common +msgid "Begin of Holiday:" +msgstr "Begin of Holiday:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.view_website_shift_config_irregular +#: model:ir.ui.view,arch_db:beesdoo_website_shift.view_website_shift_config_regular +msgid "Cancel" +msgstr "Annuler" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +msgid "Close" +msgstr "Fermer" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_regular_worker +msgid "Compensation Shift:" +msgstr "Compensation Shift:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.view_website_shift_config_irregular +msgid "Configure Website Shift Irregular Worker" +msgstr "Configure Website Shift Irregular Worker" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.view_website_shift_config_regular +msgid "Configure Website Shift Regular Worker" +msgstr "Configure Website Shift Regular Worker" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_create_uid +msgid "Created by" +msgstr "Créé par" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_create_date +msgid "Created on" +msgstr "Créé le" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_past_shifts msgid "Date" msgstr "Date" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_past_shifts +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template msgid "Day" msgstr "Jour" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template -msgid "Available Spaces" -msgstr "Places disponibles" +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_display_name +msgid "Display Name" +msgstr "Nom affiché" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template -msgid "Subscribe via the member office or via" -msgstr "Inscription au bureau des membres ou via" +#. module: beesdoo_website_shift +#: model:ir.model.fields,help:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_irregular_enable_sign_up +msgid "Enable shift sign up for irregular worker" +msgstr "Autoriser l'inscription pour les volants" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template -msgid "Subscribe via" -msgstr "Inscription via" +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_worker_status_common +msgid "End of Holiday:" +msgstr "End of Holiday:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_exempted_worker +msgid "Exempt Reason:" +msgstr "Exempt Reason:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_common +msgid "Explanation of the status:" +msgstr "Explication des statuts" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_irregular_worker +msgid "Future Date of Alert:" +msgstr "Future Date of Alert:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.help_text_title +msgid "Help" +msgstr "Aide" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_hide_rule +msgid "Hide rule" +msgstr "Hide rule" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_highlight_rule +msgid "Highlight rule" +msgstr "Highlight rule" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_id +msgid "ID" +msgstr "ID" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_regular_worker +msgid "In Alert Since:" +msgstr "In Alert Since:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_regular_worker +msgid "In Extension Since:" +msgstr "In Extension Since:" + +#. module: beesdoo_website_shift +#: model:ir.ui.menu,name:beesdoo_website_shift.menu_website_shift_irregular +msgid "Irregular Shift" +msgstr "Shift irrégulier" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_irregular_enable_sign_up +msgid "Irregular enable sign up" +msgstr "Irregular enable sign up" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_irregular_past_shift_limit +msgid "Irregular past shift limit" +msgstr "Irregular past shift limit" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_irregular_shift_limit +msgid "Irregular shift limit" +msgstr "Irregular shift limit" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_irregular_worker +msgid "Last Absence Date:" +msgstr "Last Absence Date:" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings___last_update +msgid "Last Modified on" +msgstr "Dernière modification le" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_write_uid +msgid "Last Updated by" +msgstr "Mis à jour par" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_write_date +msgid "Last Updated on" +msgstr "Mis à jour le" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,help:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_irregular_past_shift_limit +msgid "Maximum past shift that will be shown for irregular worker" +msgstr "Nombre maximal de shifts à afficher pour les volants" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,help:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_regular_past_shift_limit +msgid "Maximum past shift that will be shown for regular worker" +msgstr " Nombre maximal de shifts à afficher pour les réguliers " + +#. module: beesdoo_website_shift +#: model:ir.model.fields,help:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_irregular_shift_limit +msgid "Maximum shift that will be shown" +msgstr "Nombre maximum de shifts à montrer" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,help:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_regular_next_shift_limit +msgid "Maximun number of next shift that will be shown" +msgstr "Nombre maximum de prochains shifts à montrer" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_link +msgid "My Shift" +msgstr "My Shift" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template +msgid "NSC" +msgstr "NSC" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +msgid "Need Super Co-operator" +msgstr "Need Super Co-operator" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template msgid "Not yet" msgstr "Pas encore" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_irregular_worker +msgid "Number of Absence:" +msgstr "Number of Absence:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_irregular_worker +msgid "Please, subscribe, in priority, to the highlighted shifts. To sign up to a shift click on the\n" +" subscribe button. Notice that you can not unsubscribe online. To unsubscribe to a shift, please,\n" +" contact us." +msgstr "Please, subscribe, in priority, to the highlighted shifts. To sign up to a shift click on the\n" +" subscribe button. Notice that you can not unsubscribe online. To unsubscribe to a shift, please,\n" +" contact us." + +#. module: beesdoo_website_shift +#: model:ir.ui.menu,name:beesdoo_website_shift.menu_website_shift_regular +msgid "Regular Shift" +msgstr "Shift régulier" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_regular_next_shift_limit +msgid "Regular next shift limit" +msgstr "Regular next shift limit" + +#. module: beesdoo_website_shift +#: model:ir.model.fields,field_description:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_regular_past_shift_limit +msgid "Regular past shift limit" +msgstr "Regular past shift limit" + +#. module: beesdoo_website_shift +#: model:ir.ui.menu,name:beesdoo_website_shift.menu_website_shift_root msgid "Shift" msgstr "Shift" -#. module: beesdoo_portal_shift -#: model:website.menu,name:beesdoo_portal_shift.menu_work_irregular +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_regular_worker +msgid "Shift in Advance:" +msgstr "Shift in Advance:" + +#. module: beesdoo_website_shift +#: model:website.menu,name:beesdoo_website_shift.menu_work_irregular msgid "Shifts Irregular" -msgstr "Shifts" +msgstr "Shifts volants" -#. module: beesdoo_portal_shift -#: model:website.menu,name:beesdoo_portal_shift.menu_work_regular +#. module: beesdoo_website_shift +#: model:website.menu,name:beesdoo_website_shift.menu_work_regular msgid "Shifts Regular" -msgstr "Créneaux" +msgstr "Créneaux réguliers" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_past_shifts +msgid "Status" +msgstr "Statut" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template -msgid "Super Cooperator" -msgstr "Super-coopérateur" +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_worker_status_common +msgid "Status:" +msgstr "Status:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +msgid "Subscribe" +msgstr "S'inscrire" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_irregular_worker +msgid "Subscribe via" +msgstr "Nous avons spécialement besoin d'aide pour les shifts  pour lesquels il y a au moins 3 places disponibles. Inscriptions via" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template +msgid "Subscribe via the member office or via" +msgstr "Si vous ne trouvez pas de créneau qui vous convienne, prenez contact avec le bureau des membres ou via" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +msgid "Subscribed" +msgstr "Subscribed" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template +msgid "Super Co-operator" +msgstr "Super coopérateur" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +msgid "Super Cooperator Info" +msgstr "Super Cooperator Info" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template msgid "Task Template" -msgstr "Créneau" +msgstr " Créneau" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_past_shifts +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template msgid "Time" msgstr "Heures" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template +#. module: beesdoo_website_shift +#: model:ir.model.fields,help:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_hide_rule +msgid "Treshold ((available space)/(max space)) in percentage of available space under wich the shift is hidden" +msgstr "Seuil ((places dispos)/(max places)) en pourcentage de places disponibles en-dessous duquel les shifts seront cachés." + +#. module: beesdoo_website_shift +#: model:ir.model.fields,help:beesdoo_website_shift.field_beesdoo_website_shift_config_settings_highlight_rule +msgid "Treshold of available space in a shift that trigger the highlight of the shift" +msgstr "Seuil de places disponibles dans un créneau qui déclenche la mise en avant d'un shift." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_past_shifts msgid "Type of Shift" -msgstr "Type de shift" +msgstr " Type de shift" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template msgid "Type of Task" -msgstr "Type de créneau" +msgstr " Type de créneau" + +#. module: beesdoo_website_shift +#: model:ir.actions.act_window,name:beesdoo_website_shift.action_website_shift_config_irregular +msgid "Website Shift Settings Irregular Worker" +msgstr "Website Shift Settings Irregular Worker" + +#. module: beesdoo_website_shift +#: model:ir.actions.act_window,name:beesdoo_website_shift.action_website_shift_config_regular +msgid "Website Shift Settings Regular Worker" +msgstr "Website Shift Settings Regular Worker" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template msgid "Week" msgstr "Semaine" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_worker_status_title +msgid "Worker status" +msgstr "Worker status" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_worker_status_common +msgid "Working Mode:" +msgstr "Working Mode:" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template msgid "Yes" msgstr "Oui" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.task_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_worker_status_common +msgid "You are a Super Cooperator" +msgstr "You are a Super Cooperator" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_exempted_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_non_worker +msgid "You don't have to participate to shift system." +msgstr "You don't have to participate to shift system." + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_next_shifts +msgid "Your next shifts" +msgstr "Your next shifts" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_past_shifts +msgid "Your past shifts" +msgstr "Your past shifts" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.my_shift_title +msgid "Your shifts" +msgstr "Your shifts" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +msgid "available space(s)" +msgstr "available space(s)" + +#. module: beesdoo_website_shift +#: model:ir.model,name:beesdoo_website_shift.model_beesdoo_website_shift_config_settings +msgid "beesdoo.website.shift.config.settings" +msgstr "beesdoo.website.shift.config.settings" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template +msgid "full" +msgstr "full" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template msgid "membre@bees-coop.be" -msgstr "membre@bees-coop.be" +msgstr "membre@bees-coop.be
" + +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.available_shift_irregular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_template_regular_worker +#: model:ir.ui.view,arch_db:beesdoo_website_shift.task_template +msgid "space(s)" +msgstr "space(s)" -#. module: beesdoo_portal_shift -#: model:ir.ui.view,arch_db:beesdoo_portal_shift.shift_template +#. module: beesdoo_website_shift +#: model:ir.ui.view,arch_db:beesdoo_website_shift.public_shift_irregular_worker msgid "volant@bees-coop.be" -msgstr "volant@bees-coop.be" +msgstr "membre@bees-coop.be" + From 63440c5375f1654e2029ccaeb522c764e65285b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Tue, 27 Mar 2018 14:42:57 +0200 Subject: [PATCH 05/11] [IMP] website_shift: Future alert date The future alert date has moved to beesdoo_shift module. So we use this one instead of re-compute it in the controller. --- beesdoo_website_shift/controllers/main.py | 21 +------------------ .../views/my_shift_website_templates.xml | 8 +++---- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py index a3e6e5b..64e0b87 100644 --- a/beesdoo_website_shift/controllers/main.py +++ b/beesdoo_website_shift/controllers/main.py @@ -5,7 +5,6 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from ast import literal_eval -from copy import copy from datetime import datetime, timedelta from itertools import groupby @@ -14,8 +13,7 @@ from openerp.http import request from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DATETIME_FORMAT from openerp.addons.beesdoo_shift.models.planning import float_to_time - -PERIOD = 28 # TODO: use the same constant as in 'beesdoo_shift' +from openerp.addons.beesdoo_shift.models.cooperative_status import PERIOD class WebsiteShiftController(http.Controller): @@ -126,10 +124,6 @@ class WebsiteShiftController(http.Controller): """ Return template variables for 'beesdoo_website_shift.my_shift_irregular_worker' template """ - # Get current user - cur_user = request.env['res.users'].browse(request.uid) - cur_cooperative_status = cur_user.partner_id.cooperative_status_ids - # Get config irregular_enable_sign_up = literal_eval(request.env['ir.config_parameter'].get_param( 'beesdoo_website_shift.irregular_enable_sign_up')) @@ -144,19 +138,6 @@ class WebsiteShiftController(http.Controller): irregular_enable_sign_up, nexturl )) - future_alert_date = False - if not cur_cooperative_status.alert_start_time: - # Compute date before which the worker is up to date - today_date = fields.Date.from_string(cur_cooperative_status.today) - delta = (today_date - fields.Date.from_string(cur_cooperative_status.irregular_start_date)).days - future_alert_date = today_date + timedelta(days=(cur_cooperative_status.sr + 1) * PERIOD - delta % PERIOD) - future_alert_date = future_alert_date.strftime('%Y-%m-%d') - - template_context.update( - { - 'future_alert_date': future_alert_date, - } - ) return template_context def my_shift_regular_worker(self): diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml index dceac9c..1101a60 100644 --- a/beesdoo_website_shift/views/my_shift_website_templates.xml +++ b/beesdoo_website_shift/views/my_shift_website_templates.xml @@ -602,7 +602,7 @@
-
+
@@ -730,9 +730,9 @@

-

+

- +

@@ -776,7 +776,7 @@

-
+

Please, subscribe, in priority, to the highlighted shifts. To sign up to a shift click on the subscribe button. Notice that you can not unsubscribe online. To unsubscribe to a shift, please, From 6750264f08c9969e87a7b407c48069d1feb95c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Wed, 28 Mar 2018 16:13:24 +0200 Subject: [PATCH 06/11] [IMP] website_shift: Update manifest --- beesdoo_website_shift/__openerp__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/beesdoo_website_shift/__openerp__.py b/beesdoo_website_shift/__openerp__.py index b07357f..b1a3d09 100644 --- a/beesdoo_website_shift/__openerp__.py +++ b/beesdoo_website_shift/__openerp__.py @@ -4,18 +4,19 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'BEES coop Shift Website', + 'name': 'BEES coop Website Shift', 'summary': """ - Show available shifts for regular and irregular workers in - portal. + Show available shifts for regular and irregular workers on the + website and let workers manage their shifts with an + easy web interface. """, 'description': """ """, 'author': 'Rémy Taymans', 'license': 'AGPL-3', - 'version': '9.0.1.0', + 'version': '9.0.2.0', 'website': "https://github.com/beescoop/Obeesdoo", 'category': 'Cooperative management', From 5dcbaebf597830c53c8214e6d86d687c3b98c17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Thu, 29 Mar 2018 11:55:47 +0200 Subject: [PATCH 07/11] [FIX] website_shift: Better position for help text On a small screen help texts appear on the top of the page leaving useful info on the bottom. Now help texts is moved on the bottom of the page. --- .../views/my_shift_website_templates.xml | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml index 1101a60..6bf0fa0 100644 --- a/beesdoo_website_shift/views/my_shift_website_templates.xml +++ b/beesdoo_website_shift/views/my_shift_website_templates.xml @@ -655,7 +655,7 @@

-
+
@@ -683,12 +683,6 @@
- - - - -
-
@@ -698,6 +692,18 @@
+ +
+ +
+ + + + + +
+ +
@@ -719,7 +725,7 @@
-
+
@@ -747,12 +753,6 @@
- - - - -
-
@@ -793,6 +793,18 @@
+ +
+ +
+ + + + + +
+ +
From 3de8f78cf11c5fc1fff9cb84f36c926a6c437afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Thu, 29 Mar 2018 11:58:47 +0200 Subject: [PATCH 08/11] [ADD] website_shift: Feedback when subscribing Add a feedback to the user about the successfulness of the subscription. --- beesdoo_website_shift/controllers/main.py | 9 +++++++++ .../views/my_shift_website_templates.xml | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py index 64e0b87..0a5d8a7 100644 --- a/beesdoo_website_shift/controllers/main.py +++ b/beesdoo_website_shift/controllers/main.py @@ -77,11 +77,13 @@ class WebsiteShiftController(http.Controller): irregular_enable_sign_up = literal_eval(request.env['ir.config_parameter'].get_param( 'beesdoo_website_shift.irregular_enable_sign_up')) + request.session['success'] = False if (irregular_enable_sign_up and cur_user.partner_id.working_mode == 'irregular' and shift and not shift.worker_id): shift.worker_id = cur_user.partner_id + request.session['success'] = True return request.redirect(kw['nexturl']) @http.route('/shift_irregular_worker', auth='public', website=True) @@ -138,6 +140,13 @@ class WebsiteShiftController(http.Controller): irregular_enable_sign_up, nexturl )) + # Add feedback about the success or the fail of the subscription + template_context['back_from_subscription'] = False + if 'success' in request.session: + template_context['back_from_subscription'] = True + template_context['success'] = request.session.get('success') + del request.session['success'] + return template_context def my_shift_regular_worker(self): diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml index 6bf0fa0..caa9ab0 100644 --- a/beesdoo_website_shift/views/my_shift_website_templates.xml +++ b/beesdoo_website_shift/views/my_shift_website_templates.xml @@ -757,6 +757,22 @@
+
+ + + Success! Your subscription has succeded. + + + Failed! Your subscription has failed. Someone + subscribed before you or the shift was deleted. Try again in a + moment. + +
+
From 688256726bf30d9164ffaa8de0a62bbe1f51f862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Thu, 29 Mar 2018 13:37:55 +0200 Subject: [PATCH 09/11] [FIX] website_shift: Super-cooperator info modal The modal showing the super-cooperator information didn't work for the 'fictive' shift generated for regular workers. It's due to the fact that a 'fictive' shift doesn't have an id. So we should not use it to generate xml ids. Instead we use the index of the foreach loop. --- .../views/my_shift_website_templates.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml index caa9ab0..fdb7eb1 100644 --- a/beesdoo_website_shift/views/my_shift_website_templates.xml +++ b/beesdoo_website_shift/views/my_shift_website_templates.xml @@ -145,7 +145,7 @@ @@ -183,7 +183,7 @@ @@ -194,15 +194,15 @@ -