From 0d4e819e5d8172607f6a4992a950515b893700f2 Mon Sep 17 00:00:00 2001 From: eloyoussef Date: Fri, 23 Feb 2018 19:38:54 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20d'un=20champs=20suquence=20et=20r=C3=A9?= =?UTF-8?q?ordonnement=20manuel=20de=20la=20liste=20des=20attentes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- golem_activity_queue/models/golem_activity_queue.py | 2 ++ golem_activity_queue/views/golem_activity_queue_views.xml | 3 ++- golem_activity_queue/views/golem_activity_views.xml | 3 ++- golem_activity_queue/views/golem_member_views.xml | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/golem_activity_queue/models/golem_activity_queue.py b/golem_activity_queue/models/golem_activity_queue.py index db3144f..654306f 100644 --- a/golem_activity_queue/models/golem_activity_queue.py +++ b/golem_activity_queue/models/golem_activity_queue.py @@ -37,6 +37,8 @@ class GolemActivityQueue(models.Model): #activité liée est plein ou non is_activity_full = fields.Char(compute="_isActivityFull") + sequence = fields.Integer() + # decider si l'activity liée est pleine ou non : pour group by sur la liste @api.multi @api.depends('places_remain') diff --git a/golem_activity_queue/views/golem_activity_queue_views.xml b/golem_activity_queue/views/golem_activity_queue_views.xml index 29e4971..9e53afb 100644 --- a/golem_activity_queue/views/golem_activity_queue_views.xml +++ b/golem_activity_queue/views/golem_activity_queue_views.xml @@ -64,7 +64,8 @@ along with this program. If not, see . - + + diff --git a/golem_activity_queue/views/golem_activity_views.xml b/golem_activity_queue/views/golem_activity_views.xml index 500c1ab..1f53815 100644 --- a/golem_activity_queue/views/golem_activity_views.xml +++ b/golem_activity_queue/views/golem_activity_views.xml @@ -45,8 +45,9 @@ along with this program. If not, see . + context="{'default_activity_id': active_id}" > + diff --git a/golem_activity_queue/views/golem_member_views.xml b/golem_activity_queue/views/golem_member_views.xml index de5cd70..90b0713 100644 --- a/golem_activity_queue/views/golem_member_views.xml +++ b/golem_activity_queue/views/golem_member_views.xml @@ -39,7 +39,8 @@ along with this program. If not, see . - + +