From 0d424b320441913f918c2c9b4d6c2399c5839a80 Mon Sep 17 00:00:00 2001 From: nicolasjamoulle Date: Sat, 16 Mar 2019 10:19:27 +0100 Subject: [PATCH 1/5] [ADD] Default information from worker --- beesdoo_shift/wizard/subscribe.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/beesdoo_shift/wizard/subscribe.py b/beesdoo_shift/wizard/subscribe.py index 8b29935..cd63f82 100644 --- a/beesdoo_shift/wizard/subscribe.py +++ b/beesdoo_shift/wizard/subscribe.py @@ -26,6 +26,24 @@ class Subscribe(models.TransientModel): else: return date + def _get_info_session_date(self): + date = self.env['res.partner'].browse(self._context.get('active_id'))\ + .info_session_date + if not date: + return False + elif not self._get_info_session_followed(): + return False + else: + return date + + def _get_info_session_followed(self): + session_followed = self.env['res.partner']\ + .browse(self._context.get('active_id')).info_session + if not session_followed: + return False + else: + return session_followed + def _get_super(self): return self.env['res.partner'].browse(self._context.get('active_id')).super @@ -34,10 +52,10 @@ class Subscribe(models.TransientModel): def _get_reset_counter_default(self): partner = self.env['res.partner'].browse(self._context.get('active_id')) - return partner.state == 'unsubscribed' and partner.working_mode == 'regular' + return partner.state == 'unsubscribed' and partner.working_mode == 'regular' - info_session = fields.Boolean(string="Followed an information session", default=False) - info_session_date = fields.Date(string="Date of information session") + info_session = fields.Boolean(string="Followed an information session", default=_get_info_session_followed) + info_session_date = fields.Date(string="Date of information session", default=_get_info_session_date) super = fields.Boolean(string="Super Cooperator", default=_get_super) working_mode = fields.Selection( [ From 1790969ab0ef0f20189b6f7364040ba34df86ac5 Mon Sep 17 00:00:00 2001 From: nicolasjamoulle Date: Wed, 20 Mar 2019 15:25:24 +0100 Subject: [PATCH 2/5] [FIX] syntax error break line --- beesdoo_shift/wizard/subscribe.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/beesdoo_shift/wizard/subscribe.py b/beesdoo_shift/wizard/subscribe.py index cd63f82..3b968c7 100644 --- a/beesdoo_shift/wizard/subscribe.py +++ b/beesdoo_shift/wizard/subscribe.py @@ -27,8 +27,8 @@ class Subscribe(models.TransientModel): return date def _get_info_session_date(self): - date = self.env['res.partner'].browse(self._context.get('active_id'))\ - .info_session_date + date = (self.env['res.partner'].browse(self._context.get('active_id')) + .info_session_date) if not date: return False elif not self._get_info_session_followed(): @@ -37,8 +37,9 @@ class Subscribe(models.TransientModel): return date def _get_info_session_followed(self): - session_followed = self.env['res.partner']\ - .browse(self._context.get('active_id')).info_session + session_followed = (self.env['res.partner'] + .browse(self._context.get('active_id')) + .info_session) if not session_followed: return False else: From 9a0cf6357f8623e922222b9d8765d5c98799fdb4 Mon Sep 17 00:00:00 2001 From: nicolasjamoulle Date: Fri, 22 Mar 2019 15:35:24 +0100 Subject: [PATCH 3/5] Dots alignment --- beesdoo_shift/wizard/subscribe.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beesdoo_shift/wizard/subscribe.py b/beesdoo_shift/wizard/subscribe.py index 3b968c7..b2b9757 100644 --- a/beesdoo_shift/wizard/subscribe.py +++ b/beesdoo_shift/wizard/subscribe.py @@ -27,7 +27,8 @@ class Subscribe(models.TransientModel): return date def _get_info_session_date(self): - date = (self.env['res.partner'].browse(self._context.get('active_id')) + date = (self.env['res.partner'] + .browse(self._context.get('active_id')) .info_session_date) if not date: return False From 10e244090bff601407a0332cdfb8574a96ad0f66 Mon Sep 17 00:00:00 2001 From: nicolasjamoulle Date: Sat, 23 Mar 2019 09:45:19 +0100 Subject: [PATCH 4/5] [IMP] _get_info_session_followed made shorter --- beesdoo_shift/wizard/subscribe.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/beesdoo_shift/wizard/subscribe.py b/beesdoo_shift/wizard/subscribe.py index b2b9757..0b444fe 100644 --- a/beesdoo_shift/wizard/subscribe.py +++ b/beesdoo_shift/wizard/subscribe.py @@ -41,10 +41,7 @@ class Subscribe(models.TransientModel): session_followed = (self.env['res.partner'] .browse(self._context.get('active_id')) .info_session) - if not session_followed: - return False - else: - return session_followed + return session_followed def _get_super(self): return self.env['res.partner'].browse(self._context.get('active_id')).super From ee69368c53ad4ff578cd14a43d7595aa8bd45e4f Mon Sep 17 00:00:00 2001 From: nicolasjamoulle Date: Fri, 29 Mar 2019 16:32:59 +0100 Subject: [PATCH 5/5] [ADD] Makup code --- beesdoo_shift/wizard/subscribe.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/beesdoo_shift/wizard/subscribe.py b/beesdoo_shift/wizard/subscribe.py index 0b444fe..b72a13a 100644 --- a/beesdoo_shift/wizard/subscribe.py +++ b/beesdoo_shift/wizard/subscribe.py @@ -30,12 +30,10 @@ class Subscribe(models.TransientModel): date = (self.env['res.partner'] .browse(self._context.get('active_id')) .info_session_date) - if not date: - return False - elif not self._get_info_session_followed(): - return False - else: + if date and self._get_info_session_followed(): return date + else: + return False def _get_info_session_followed(self): session_followed = (self.env['res.partner']