From b717c8fbf5cb84288812847dcdef0bf9ed544135 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Tue, 6 Mar 2018 09:45:57 +0100
Subject: [PATCH] [REF]GOLEM Activity Queue : do not use field full activity,
 as places_remain is enough

---
 golem_activity_queue/__manifest__.py          |  2 +-
 golem_activity_queue/models/golem_activity.py | 11 ----
 .../models/golem_activity_queue.py            | 13 ----
 .../views/golem_activity_queue_views.xml      | 62 +++++++++----------
 4 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/golem_activity_queue/__manifest__.py b/golem_activity_queue/__manifest__.py
index cd8eb35..2264ab2 100644
--- a/golem_activity_queue/__manifest__.py
+++ b/golem_activity_queue/__manifest__.py
@@ -20,7 +20,7 @@
     'name': 'GOLEM activity queues',
     'summary': 'GOLEM activity queues',
     'description': ''' GOLEM activity queue management ''',
-    'version': '10.0.1.0.0',
+    'version': '10.0.1.1.0',
     'category': 'GOLEM',
     'author': 'Youssef El Ouahby, Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_activity_queue/models/golem_activity.py b/golem_activity_queue/models/golem_activity.py
index 75a423e..ae15313 100644
--- a/golem_activity_queue/models/golem_activity.py
+++ b/golem_activity_queue/models/golem_activity.py
@@ -66,17 +66,6 @@ class GolemActivity(models.Model):
                         self.activity_queue_ids = [(2, queue.id, 0)]
         return True
 
-
-    #mettre à jour le status d'activité remplis sur chaque attente
-    @api.constrains('places_remain')
-    def update_activity_fullness(self):
-        """updates queue.is_activity_full based on places_remain"""
-        for activity in self:
-            for queue in self.activity_queue_ids:
-                if activity.places_remain == 0:
-                    queue.is_activity_full = "Full activity"
-                else:
-                    queue.is_activity_full = "Not full activity"
     #Ajouter/supprimer une file à l'activité et afficher popup pour traitement automatisé
     @api.multi
     def queue_allowed_toggle(self):
diff --git a/golem_activity_queue/models/golem_activity_queue.py b/golem_activity_queue/models/golem_activity_queue.py
index e7aded5..0b452e0 100644
--- a/golem_activity_queue/models/golem_activity_queue.py
+++ b/golem_activity_queue/models/golem_activity_queue.py
@@ -37,10 +37,7 @@ class GolemActivityQueue(models.Model):
 
     is_current = fields.Boolean('Current season?',
                                 related='activity_id.is_current', store=True)
-    #nombre de place disponible sur activité liée
     places_remain = fields.Integer(related='activity_id.places_remain')
-    #activité liée est plein ou non
-    is_activity_full = fields.Char(compute="_compute_is_activity_full", store=True)
 
     sequence = fields.Integer()
 
@@ -48,16 +45,6 @@ class GolemActivityQueue(models.Model):
         ('queue_uniq', 'UNIQUE (member_id, activity_id)',
          _('This member has already been registered for the queue.'))]
 
-    # decider si l'activity liée est pleine ou non : pour group by sur la liste
-    @api.depends('places_remain')
-    def _compute_is_activity_full(self):
-        """ Decide if activity is full or not """
-        for record in self:
-            if record.places_remain == 0:
-                record.is_activity_full = "Full activity"
-            else:
-                record.is_activity_full = "Not full activity"
-
     @api.constrains('member_id', 'activity_id')
     def _check_member_registration(self):
         """ Forbid registration in queue when member is already registred in the
diff --git a/golem_activity_queue/views/golem_activity_queue_views.xml b/golem_activity_queue/views/golem_activity_queue_views.xml
index 2a04f79..8df637f 100644
--- a/golem_activity_queue/views/golem_activity_queue_views.xml
+++ b/golem_activity_queue/views/golem_activity_queue_views.xml
@@ -20,12 +20,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <odoo>
   <data>
 
-    <!--formulaire du modèle golem.activity.queue-->
-    <record model="ir.ui.view" id="queue_form_view">
-      <field name="name">queue.form</field>
+    <!-- Form -->
+    <record model="ir.ui.view" id="golem_activity_queue_view_form">
+      <field name="name">GOLEM Activity Queue Form</field>
       <field name="model">golem.activity.queue</field>
       <field name="arch" type="xml">
-        <form string="Queue Form">
+        <form>
           <sheet>
             <group>
               <field name="activity_id"/>
@@ -37,67 +37,61 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       </field>
     </record>
 
-    <!--Recherche du modèle golem.activity.queue-->
-    <record model="ir.ui.view" id="queue_search_view">
-      <field name="name">queue.search</field>
+    <!-- Search -->
+    <record model="ir.ui.view" id="golem_activity_queue_view_search">
+      <field name="name">GOLEM Activity Queue Search</field>
       <field name="model">golem.activity.queue</field>
       <field name="arch" type="xml">
-        <search >
+        <search>
           <field name="member_id"/>
           <field name="activity_id"/>
           <field name="season_id" />
           <filter name="season_default" string="Default season"
            domain="[('is_current', '=', True)]" />
-          <filter name="full_activity" string="Full Activity"
-            domain="[('is_activity_full', '=', 'Full activity')]" />
-          <filter name="not_full_activity" string="Not Full Activity"
-            domain="[('is_activity_full', '=', 'Not full activity')]" />
+          <separator />
+          <filter name="activity_full" string="Full Activity"
+            domain="[('places_remain', '=', 0)]" />
+          <filter name="activity_nfull" string="Not Full Activity"
+            domain="[('places_remain', '&gt;', 0)]" />
           <group string="Group By">
               <filter name="group_by_member" string="Member"
-                      context="{'group_by': 'member_id'}"/>
+                context="{'group_by': 'member_id'}"/>
               <filter name="group_by_activity" string="Activity"
-                      context="{'group_by': 'activity_id'}"/>
-              <filter name="group_by_is_full_activity" string="Activity full"
-                      context="{'group_by': 'is_activity_full'}"/>
+                context="{'group_by': 'activity_id'}"/>
           </group>
         </search>
       </field>
     </record>
 
-    <!--liste editable du modèle golem.activity.queue-->
-    <record model="ir.ui.view" id="queue_tree_view">
-      <field name="name">queue.tree</field>
+    <!-- Tree -->
+    <record model="ir.ui.view" id="golem_activity_queue_view_tree">
+      <field name="name">GOLEM Activity Queue Tree</field>
       <field name="model">golem.activity.queue</field>
       <field name="arch" type="xml">
-        <tree string="Queue Tree"
-              editable="top"
-              colors="grey: places_remain == 0; blue : places_remain &gt;= 1">
+        <tree editable="top"
+          colors="grey: places_remain == 0; blue : places_remain &gt;= 1">
           <field name="sequence" widget="handle"/>
           <field name="member_id"/>
           <field name="activity_id"
-                 domain="[('places_remain','&lt;' , 1), ('queue_allowed', '=', True), ('is_current', '=', True)]"
-                 options="{'no_create': True}"/>
+            domain="[('places_remain','&lt;' , 1), ('queue_allowed', '=', True), ('is_current', '=', True)]"
+            options="{'no_create': True}"/>
           <field name="season_id" readonly='1'/>
           <field name="create_date" readonly="1"/>
           <field name='places_remain' />
-          <field name="is_activity_full" />
         </tree>
       </field>
     </record>
 
     <!-- Action -->
-    <record id="golem_activity_queue_action" model="ir.actions.act_window">
-      <field name="name">GOLEM Activity Queue List</field>
-      <field name="res_model">golem.activity.queue</field>
-      <field name="view_mode">tree,search</field>
-      <field name="context">{'search_default_season_default': True}</field>
-    </record>
+    <act_window id="golem_activity_queue_action" name="Activity queue"
+      res_model="golem.activity.queue" view_mode="tree"
+      context="{'search_default_season_default': True}" />
 
     <!-- Menu -->
     <menuitem id="golem_activity_queue_menu" name="Activity queue"
-              parent="golem_activity.golem_activity_menu"
-              action="golem_activity_queue_action"
-              sequence="20" />
+      parent="golem_activity.golem_activity_menu"
+      action="golem_activity_queue_action"
+      sequence="20" />
 
   </data>
 </odoo>