From 17cc3dd90665d279217980fa8b25b6cba1d0fe78 Mon Sep 17 00:00:00 2001 From: eloyoussef Date: Tue, 27 Feb 2018 17:27:15 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20du=20fonction=20d'activation=20de=20que?= =?UTF-8?q?ue=20via=20un=20assistant=20et=20confirmation=20de=20traitement?= =?UTF-8?q?=20automatis=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- golem_activity_queue/__manifest__.py | 3 +- golem_activity_queue/models/golem_activity.py | 13 ++++- golem_activity_queue/models/golem_member.py | 2 - .../views/golem_activity_views.xml | 3 +- golem_activity_queue/wizard/__init__.py | 1 + ...golem_activity_automated_queue_activate.py | 53 +++++++++++++++++++ ...ctivity_automated_queue_activate_views.xml | 49 +++++++++++++++++ 7 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 golem_activity_queue/wizard/golem_activity_automated_queue_activate.py create mode 100644 golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml diff --git a/golem_activity_queue/__manifest__.py b/golem_activity_queue/__manifest__.py index 5505045..45822e7 100644 --- a/golem_activity_queue/__manifest__.py +++ b/golem_activity_queue/__manifest__.py @@ -30,6 +30,7 @@ 'views/golem_activity_queue_views.xml', 'views/golem_activity_views.xml', 'views/golem_member_views.xml', - 'wizard/golem_activity_queue_choose_views.xml' + 'wizard/golem_activity_queue_choose_views.xml', + 'wizard/golem_activity_automated_queue_activate_views.xml' ] } diff --git a/golem_activity_queue/models/golem_activity.py b/golem_activity_queue/models/golem_activity.py index f9bce3b..22b7df3 100644 --- a/golem_activity_queue/models/golem_activity.py +++ b/golem_activity_queue/models/golem_activity.py @@ -86,7 +86,18 @@ class GolemActivity(models.Model): activity.automated_registration_from_queue = False else: - activity.queue_allowed = not activity.queue_allowed + #lancer popup pour choisir activité à s'inscrire + self.ensure_one() + activity_id = self[0] + + return { + 'name' : _('Choose the activity to register in'), + 'type' : 'ir.actions.act_window', + 'res_model' : 'golem.activity.automated.queue.activate.wizard', + 'view_mode': 'form', + 'context' : {'default_activity_id' : activity_id.id}, + 'target': 'new', + } diff --git a/golem_activity_queue/models/golem_member.py b/golem_activity_queue/models/golem_member.py index 0362c82..6eb68b3 100644 --- a/golem_activity_queue/models/golem_member.py +++ b/golem_activity_queue/models/golem_member.py @@ -125,8 +125,6 @@ class GolemMember(models.Model): #lancer popup pour choisir activité à s'inscrire @api.multi def choose_queue_to_register(self): - print "_________________________________________________" - print self self.ensure_one() member_id = self[0] diff --git a/golem_activity_queue/views/golem_activity_views.xml b/golem_activity_queue/views/golem_activity_views.xml index 3ec0847..baacfe0 100644 --- a/golem_activity_queue/views/golem_activity_views.xml +++ b/golem_activity_queue/views/golem_activity_views.xml @@ -66,8 +66,7 @@ along with this program. If not, see .