From 2e896772ff52edad2347168412576ce48fd1cffa Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Thu, 19 Sep 2019 15:49:22 +0200
Subject: [PATCH] select societe in demandes.pt

---
 mondumas/templates/dossier/demandes.pt       | 45 ++++++++++++++------
 mondumas/templates/dossier/dossier_lookup.pt |  2 +-
 mondumas/views/dossier.py                    | 41 +++++++++++++-----
 3 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/mondumas/templates/dossier/demandes.pt b/mondumas/templates/dossier/demandes.pt
index cf5ce3c..0d64712 100644
--- a/mondumas/templates/dossier/demandes.pt
+++ b/mondumas/templates/dossier/demandes.pt
@@ -1,6 +1,34 @@
 <metal:block use-macro="main_template">
   <div metal:fill-slot="content">
-
+    <br />
+    <div class="row">
+    <form id="demandes_form" action="${url}" class="form-horizontal" method="post"
+        data-fv-framework="bootstrap"
+        data-fv-icon-valid="glyphicon glyphicon-ok"
+        data-fv-icon-invalid="glyphicon glyphicon-remove"
+        data-fv-icon-validating="glyphicon glyphicon-refresh">
+        
+        <div class="form-group">
+            <label class="control-label col-xs-4" for="societe">Société</label>
+            <div class="col-xs-8">
+                <select class="form-control" id="societe" name="societe" onChange="$('#demandes_form').submit()" >
+                    <div tal:repeat="item societes">
+                        <option value="${item}" tal:attributes="selected societe==item and 'selected' or None">${item}</option>
+                    </div>
+                </select>
+            </div>
+        </div>
+        <div class="form-group"> 
+            <div class="col-sm-offset-4 col-sm-8">
+                <a href="${request.application_url}/" class="btn btn-default" role="button">
+                    <span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
+                <button class="btn btn-success" type="submit" name="form.submitted" tal:condition="msglus">
+                    <span class="glyphicon glyphicon-download-alt"></span>&nbsp;Générer les dossiers</button>
+            </div>
+        </div>
+    </form>
+    </div>
+    <div class="row">
     <table id="demandes" class="table table-striped table-bordered">
         <thead>
             <tr>
@@ -12,21 +40,9 @@
             </tr>
         </thead>
     </table>
+    </div>
 
     <br />
-    <form id="change-dossier-details-form" action="${url}" method="post" tal:condition="dt_data"
-        data-fv-framework="bootstrap"
-        data-fv-icon-valid="glyphicon glyphicon-ok"
-        data-fv-icon-invalid="glyphicon glyphicon-remove"
-        data-fv-icon-validating="glyphicon glyphicon-refresh">
-        
-        <div class="form-group"> 
-            <a href="${request.application_url}/" class="btn btn-default" role="button">
-                <span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
-            <button class="btn btn-success" type="submit" name="form.submitted">
-                <span class="glyphicon glyphicon-download-alt"></span>&nbsp;Générer les dossiers</button>
-        </div>
-    </form>
 
     <br />
 
@@ -39,6 +55,7 @@
             data: dataSet,
             pageLength: 50,
             bLengthChange: false,
+            searching: false,
             language: {
                 url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json'
             },
diff --git a/mondumas/templates/dossier/dossier_lookup.pt b/mondumas/templates/dossier/dossier_lookup.pt
index 98ae0f4..f6140ec 100644
--- a/mondumas/templates/dossier/dossier_lookup.pt
+++ b/mondumas/templates/dossier/dossier_lookup.pt
@@ -12,7 +12,7 @@
 			data-fv-icon-validating="glyphicon glyphicon-refresh">
 
 			<div class="form-group">
-				<label class="control-label col-xs-4" for="societe">Societe</label>
+				<label class="control-label col-xs-4" for="societe">Sociéte</label>
 				<div class="col-xs-8">
 					<select class="form-control" id="societe" name="societe">
 						<div tal:repeat="item societes">
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 778a69d..9e5e814 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -686,10 +686,27 @@ def demandes(request):
     logged_in = request.authenticated_userid.upper()
     url = request.route_url('demandes')
     
-    # lire les demandes d'interventions arrivées par email 
+    societes = ['PE','ME','PL','PO'] 
     societe = 'PE'
-    mbx_name = 'peinture-dumas@entreprise-dumas.com'
-    mbx_pwd = 'sasdumas'
+    # prendre en compte les paramètres de saisie
+    if 'societe' in request.params:
+        societe = request.params["societe"]
+
+    # sélection du mailbox selon la societe
+    if societe == 'PE':
+        mbx_name = 'peinture-dumas@entreprise-dumas.com'
+        mbx_pwd = 'sasdumas'
+    elif societe == 'ME':
+        mbx_name = 'menuiserie-dumas@entreprise-dumas.com'
+        mbx_pwd = 'sasdumas'
+    elif societe == 'PL':
+        mbx_name = 'versanit-dumas@entreprise-dumas.com'
+        mbx_pwd = 'sasdumas'
+    else:
+        mbx_name = 'polynet-dumas@entreprise-dumas.com'
+        mbx_pwd = 'sasdumas'
+    
+    # lire les demandes d'interventions arrivées par email 
     mbx_search1 = 'FROM gestionsinistre@maif.fr SUBJECT "Missionnement r"' 
     mbx_search2 = 'FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier"' 
     conn = imaplib.IMAP4_SSL('imap.entreprise-dumas.com')
@@ -704,21 +721,25 @@ def demandes(request):
     rv, data = conn.select('INBOX', readonly =True)
     
     if 'form.submitted' in request.params:
-        # demandes_generer(request, conn, societe, mbx_search1, liste, logged_in)
+        # traiter les demandes de la MAIF puis de DOMUS
+        #demandes_generer(request, conn, societe, mbx_search1, liste, logged_in)
         demandes_generer(request, conn, societe, mbx_search2, liste, logged_in)
         
     liste=[]
-    # lire demandes de la MAIF
-    # demandes_afficher(conn, mbx_name, mbx_search1, liste)            
-    # lire demandes de DOMUS
-    demandes_afficher(conn, mbx_name, mbx_search2, liste)            
-
+    # lire les demandes de la MAIF puis de DOMUS
+    demandes_afficher(conn, mbx_name, mbx_search1, liste)            
+    # demandes_afficher(conn, mbx_name, mbx_search2, liste) 
+    # messages lus
+    msglus = bool(liste)
     conn.logout()
     
     return {
-        'page_title': 'Liste des demandes pour la PEINTURE',
+        'page_title': 'Liste des demandes pour la société ' + societe,
         'url': url,
+        'societe': societe,
+        'societes': societes,
         'dt_data': json.dumps(liste),
+        'msglus': msglus,
     }
 
 def demandes_afficher(conn, mbx_name, search_criteria, liste):