From c4f01dee5e48fd31697719c533b6fd354ab16010 Mon Sep 17 00:00:00 2001
From: eloyoussef <elo.yusuf@gmail.com>
Date: Mon, 26 Feb 2018 15:45:15 +0100
Subject: [PATCH] =?UTF-8?q?enlvemenet=20de=20l'inscription=20en=20attente?=
 =?UTF-8?q?=20depuis=20membre=20sur=202=20=C3=A9tapes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 golem_activity_queue/models/golem_member.py   |  1 +
 .../wizard/golem_activity_queue_choose.py     | 20 ++++---------------
 .../golem_activity_queue_choose_views.xml     |  4 +++-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/golem_activity_queue/models/golem_member.py b/golem_activity_queue/models/golem_member.py
index 5902b48..3fab52c 100644
--- a/golem_activity_queue/models/golem_member.py
+++ b/golem_activity_queue/models/golem_member.py
@@ -53,6 +53,7 @@ class GolemMember(models.Model):
         print self
         self.ensure_one()
         member_id = self[0]
+
         return {
             'name'      : _('Choose the activity to register in'),
             'type'      : 'ir.actions.act_window',
diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose.py b/golem_activity_queue/wizard/golem_activity_queue_choose.py
index 0490bf9..0c6280e 100644
--- a/golem_activity_queue/wizard/golem_activity_queue_choose.py
+++ b/golem_activity_queue/wizard/golem_activity_queue_choose.py
@@ -24,25 +24,13 @@ class GolemActivityQueueChooseWizard(models.TransientModel):
     """GOLEM Resource wizard : rchoose activity queue to register in """
     _name = "golem.activity.queue.choose.wizard"
 
-    activity_id = fields.Many2one("golem.activity",
-                                  domain=[('places_remain','<',1)])
+    activity_id = fields.Many2one("golem.activity")
     member_id = fields.Many2one("golem.member")
 
-
-
     # lancer liste editable d'inscription sur attente
     def register_in_queue(self):
+        """ Choisir l'activité pour s'inscrire sur sa liste d'attente"""
         self.ensure_one()
         activityQueue = self[0]
-        return {
-            'name'      : _('Register in the queue'),
-            'type'      : 'ir.actions.act_window',
-            'res_model' : 'golem.activity.queue',
-            'view_mode': 'tree',#
-            'context' :{'default_activity_id' : activityQueue.activity_id.id,
-                        'default_member_id' : activityQueue.member_id.id
-                        },
-            'domain' : [('activity_id', '=',activityQueue.activity_id.id )],
-            'flags': {'action_buttons': True},
-            'target': 'new',
-        }
+        self.env['golem.activity.queue'].create({'member_id': activityQueue.member_id.id,
+                                                 'activity_id': activityQueue.activity_id.id})
diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
index de5b85f..cc22706 100644
--- a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
+++ b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
@@ -28,7 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <form string="Rejection reason">
           <group>
             <field name="member_id" invisible="1" />
-            <field name="activity_id" options="{'no_create': True}" />
+            <field name="activity_id"
+                   domain="[('places_remain','&lt;' , 1), ('queue_allowed', '=', True), ('is_current', '=', True)]"
+                   options="{'no_create': True}" />
           </group>
           <footer>
             <button name="register_in_queue" string="Validate" type="object"