[IMP]GOLEM Activity Queue : activity form UI reorganization, simplification

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.1.1',
+    'version': '10.0.1.1.2',
     'category': 'GOLEM',
     'author': 'Youssef El Ouahby, Fabien Bourgeois',
     'license': 'AGPL-3',

golem_activity_queue/models/golem_activity.py

@@ -160,23 +160,6 @@ class GolemActivity(models.Model):
         for activity in self:
             activity.queue_activity_number = len(activity.activity_queue_ids)
 
-    #lancer une fenetre pour inscritpion en file d'attente à partir du boutton
-    @api.multi
-    def queue_register(self):
-        """ launch a wizard to register in queue """
-        self.ensure_one()
-        activity_id = self[0]
-        return {
-            'name'      : _('Register in the queue'),
-            'type'      : 'ir.actions.act_window',
-            'res_model' : 'golem.activity.queue',
-            'context' :{'default_activity_id' : activity_id.id},
-            'domain' : [('activity_id', '=', activity_id.id)],
-            'view_mode': 'tree',
-            'flags': {'action_buttons': True},
-            'target': 'new',
-        }
-
     #fonction enregistrement du premier element de la liste d'ttente en inscription : mode manuel
     @api.multi
     def register_from_queue(self):

golem_activity_queue/views/golem_activity_views.xml

@@ -27,24 +27,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
      <field name="model">golem.activity</field>
      <field name="inherit_id" ref="golem_activity.golem_activity_form" />
      <field name="arch" type="xml">
-      <!--Ajout du case file d'attente et inscription automatisé sur activity form-->
+      <field name="activity_registration_ids" position="after">
-      <field name="places" position="after">
+        <button name="register_from_queue" colspan="2"
+          string="Add from queue"  type="object"
+          attrs="{'invisible':['|', ('queue_allowed', '=', False), '|',
+          ('places_remain','=', 0), ('queue_activity_number', '=', 0)]}"/>
+      </field>
+      <page name="invoicing" position="before">
+        <page name="queue" string="Queue">
+          <group>
             <field name="queue_allowed" readonly='1'/>
             <field name="auto_registration_from_queue" readonly='1'/>
-      </field>
+          </group>
-      <!--Ajout du bouton inscription en file d'attente sur activity form-->
+          <group attrs="{'invisible': [('queue_allowed', '=', False)]}">>
-      <xpath expr="//field[@name='activity_registration_ids']" position="after">
-        <button class="oe_highlight" name="queue_register"
-                string="Register in the queue"  type="object"
-                attrs="{'invisible':[('places_remain','>', 0)]}"/>
-        <button class="oe_highlight" name="register_from_queue"
-                string="Register from Queue"  type="object"
-                attrs="{'invisible':[('places_remain','&lt;', 1)]}"/>
-      </xpath>
-      <!--Ajout onglet queue sur activity form-->
-      <xpath expr="//page[@name='invoicing']" position="before">
-        <page name="queue" string="Queue" attrs="{'invisible': [('queue_allowed', '=', False)]}">
-          <group>
             <field name="queue_activity_number" readonly='1'/>
             <field name="activity_queue_ids"
                    context="{'default_activity_id': active_id}" >
@@ -55,15 +50,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <field name="season_id" readonly="1" />
               </tree>
             </field>
-          </group>
+            <button name="register_from_queue" colspan="2"
-          <group>
+              string="Register from Queue"  type="object"
-            <button class="oe_highlight" name="register_from_queue"
+              attrs="{'invisible':['|', ('queue_allowed', '=', False), '|',
-                    string="Register from Queue"  type="object"/>
+              ('places_remain','=', 0), ('queue_activity_number', '=', 0)]}"/>
           </group>
         </page>
-      </xpath>
+      </page>
-      <!--Ajout du bouton "ajouter une file,supprimer file, automated et manual registration-->
+      <header position="inside">
-      <xpath expr="//header" position="inside">
         <button class="oe_highlight" name="queue_allowed_toggle"
                 string="Add Queue"  type="object"
                 attrs="{'invisible': [('queue_allowed', '=', True)]}"/>
@@ -71,15 +65,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 string="Remove Queue"  type="object"
                 attrs="{'invisible': [('queue_allowed', '=', False)]}"
                 confirm="Are you sure you want to remove queue from this activity ? This will delete all elements currently registred in"/>
-        <button class="oe_highlight" name="auto_registration_toggle"
+        <button name="auto_registration_toggle"
                 string="Automated registration from queue"  type="object"
                 attrs="{'invisible': ['|', ('queue_allowed', '=', False),'&amp;', ('queue_allowed', '=', True), ('auto_registration_from_queue', '=', True)]}"
                 confirm="Are you sure you want to switch to automated registration from queue mode ?"/>
-        <button class="oe_highlight" name="auto_registration_toggle"
+        <button name="auto_registration_toggle"
                 string="Manual registration from queue"  type="object"
                 attrs="{'invisible': ['|', ('queue_allowed', '=', False),'&amp;', ('queue_allowed', '=', True), ('auto_registration_from_queue', '=', False)]}"
                 confirm="Are you sure you want to switch to manual registration from queue mode ?"/>
-       </xpath>
+       </header>
      </field>
    </record>