From 08c949d6e24b93c334861c83b185c4b791731ef5 Mon Sep 17 00:00:00 2001 From: eloyoussef Date: Tue, 27 Feb 2018 15:03:41 +0100 Subject: [PATCH] =?UTF-8?q?en=20cas=20du=20basculement=20suppression=20des?= =?UTF-8?q?=20elements=20de=20la=20queue=20d=C3=A9ja=20inscrit=20sur=20l'a?= =?UTF-8?q?ctivit=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- golem_activity_queue/models/golem_activity.py | 2 ++ golem_activity_queue/models/golem_member.py | 25 +++---------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/golem_activity_queue/models/golem_activity.py b/golem_activity_queue/models/golem_activity.py index 3ced4bd..493e55a 100644 --- a/golem_activity_queue/models/golem_activity.py +++ b/golem_activity_queue/models/golem_activity.py @@ -111,6 +111,8 @@ class GolemActivity(models.Model): for registration in registrations: #compare le membre sur l'attente au membre sur l'inscription if queue.member_id == registration.member_id: + #si membre trouvé inscrit sur l'activité on le supprime de la queue + record.activity_queue_ids = [(2, queue.id, 0)] #si membre trouvé on mentionne enregistré, on passe au registration suivante membre_registred = True break diff --git a/golem_activity_queue/models/golem_member.py b/golem_activity_queue/models/golem_member.py index 6c411d9..0362c82 100644 --- a/golem_activity_queue/models/golem_member.py +++ b/golem_activity_queue/models/golem_member.py @@ -28,9 +28,7 @@ class GolemMember(models.Model): @api.multi def write(self, values): - #for registration in self.activity_registration_ids: - # print '_____________________trktrk_________________________' - # print registration.activity_id.name + #comparer old with new oldRegistrations = self.activity_registration_ids oldActivities = [oldRegistration.activity_id.id for oldRegistration in oldRegistrations] @@ -60,6 +58,8 @@ class GolemMember(models.Model): for registration in registrations: #compare le membre sur l'attente au membre sur l'inscription if queue.member_id == registration.member_id: + #si membre trouvé inscrit sur l'activité on le supprime de la queue + record.activity_queue_ids = [(2, queue.id, 0)] #si membre trouvé on mentionne enregistré, on passe au registration suivante membre_registred = True break @@ -91,25 +91,6 @@ class GolemMember(models.Model): ' : {}, you can fill it from the queue' ' using the button on queue tab') print warningMessage.format(activityRemoved.name) - - - - #reservations = self.env['golem.resource.reservation'].search(domain) - print "changes detected ______________________________________" - print oldActivities - print newActivities - print changed[0] - print activityRemoved.name - """for registration in oldRegistrations: - print "_________________this is removed" - print registration.activity_price - if registration not in newRegistrations: - print "_________________this is removed" - print registration.activity_id - break""" - #print self.activity_registration_ids - #print "2_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-" - #print self.name return True @api.constrains('activity_registration_ids')