finition générer dossier à partir d'un email

2020-01-13 17:14:17 +01:00
parent 703791fe4d
commit a490992988
10 changed files with 498 additions and 296 deletions
--- a/development.ini
+++ b/development.ini
@@ -22,13 +22,14 @@ pyramid.includes =
 sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8
 # sqlalchemy.url = mysql://root:cni/@srvbd/bddevfac?charset=utf8

-mondumas.admin_email = phuoc@caotek.fr
+mondumas.admin_email = cao.thien-phuoc@orange.fr
 mondumas.devfac_url = mondumas:static/DEVFAC/
 mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES

 # Mailer configuration
-mail.host = smtp.free.fr
+mail.host = smtp.orange.fr
 mail.port = 25
+mail.username = cao.thien-phuoc@orange.fr

 [server:main]
 use = egg:waitress#main
--- a/mondumas/models/dossier.py
+++ b/mondumas/models/dossier.py
@@ -29,7 +29,10 @@ def get_dossier_by_no(request,nodossier):
    societe = nodossier[0:2]
    no_id = nodossier[3:]
    query = """
-SELECT d.*, c.*, a.NOM as nom_cabinet, e.NOM as nom_expert FROM dem_devis d 
+SELECT d.*, a.NOM as nom_cabinet, e.NOM as nom_expert,
+c.QUALITE AS cli_QUALITE, c.NOM AS cli_NOM, c.ADRESSE AS cli_ADRESSE, c.ADRESSE2 AS cli_ADRESSE2, c.CP AS cli_CP, c.VILLE AS cli_VILLE,
+c.TEL1 AS cli_TEL1, c.TEL2 AS cli_TEL2, c.TELP AS cli_TELP, c.FAX AS cli_FAX, c.NOMRESP AS cli_NOMRESP
+FROM dem_devis d 
 INNER JOIN clients c ON d.societe = c.societe and d.cd_cli = c.cd_cli
 INNER JOIN p_cabinet a ON d.cabinet = a.code
 INNER JOIN p_experts e ON d.cabinet = e.code_cab and d.expert = e.code_exp
@@ -38,7 +41,7 @@ where d.societe = '%s' and d.no_id=%s;""" % (societe, no_id);
    return results

 def get_dossier_by_sinistre(request,societe, nosin):
-    query = "SELECT * FROM dem_devis WHERE societe = '%s' and nosin = '%s';" % (societe, nosin);
+    query = "SELECT * FROM dem_devis WHERE societe = '%s' and LEFT(REPLACE(nosin,' ', ''),11) = LEFT(REPLACE('%s',' ', ''),11);" % (societe, nosin);
    results = request.dbsession.execute(query).first()
    return results

@@ -181,6 +184,9 @@ def update_dossier(request, nodossier, new_values):

    s = ''
    for param in new_values.keys():
+        if param == 'C_VILLE':
+            new_values['C_VILLE'] = new_values['C_VILLE'].upper()
+            
        if s:
            s += ",%s=:%s" % (param, param)
        else:
@@ -283,3 +289,16 @@ def insert_dossier(request, societe, cd_cli, c_nom, c_adr, c_adr2, c_cp, c_ville
    results = request.dbsession.execute(query, {'societe': societe, 'cd_cli': cd_cli}).first()           
    return results.no_id
    
+def get_cabinet(request, code):
+    query = "SELECT * FROM p_cabinet where code = :code;"
+    results = request.dbsession.execute(query, {'code': code}).first()           
+    return results
+
+def get_experts(request, code_cab, code_exp):
+    if code_exp == 0:
+        query = "SELECT * FROM p_experts where code_cab = :code_cab;"
+        results = request.dbsession.execute(query, {'code_cab': code_cab}).fetchall()           
+    else:
+        query = "SELECT * FROM p_experts where code_cab = :code_cab AND code_exp = :code_exp;"
+        results = request.dbsession.execute(query, {'code_cab': code_cab, 'code_exp': code_exp}).first()           
+    return results
--- a/mondumas/static/css/style.less
+++ b/mondumas/static/css/style.less
@@ -189,6 +189,7 @@
  -o-animation: spin 2s infinite linear;
  animation: spin 2s infinite linear;
 }
+
@-moz-keyframes spin {
  0% {
 	-moz-transform: rotate(0deg);
--- a/mondumas/templates/dossier/demandes.pt
+++ b/mondumas/templates/dossier/demandes.pt
@@ -1,45 +1,36 @@
 <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 metal:fill-slot="content">

-        <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 tal:condition="message" tal:content="message" class="alert alert-success" />
+
+    <div class="row">
+        <table id="demandes" class="table table-striped table-bordered">
+            <thead>
+                <tr>
+                    <th>Société</th>
+                    <th>Date</th>
+                    <th>Expéditeur</th>
+                    <th>Objet</th>
+                </tr>
+            </thead>
+        </table>
    </div>
    <div class="row">
-    <table id="demandes" class="table table-striped table-bordered">
-        <thead>
-            <tr>
-                <th>No</th>
-                <th>Date</th>
-                <th>Expéditeur</th>
-                <th>Destinataire</th>
-                <th>Objet</th>
-            </tr>
-        </thead>
-    </table>
+        <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"> 
+                <div class="col-sm-offset-4 col-sm-8">
+                    <a href="${request.application_url}/" class="btn btn-default btn-lg" role="button">
+                        <span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
+                    <button id="generateButton" class="btn btn-success btn-lg" type="submit" name="form.submitted" tal:condition="msglus">
+                        <i class="glyphicon glyphicon-refresh"></i>&nbsp;Générer les dossiers</button>
+                </div>
+            </div>
+        </form>
    </div>

    <br />
@@ -60,12 +51,27 @@
                url: 'https://cdn.datatables.net/plug-ins/1.10.16/i18n/French.json'
            },
            columnDefs: [
-                { className: "text-right", "targets": [0] },
+                { className: "text-center", "targets": [0] },
            ],
+            createdRow: function( row, data, dataIndex ) {
+                if ( data[0] == "ME" ) {
+                    $('td', row).eq(0).css('background-color', 'Gold');
+                } else if ( data[0] == "PE" ) {
+                    $('td', row).eq(0).css('background-color', 'LightYellow');
+                } else if ( data[0] == "PL" ) {
+                    $('td', row).eq(0).css('background-color', 'LightGreen');
+                }
+            },
        });
    
    });
 </script>
+<script type="text/javascript">
+    $('#generateButton').on('click', function(){
+        $('i.gly-spin').removeClass('gly-spin');
+        $('i').addClass('gly-spin');
+    });
+</script>

 </div><!-- content -->
 </metal:block>
--- a/mondumas/templates/dossier/dossier_edit.pt
+++ b/mondumas/templates/dossier/dossier_edit.pt
@@ -8,18 +8,54 @@
        data-fv-icon-invalid="glyphicon glyphicon-remove"
        data-fv-icon-validating="glyphicon glyphicon-refresh">

+        <h3 class="text-primary">ADRESSE</h3>
        <div class="form-group">
-            <label class="col-sm-4 control-label">Adresse email</label>
-            <div class="col-sm-8">
-                <input class="form-control" type="text" name="C_EMAIL" 
-                    value="${dossier.C_EMAIL}" placeholder="50 caractères maximum" 
-                    data-fv-emailaddress="true"
-                    data-fv-emailaddress-message="L'adresse email n'est pas valide" />
+            <label class="control-label col-xs-4" for="C_ADR">Adresse</label>
+            <div class="col-xs-8">
+                <input class="form-control" type="text" id="C_ADR" name="C_ADR" value="${dossier.C_ADR}"
+                    placeholder="40 caractères maximum" 
+                    data-fv-stringlength="true"
+                    data-fv-stringlength-max="40"
+                    data-fv-stringlength-message="40 caractères maximum" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-xs-4" for="C_ADR2">Adresse 2</label>
+            <div class="col-xs-8">
+                <input class="form-control" type="text" id="C_ADR2" name="C_ADR2" value="${dossier.C_ADR2}"
+                    placeholder="40 caractères maximum" 
+                    data-fv-stringlength="true"
+                    data-fv-stringlength-max="40"
+                    data-fv-stringlength-message="40 caractères maximum" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-xs-4" for="C_CP">Code postal</label>
+            <div class="col-xs-5">
+                <input class="form-control" type="text" id="C_CP" name="C_CP" value="${dossier.C_CP}"
+                    placeholder="5 caractères maximum" 
+                    data-fv-notempty="true"
+                    data-fv-notempty-message="Le code postal est obligatoire"
+                    data-fv-stringlength="true"
+                    data-fv-stringlength-max="5"
+                    data-fv-stringlength-message="5 caractères maximum" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-xs-4" for="C_VILLE">Ville</label>
+            <div class="col-xs-5">
+                <input class="form-control" type="text" id="C_VILLE" name="C_VILLE" value="${dossier.C_VILLE}"
+                    placeholder="45 caractères maximum" 
+                    data-fv-notempty="true"
+                    data-fv-notempty-message="La Ville est obligatoire"
+                    data-fv-stringlength="true"
+                    data-fv-stringlength-max="25"
+                    data-fv-stringlength-message="25 caractères maximum" />
            </div>
        </div>
        <div class="form-group">
            <label class="col-sm-4 control-label">Etage</label>
-            <div class="col-sm-8">
+            <div class="col-sm-5">
                <input class="form-control" type="text" name="C_ETAGE" 
                    value="${dossier.C_ETAGE}" placeholder="10 caractères maximum" 
                    data-fv-stringlength="true"
@@ -29,7 +65,7 @@
        </div>
        <div class="form-group">
            <label class="col-sm-4 control-label">Code d'accès</label>
-            <div class="col-sm-8">
+            <div class="col-sm-5">
                <input class="form-control" type="text" name="C_CODE" 
                    value="${dossier.C_CODE}" placeholder="20 caractères maximum" 
                    data-fv-stringlength="true"
@@ -37,9 +73,20 @@
                    data-fv-stringlength-message="20 caractères maximum" />
            </div>
        </div>
+ 
+        <h3 class="text-primary">EMAIL et TELEPHONES</h3>
        <div class="form-group">
-            <label class="col-sm-4 control-label">Téléphone fixe</label>
+            <label class="col-sm-4 control-label">Adresse email</label>
            <div class="col-sm-8">
+                <input class="form-control" type="text" name="C_EMAIL" 
+                    value="${dossier.C_EMAIL}" placeholder="50 caractères maximum" 
+                    data-fv-emailaddress="true"
+                    data-fv-emailaddress-message="L'adresse email n'est pas valide" />
+            </div>
+        </div>
+       <div class="form-group">
+            <label class="col-sm-4 control-label">Téléphone fixe</label>
+            <div class="col-sm-5">
                <input class="form-control" type="text" name="C_TEL1" 
                    value="${dossier.C_TEL1}" placeholder="20 caractères maximum" 
                data-fv-phone="true"
@@ -49,7 +96,7 @@
        </div>
        <div class="form-group">
            <label class="col-sm-4 control-label">Téléphone prof.</label>
-            <div class="col-sm-8">
+            <div class="col-sm-5">
                <input class="form-control" type="text" name="C_TEL2" 
                    value="${dossier.C_TEL2}" placeholder="20 caractères maximum" 
                data-fv-phone="true"
@@ -59,7 +106,7 @@
        </div>
        <div class="form-group">
            <label class="col-sm-4 control-label">Téléphone mobile</label>
-            <div class="col-sm-8">
+            <div class="col-sm-5">
                <input class="form-control" type="text" name="C_TELP" 
                    value="${dossier.C_TELP}" placeholder="20 caractères maximum" 
                data-fv-phone="true"
@@ -69,7 +116,7 @@
        </div>
        <div class="form-group">
            <label class="col-sm-4 control-label">Téléphone fax</label>
-            <div class="col-sm-8">
+            <div class="col-sm-5">
                <input class="form-control" type="text" name="C_FAX" 
                    value="${dossier.C_FAX}" placeholder="20 caractères maximum" 
                data-fv-phone="true"
@@ -77,6 +124,25 @@
                data-fv-phone-message="Ce numéro de téléphone n'est pas vailde" />
            </div>
        </div>
+        
+        <h3 class="text-primary">CABINET / EXPERT</h3>
+        <div class="form-group">
+            <label class="control-label col-sm-4">Cabinet</label>
+            <div class="col-sm-8">
+                <p class="form-control-static">${dossier.nom_cabinet}</p>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-sm-4" for="EXPERT">Expert</label>
+            <div class="col-sm-8">
+                <select class="form-control" id="EXPERT" name="EXPERT">
+                    <div tal:repeat="item experts">
+                        <option value="${item.CODE_EXP}" tal:attributes="selected dossier.EXPERT==item.CODE_EXP and 'selected' or None">${item.NOM}</option>
+                    </div>
+                </select>
+            </div>
+        </div>
+        <br />
        <div class="form-group"> 
            <div class="col-sm-offset-4 col-sm-8">
                <a class="btn btn-default" href="${request.application_url}/dossier_view/${nodossier}">
--- a/mondumas/templates/dossier/dossier_lookup.pt
+++ b/mondumas/templates/dossier/dossier_lookup.pt
@@ -53,6 +53,7 @@
 				<th class="text-right">Montant</th>
 				<th>Sinistre</th>
 				<th class="text-center">Statut</th>
+				<th>Uti.</th>
 			</tr>
 		</thead>
 		</table>
@@ -76,6 +77,7 @@
 			},
 			order: [[0, order_option]],
 			columnDefs: [
+				{ className: "text-right", "targets": [4] },
 				{ "targets": 0,
 					"render": function (data, type, full, meta) {
 					// ajouter un link vers le formulaire
--- a/mondumas/templates/dossier/dossier_view.pt
+++ b/mondumas/templates/dossier/dossier_view.pt
@@ -72,10 +72,10 @@
 						${dossier.CD_CLI}
 					</td>
                    <td>
-                        <h4>${dossier.QUALITE} ${dossier.NOM}</h4>
-                        ${dossier.ADRESSE}<br />
-                        <span tal:condition="dossier.ADRESSE2">${dossier.ADRESSE2}<br /></span>
-                        ${dossier.CP} ${dossier.VILLE}<br />
+                        <h4>${dossier.cli_QUALITE} ${dossier.cli_NOM}</h4>
+                        ${dossier.cli_ADRESSE}<br />
+                        <span tal:condition="dossier.cli_ADRESSE2">${dossier.cli_ADRESSE2}<br /></span>
+                        ${dossier.cli_CP} ${dossier.cli_VILLE}<br />
                    </td>
                </tr>
                <tr>
@@ -85,14 +85,17 @@
                        Tél. mobile - fax
                    </td>
                    <td>
-                        ${dossier.NOMRESP}<br />
-                        ${dossier.TEL1} - ${dossier.TEL2}<br />
-                        ${dossier.TELP} - ${dossier.FAX}
+                        ${dossier.cli_NOMRESP}<br />
+                        ${dossier.cli_TEL1} - ${dossier.cli_TEL2}<br />
+                        ${dossier.cli_TELP} - ${dossier.cli_FAX}
                    </td>
                </tr>
            </table>
        </div>
+		<div class="col-md-6">
        <h4>Statut : ${dossier.STATUS}</h4>
+		Dernière modif. le <b>${dossier.DATEMAJ.strftime('%d/%m/%Y à %H:%M')}</b> par <b>${dossier.USERMAJ}</b>
+		</div>
    </div>  <!-- row -->

    <!--  PANEL DOSSIERS SIMILAIRES  -->
--- a/mondumas/templates/parametres/infrastructure.pt
+++ b/mondumas/templates/parametres/infrastructure.pt
@@ -7,7 +7,7 @@
 		<div class="row text-center">
 			<div class="col-sm-3">
 				<span class="fas fa-desktop logo-primary"></span>
-				<h4>21 ordinateurs</h4>
+				<h4>15 ordinateurs</h4>
 			</div>
 			<div class="col-sm-3">
 				<span class="fas fa-laptop logo-primary"></span>
@@ -15,7 +15,7 @@
 			</div>
 			<div class="col-sm-3">
 				<span class="fas fa-print logo-primary"></span>
-				<h4>10 imprimantes</h4>
+				<h4>4 imprimantes réseau</h4>
 			</div>
 			<div class="col-sm-3">
 				<span class="fas fa-tablet-alt logo-small"></span>
@@ -25,30 +25,94 @@
 	</div>
 	<br />
 		
-	<h3 class="text-center">SERVEURS</h3>
-	<br />
+	<h3 class="text-center">SERVEURS WINDOWS</h3>
 	<div id="jquery" class="container-fluid">
 		<div class="row text-center">
-			<div class="col-sm-3">
-				<span class="fas fa-server logo-primary"></span>
-				<h4>SVRTSE</h4>
-			</div>
-			<div class="col-sm-3">
-				<span class="fas fa-server logo-primary"></span>
-				<h4>SRVBD</h4>
-			</div>
-			<div class="col-sm-3">
-				<span class="fas fa-server logo-primary"></span>
-				<h4>SRV</h4>
-			</div>
 			<div class="col-sm-3">
 				<span class="fas fa-server logo-small"></span>
-				<h4>SRV</h4>
+				<h4>SRV2012</h4>
+				Serveur HYPER-V
+			</div>
+			<div class="col-sm-3">
+				<span class="fas fa-hdd logo-primary"></span>
+				<h4>SRVTSE</h4>
+				Serveur Accès à Distance
+			</div>
+			<div class="col-sm-3">
+				<span class="fas fa-hdd logo-primary"></span>
+				<h4>SRVBD / DC</h4>
+				Serveur Base de données
+			</div>
+			<div class="col-sm-3">
+				<span class="far fa-hdd logo-primary"></span>
+				<h4>SECOURS</h4>
+				Serveur de secours
 			</div>
 		</div>
 	</div>
 	
 	<br />
+	<h3 class="text-center">SERVEUR LINUX</h3>
+	<div id="jquery" class="container-fluid">
+		<div class="row text-center">
+			<div class="col-sm-12">
+				<span class="fas fa-hdd logo-small"></span>
+				<h4>SRVWEB</h4>
+			</div>
+		</div>
+	</div>
+	<br />
+	
+	<h3 class="text-center">CONNECTION INTERNET</h3>
+	<div id="jquery" class="container-fluid">
+		<div class="row text-center">
+			<div class="col-sm-12">
+				<span class="fas fa-globe logo-primary"></span>
+			</div>
+		</div>
+		<br />
+		<div class="row text-center">
+			<div class="col-sm-3">
+				<h4>Routeur SFR Fibre 10 Mbps</h4>
+			</div>
+			<div class="col-sm-3">
+				<span class="far fa-hdd logo-small"></span>
+			</div>
+			<div class="col-sm-3">
+				<span class="far fa-hdd logo-small"></span>
+			</div>
+			<div class="col-sm-3">
+				<h4>Router ORANGE ADSL2</h4>
+			</div>
+		</div>
+		<br />
+		<div class="row text-center">
+			<div class="col-sm-12">
+				<span class="far fa-hdd logo-small"></span>
+			</div>
+		</div>
+		<br />
+		<br />
+		<div class="row text-center">
+			<div class="col-sm-3">
+				<span class="fas fa-server logo-primary"></span>
+				<h4>Serveurs</h4>
+			</div>
+			<div class="col-sm-3">
+				<span class="fas fa-desktop logo-primary"></span>
+				<h4>Ordinateurs</h4>
+			</div>
+			<div class="col-sm-3">
+				<span class="fas fa-print logo-primary"></span>
+				<h4>Imprimantes</h4>
+			</div>
+			<div class="col-sm-3">
+				<span class="fas fa-wifi logo-primary"></span>
+				<h4>Bornes Wifi</h4>
+			</div>
+		</div>
+
+	</div>
 	<br />

 </div><!-- content -->
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -83,7 +83,7 @@ def dossier_lookup(request):
    # construire la liste 
    for item in chantiers:               
        d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant), 
-             item.nosin, item.status)
+             item.nosin, item.status, item.usermaj)
        liste.append(d)

    if len(name) == 0 :
@@ -259,6 +259,9 @@ def dossier_edit(request):
        request.session.flash(u"Le dossier no %s est introuvable" % (nodossier), 'danger')
        return HTTPFound(location=request.route_url('dossier_lookup'))
    
+    # lire table expert
+    experts = get_experts(request, dossier.CABINET, 0)
+
    if 'form.submitted' in request.params:
        new_values = {}
        for param, db_value in dossier.items():
@@ -275,6 +278,7 @@ def dossier_edit(request):
        'url': url,
        'dossier': dossier,
        'nodossier': nodossier,
+        'experts': experts,
    }

@view_config(route_name='upload_doc', renderer='../templates/dossier/upload_doc.pt', permission='view')
@@ -550,7 +554,7 @@ def rdf_view(request):
        dest = "mondumas/static/DEVFAC/DOCS_ATTACHES/PL/%s/%s" % (str(rapport.nochantier), filename)
        
        # developpement ou production
-        if request.registry.settings["mail.host"] == "smtp.orange.fr":      
+        if request.registry.settings["mail.username"] == "sas.dumas@orange.fr":      
            origin = 'https://gestion.entreprise-dumas.com/rdf_rapport/%s' % norapport
            pdfkit.from_url(origin, dest, options=options)
        else:
@@ -683,229 +687,248 @@ def rdf_bill(request):

@view_config(route_name='demandes', renderer='../templates/dossier/demandes.pt', permission='view')
 def demandes(request):
-    logged_in = request.authenticated_userid.upper()
-    url = request.route_url('demandes')
    
-    societes = ['PE','ME','PL'] 
-    societe = 'PE'
-    # 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')
-    try:
-        # se connecter à la mailbox
-        conn.login(mbx_name, mbx_pwd)
-    except imaplib.IMAP4.error:
-        request.session.flash("ERREUR connexion au compte %s" % mbx_name, 'danger')
-        return HTTPFound(location=request.route_url('home'))
-    
-    # lire le INBOX
-    rv, data = conn.select('INBOX', readonly =True)
-    
-    # if 'form.submitted' in request.params:
-        # traiter les demandes de la MAIF puis de DOMUS
-        # demandes_generer(request, conn, societe, mbx_search1)
-        # demandes_generer(request, conn, societe, 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 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):
-    # créer la liste des entêtes des messages à afficher
-    rv, data = conn.search(None, search_criteria)
-    if rv != 'OK':
-        request.session.flash("ERREUR de lecture de la boîte de réception", 'danger')
-        return HTTPFound(location=request.route_url('home'))
-    
-    mail_ids = data[0]
-    for num in mail_ids.split():
-        rv, msg_data = conn.fetch(num, '(RFC822)')
-        if rv != 'OK':
-            request.session.flash("ERREUR de lecture du message %s" % num, 'danger')
+    def mailbox_connect(societe):
+        # connecter au serveur IMAP de 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:
+            request.session.flash("Cette société est inconnue ou non traitée : %s" % societe, 'danger')
            return HTTPFound(location=request.route_url('home'))
        
-        msg = email.message_from_bytes(msg_data[0][1])
-        hdr = email.header.make_header(email.header.decode_header(msg['Subject']))
-        email_subject = str(hdr)
-        email_from = email.utils.parseaddr(msg['from'])[1]
-        # Now convert to local date-time
-        date_tuple = email.utils.parsedate_tz(msg['Date'])
-        if date_tuple:
-            email_date = datetime.fromtimestamp(email.utils.mktime_tz(date_tuple))
-        else:
-            email_date = datetime.now()
+        conn = imaplib.IMAP4_SSL('imap.entreprise-dumas.com')
+        try:
+            # se connecter à la mailbox
+            conn.login(mbx_name, mbx_pwd)
+        except imaplib.IMAP4.error:
+            request.session.flash("ERREUR connexion au compte %s" % mbx_name, 'danger')
+            return HTTPFound(location=request.route_url('home'))
        
-        d = (str(int(num)), email_date.strftime('%d-%m-%Y %H:%M:%S'), email_from, mbx_name.replace('entreprise-dumas.com', ''), email_subject)
-        liste.append(d)
-    return liste
+        return conn 
        
-def demandes_generer(request, conn, societe, mbx_search):
+    def demandes_lister(societe, search_criteria):
+        # connecter au serveur de mail
+        conn = mailbox_connect(societe)
+        # select INBOX
+        rv, data = conn.select('INBOX', readonly =True)
    
-    def generer_mission(request, societe, mbx_search, extracted_file, temp_file_path):
+        # créer la liste des entêtes des messages à afficher
+        liste = []
+        for criteria in search_criteria:
+            rv, data = conn.search(None, criteria)
+            if rv != 'OK':
+                request.session.flash("ERREUR de lecture de la boîte de réception", 'danger')
+                return HTTPFound(location=request.route_url('home'))
    
-        if 'maif.fr' in mbx_search:
+            mail_ids = data[0]
+            for num in mail_ids.split():
+                rv, msg_data = conn.fetch(num, '(RFC822)')
+                if rv != 'OK':
+                    request.session.flash("ERREUR de lecture du message %s" % num, 'danger')
+                    return HTTPFound(location=request.route_url('home'))
+    
+                msg = email.message_from_bytes(msg_data[0][1])
+                hdr = email.header.make_header(email.header.decode_header(msg['Subject']))
+                email_subject = str(hdr)
+                email_from = email.utils.parseaddr(msg['from'])[1]
+                # Now convert to local date-time
+                date_tuple = email.utils.parsedate_tz(msg['Date'])
+                if date_tuple:
+                    email_date = datetime.fromtimestamp(email.utils.mktime_tz(date_tuple))
+                else:
+                    email_date = datetime.now()
+    
+                d = (societe, email_date.strftime('%d-%m-%Y %H:%M:%S'), email_from, email_subject)
+                liste.append(d)
+    
+        # deconnexion du serveur
+        conn.close()
+        conn.logout()
+        return liste
+
+    def demandes_generer(request, societe, search_criteria):
+        
+        def generer_mission(request, societe, mbx_search, extracted_file, temp_file_path):
+            
+            if 'maif.fr' in mbx_search:
+                # extraire les infos de la demmande MAIF
+                dem_info = get_pdf_infos1(extracted_file)
+                if societe == 'PE':
+                    cd_cli = 2813
+                elif societe == 'ME':
+                    cd_cli = 3428
+                else:
+                    # VERSANIT
+                    cd_cli = 1743
+            elif 'domus-services.fr' in mbx_search:
+                # extraire les infos de la demmande DOMUS
+                dem_info = get_pdf_infos2(extracted_file)
+                if societe == 'PE':
+                    cd_cli = 8991
+                elif societe == 'ME':
+                    cd_cli = 5276
+                else:
+                    # VERSANIT
+                    cd_cli = 3209
+    
+            # extraction OK ? oui, créer une dem_devis et récupèrer son no_id
+            if dem_info['c_nom'] != '':
+                nochantier = insert_dossier(request, societe, cd_cli, dem_info['c_nom'], dem_info['c_adr'], dem_info['c_adr2'], \
+                                            dem_info['c_cp'], dem_info['c_ville'], dem_info['c_telp'], dem_info['no_sinistre'], dem_info['c_obs'], dem_info['tx_trav'])
+                nodossier = "%s-%s" % (societe, nochantier)
+                
+                # récupère le nom du fichier et ajouter le no de dossier
+                filename = os.path.basename(temp_file_path)
+                filename = '%s-DD%s-%s' % (societe, nochantier, filename)
+                tempFile2Dossier(request, societe, nochantier, '0', temp_file_path, filename, 'EMAIL')
+                 
+            return
+        
+        def generer_annul_maif(request, societe, extracted_file, temp_file_path):
            # extraire les infos de la demmande MAIF
            dem_info = get_pdf_infos1(extracted_file)
-            if societe == 'PE':
-                cd_cli = 2813
-            elif societe == 'ME':
-                cd_cli = 3428
-            else:
-                # VERSANIT
-                cd_cli = 1743
-        elif 'domus-services.fr' in mbx_search:
-            # extraire les infos de la demmande DOMUS
-            dem_info = get_pdf_infos2(extracted_file)
-            if societe == 'PE':
-                cd_cli = 8991
-            elif societe == 'ME':
-                cd_cli = 5276
-            else:
-                # VERSANIT
-                cd_cli = 3209
+            # extraction OK ? oui, rechercher la dem_devis concerné
            
-        # extraction OK ? oui, créer une dem_devis et récupèrer son no_id
-        if dem_info['c_nom'] != '':
-            nochantier = insert_dossier(request, societe, cd_cli, dem_info['c_nom'], dem_info['c_adr'], dem_info['c_adr2'], \
-                                        dem_info['c_cp'], dem_info['c_ville'], dem_info['c_telp'], dem_info['no_sinistre'], dem_info['c_obs'], dem_info['tx_trav'])
-            nodossier = "%s-%s" % (societe, nochantier)
+            # import pdb;pdb.set_trace()
+            if dem_info['c_nom'] != '':
+                # oui, rechercher la dem_devis concerné par le no de sinistre
+                nosin = dem_info['no_sinistre']
+                dem_devis = get_dossier_by_sinistre(request,societe, nosin)
+                if dem_devis:
+                    nodossier = "%s-%s" % (societe, dem_devis.NO_ID)
                    
-            # récupère le nom du fichier et ajouter le no de dossier
-            filename = os.path.basename(temp_file_path)
-            filename = '%s-DD%s-%s' % (societe, nochantier, filename)
-            tempFile2Dossier(request, societe, nochantier, '0', temp_file_path, filename, 'AUTO')
+                    # récupère le nom du fichier et ajouter le no de dossier
+                    filename = '%s-DD%s-%s' % (societe, dem_devis.NO_ID, 'ANNULATION.pdf')
+                    tempFile2Dossier(request, societe, dem_devis.NO_ID, '0', temp_file_path, filename, 'EMAIL')
+                    # insérer une ligne de suivi ANNULATION
+                    insert_suivi(request, nodossier, '!!MISSION ANNULEE PAR la MAIF')
+            return
    
-        return
-    
-    def generer_annulation1(request, societe, extracted_file, temp_file_path):
-        
-        # extraire les infos de la demmande MAIF
-        dem_info = get_pdf_infos1(extracted_file)
-        # extraction OK ? oui, rechercher la dem_devis concerné
-        if dem_info['c_nom'] != '':
+        def generer_annul_domus(request, societe, nosin, temp_file_path):
+            # import pdb;pdb.set_trace()
            # oui, rechercher la dem_devis concerné par le no de sinistre
            dem_devis = get_dossier_by_sinistre(request,societe, nosin)
-            nodossier = "%s-%s" % (societe, dem_devis.NO_ID)
+            if dem_devis:
+                nodossier = "%s-%s" % (societe, dem_devis.NO_ID)
                
-            # récupère le nom du fichier et ajouter le no de dossier
-            filename = '%s-DD%s-%s' % (societe, dem_devis.NO_ID, 'ANNULATION.pdf')
-            tempFile2Dossier(request, societe, dem_devis.NO_ID, '0', temp_file_path, filename, 'AUTO')
-            # insérer une ligne de suivi ANNULATION
-            insert_suivi(request, nodossier, '!!MISSION ANNULEE PAR la MAIF')
-        return
+                # récupère le nom du fichier et ajouter le no de dossier
+                filename = '%s-DD%s-%s' % (societe, dem_devis.NO_ID, 'ANNULATION.pdf')
+                tempFile2Dossier(request, societe, dem_devis.NO_ID, '0', temp_file_path, filename, 'EMAIL')
+                # insérer une ligne de suivi ANNULATION
+                insert_suivi(request, nodossier, '!!MISSION ANNULEE PAR DOMUS')
+            return
        
-    def generer_annulation2(request, societe, nosin, temp_file_path):
+        # connecter au serveur de mail
+        conn = mailbox_connect(societe)
+        # select INBOX
+        rv, data = conn.select('INBOX', readonly =True)
    
-        # oui, rechercher la dem_devis concerné par le no de sinistre
-        dem_devis = get_dossier_by_sinistre(request,societe, nosin)
-        nodossier = "%s-%s" % (societe, dem_devis.NO_ID)
+        for criteria in search_criteria:
+            # rechercher les emails de demandes dans le INBOX
+            rv, data = conn.search(None, criteria)
+            if rv != 'OK':
+                request.session.flash("ERREUR de lecture de la boîte de réception", 'danger')
+                return HTTPFound(location=request.route_url('home'))
            
-        # récupère le nom du fichier et ajouter le no de dossier
-        filename = '%s-DD%s-%s' % (societe, dem_devis.NO_ID, 'ANNULATION.pdf')
-        tempFile2Dossier(request, societe, dem_devis.NO_ID, '0', temp_file_path, filename, 'AUTO')
-        # insérer une ligne de suivi ANNULATION
-        insert_suivi(request, nodossier, '!!MISSION ANNULEE PAR DOMUS')
-        return
+            mail_ids = data[0]
+            nbMessages = len(mail_ids)
+            for num in mail_ids.split():
+                rv, msg_data = conn.fetch(num, '(RFC822)')
+                if rv != 'OK':
+                    request.session.flash("ERREUR de lecture du message %s" % num, 'danger')
+                    return HTTPFound(location=request.route_url('home'))
                
-    # rechercher les emails de demandes dans le INBOX
-    rv, data = conn.search(None, mbx_search)
-    if rv != 'OK':
-        request.session.flash("ERREUR de lecture de la boîte de réception", 'danger')
-        return HTTPFound(location=request.route_url('home'))
+                raw_email = msg_data[0][1]
+                # converts byte literal to string removing b''
+                raw_email_string = raw_email.decode('utf-8')
+                email_message = email.message_from_string(raw_email_string)
        
-    mail_ids = data[0]
-    for num in mail_ids.split():
-        rv, msg_data = conn.fetch(num, '(RFC822)')
-        if rv != 'OK':
-            request.session.flash("ERREUR de lecture du message %s" % num, 'danger')
-            return HTTPFound(location=request.route_url('home'))
+                # get the message's body
+                body = ''
+                for part in email_message.walk():
+                    ctype = part.get_content_type()
+                    cdispo = str(part.get('Content-Disposition'))
            
-        raw_email = msg_data[0][1]
-        # converts byte literal to string removing b''
-        raw_email_string = raw_email.decode('utf-8')
-        email_message = email.message_from_string(raw_email_string)
+                    # skip any text/plain (txt) attachments
+                    if ctype == 'text/html' and 'attachment' not in cdispo:
+                        body = part.get_payload(decode=True)  # decode
+                        break
+                # downloading attachment
+                temp_file_path = download_pdf_to_tmp(email_message)
        
-        # get the message's body
-        body = ''
-        for part in email_message.walk():
-            ctype = part.get_content_type()
-            cdispo = str(part.get('Content-Disposition'))
+                # convertir le fichier pdf en texte
+                texte, extracted_file = pdf_convert_to_txt(temp_file_path)
                
-            # skip any text/plain (txt) attachments
-            if ctype == 'text/html' and 'attachment' not in cdispo:
-                body = part.get_payload(decode=True)  # decode
-                break
-        # downloading attachment
-        temp_file_path = download_pdf_to_tmp(email_message)
+                # mission annulée ?
+                if 'Objet : ANNULATION MISSION' in texte :
+                    # genere ANNULATION mission MAIF
+                    # import pdb;pdb.set_trace()
+                    generer_annul_maif(request, societe, extracted_file, temp_file_path)
+                    # conn.store(num, '+FLAGS', r'(\Deleted)')
+                elif 'ANNULATION ORDRE DE MISSION' in texte:
+                    # genere ANNULATION mission DOMUS
+                    nosin = str(body)[84:95]
+                    # import pdb;pdb.set_trace()
+                    generer_annul_domus(request, societe, nosin, temp_file_path)
+                    # conn.store(num, '+FLAGS', r'(\Deleted)')
+                else:
+                    # genere le dossier d'après le mail
+                    # import pdb;pdb.set_trace()
+                    generer_mission(request, societe, criteria, extracted_file, temp_file_path)
+                    # marquer le message comme supprimé
+                    # conn.store(num, '+FLAGS', r'(\Deleted)')
        
-        # convertir le fichier pdf en texte
-        texte, extracted_file = pdf_convert_to_txt(temp_file_path)
+        conn.expunge()
+        conn.close()
+        # deconnexion du serveur
+        conn.logout()
        
-        # mission annulée ?
-        if 'Objet : ANNULATION MISSION' in texte :
-            # genere ANNULATION mission MAIF
-            generer_annulation1(request, societe, extracted_file, temp_file_path)
-        elif 'ANNULATION ORDRE DE MISSION' in texte:
-            # genere ANNULATION mission DOMUS
-            nosin = str(body)[84:95]
-            generer_annulation2(request, societe, nosin, temp_file_path)
-        else:
-            # genere le dossier d'après le mail
-            generer_mission(request, societe, mbx_search, extracted_file, temp_file_path)
+        return nbMessages
    
-    return 

-def resize_photos(image_file):
-    # using the Python Image Library (PIL) to resize an image
-    img_org = Image.open(image_file)
-    # get the size of the original image
-    width_org, height_org = img_org.size
-    # set the resizing factor so the aspect ratio can be retained
-    # factor > 1.0 increases size
-    # factor < 1.0 decreases size
-    factor = 1
-    width = int(width_org * factor)
-    height = int(height_org * factor)
-    # best down-sizing filter
-    img_anti = img_org.resize((width, height), Image.ANTIALIAS)
-    # split image filename into name and extension
-    name, ext = os.path.splitext(image_file)
-    # create a new file name for saving the result
-    img_anti.save(image_file)
+    # ------- main -------
+    logged_in = request.authenticated_userid.upper()
+    url = request.route_url('demandes')
+    message = ''
+    
+    societes = ['PE','ME','PL'] 
+
+    # critères de recherche des demandes d'interventions de la MAIF 
+    # search_criteria = ['FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier"']
+    search_criteria = ['FROM gestionsinistre@maif.fr SUBJECT "Intervention entreprise partenaire"', 
+                       'FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier"']
+    
+    if 'form.submitted' in request.params:
+        # traiter les demandes de la MAIF puis de DOMUS pour toutes les sociétes
+        nbMessages = 0
+        for societe in societes:
+            nb = demandes_generer(request, societe, search_criteria)
+            nbMessages = nbMessages + nb
+        message = "%s demandes de devis a été crées." % nbMessages
+        
+    liste=[]
+    # lister les demandes par societe
+    for societe in societes:
+        liste = liste + demandes_lister(societe, search_criteria) 
+
+    # messages lus
+    msglus = bool(liste)
+    
+    return {
+        'page_title': "Liste des emails de demandes d'intervention",
+        'url': url,
+        'dt_data': json.dumps(liste),
+        'msglus': msglus,
+        'message': message,
+    }

-    return 

 def downloadFile2Temp(input_file, input_name, ext_allowed):
    # récupère son extension
@@ -999,7 +1022,7 @@ def pdf_convert_to_txt(path):
    fh.close()
    # ecrire le texte dans un fichier
    extracted_file = '/tmp/log_file.txt'
-    with open(extracted_file, "w") as my_log:
+    with open(extracted_file, "w", encoding="utf-8") as my_log:
        my_log.write(extracted_text)
        my_log.close()
    
@@ -1008,11 +1031,11 @@ def pdf_convert_to_txt(path):
 def get_pdf_infos1(extracted_file):
    # à partir du fichier texte du pdf
    # parcourir les lignes pour retrouver les infos utiles
-    with open(extracted_file) as fp:
+    with open(extracted_file, encoding="utf-8") as fp:
        cnt = 1
        line = fp.readline()
        # première ligne doit être "MAIF"
-        if line[:-1] != 'MAIF':
+        if line[:-1] not in ['MAIF', 'FILIA-MAIF']:
            return {'c_nom': ''}
        
        c_obs = ''
@@ -1074,7 +1097,7 @@ def get_pdf_infos1(extracted_file):
 def get_pdf_infos2(extracted_file):
    # à partir du fichier texte du pdf de DOMUS
    # parcourir les lignes pour retrouver les infos utiles
-    with open(extracted_file) as fp:
+    with open(extracted_file, encoding="utf-8") as fp:
        cnt = 1
        line = fp.readline()
        # première ligne doit être :
@@ -1130,6 +1153,23 @@ def get_pdf_infos2(extracted_file):
            'no_sinistre': no_sinistre,			
            }
    
+def resize_photos(image_file):
+    # using the Python Image Library (PIL) to resize an image
+    img_org = Image.open(image_file)
+    # get the size of the original image
+    width_org, height_org = img_org.size
+    # set the resizing factor so the aspect ratio can be retained
+    # factor > 1.0 increases size
+    # factor < 1.0 decreases size
+    factor = 1
+    width = int(width_org * factor)
+    height = int(height_org * factor)
+    # best down-sizing filter
+    img_anti = img_org.resize((width, height), Image.ANTIALIAS)
+    # split image filename into name and extension
+    name, ext = os.path.splitext(image_file)
+    # create a new file name for saving the result
+    img_anti.save(image_file)

-
+    return 
    
--- a/production.ini
+++ b/production.ini
@@ -20,7 +20,7 @@ pyramid.includes =
 sqlalchemy.url = mysql://root:cni/@srvbd/bddevfac?charset=utf8
 sqlalchemy.pool_recycle = 3600

-mondumas.admin_email = phuoc@caotek.fr
+mondumas.admin_email = sas.dumas@orange.fr
 mondumas.devfac_url = mondumas:static/DEVFAC/
 mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES