From 4af57cb876caa697c8c4bb30a786ad760844633b Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Sun, 3 Jan 2021 11:31:21 +0100
Subject: [PATCH] =?UTF-8?q?possibilit=C3=A9=20d'annoter=20les=20t=C3=A9l?=
 =?UTF-8?q?=C3=A9phones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mondumas/templates/dossier/dossier_edit.pt | 42 +++++++++-------------
 mondumas/templates/dossier/dossier_view.pt |  6 ++--
 mondumas/views/dossier.py                  |  7 ++--
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/mondumas/templates/dossier/dossier_edit.pt b/mondumas/templates/dossier/dossier_edit.pt
index 45a07ed..61683df 100644
--- a/mondumas/templates/dossier/dossier_edit.pt
+++ b/mondumas/templates/dossier/dossier_edit.pt
@@ -86,47 +86,39 @@
             </div>
         </div>
        <div class="form-group">
-            <label class="col-xs-3 control-label">Téléphone fixe</label>
+            <label class="col-xs-3 control-label">Téléphone</label>
             <div class="col-xs-5">
-                <input class="form-control" type="text" name="C_TEL1" 
-                    value="${dossier.C_TEL1}" placeholder="20 caractères maximum" 
-                data-fv-phone="true"
-                data-fv-phone-country="FR"
-                data-fv-phone-message="Ce numéro de téléphone n'est pas valide" />
+                <input class="form-control" type="text" name="C_TEL1" value="${dossier.C_TEL1}" 
+                    data-fv-stringlength="true"
+                    data-fv-stringlength-max="30"
+                    data-fv-stringlength-message="30 caractères maximum" />
             </div>
         </div>
         <div class="form-group">
             <label class="col-xs-3 control-label">Téléphone prof.</label>
             <div class="col-xs-5">
-                <input class="form-control" type="text" name="C_TEL2" 
-                    value="${dossier.C_TEL2}" placeholder="20 caractères maximum" 
-                data-fv-phone="true"
-                data-fv-phone-country="FR"
-                data-fv-phone-message="Ce numéro de téléphone n'est pas vailde" />
+                <input class="form-control" type="text" name="C_TEL2" value="${dossier.C_TEL2}" 
+                    data-fv-stringlength="true"
+                    data-fv-stringlength-max="30"
+                    data-fv-stringlength-message="30 caractères maximum" />
             </div>
         </div>
         <div class="form-group">
             <label class="col-xs-3 control-label">Portable 1</label>
             <div class="col-xs-5">
-                <input class="form-control" type="text" name="C_TELP" 
-                    value="${dossier.C_TELP}" placeholder="20 caractères maximum" 
-                data-fv-phone="true"
-                data-fv-phone-country="FR"
-                data-fv-phone-message="Ce numéro de téléphone n'est pas vailde" />
+                <input class="form-control" type="text" name="C_TELP" value="${dossier.C_TELP}"  
+                    data-fv-stringlength="true"
+                    data-fv-stringlength-max="30"
+                    data-fv-stringlength-message="30 caractères maximum" />
             </div>
         </div>
         <div class="form-group">
             <label class="col-xs-3 control-label">Portable 2</label>
             <div class="col-xs-5">
-                <input class="form-control" type="text" name="C_FAX" 
-                    value="${dossier.C_FAX}" placeholder="20 caractères maximum" 
-                    data-fv-phone="true"
-                    data-fv-phone-country="FR"
-                    data-fv-phone-message="Ce numéro de téléphone n'est pas vailde" />
-            </div>
-            <div class="col-xs-4">
-                <input class="form-control" type="text" name="C_FAX_CMT" 
-                    value="${dossier.C_FAX_CMT}" placeholder="20 caractères maximum"  />
+                <input class="form-control" type="text" name="C_FAX" value="${dossier.C_FAX}" 
+                    data-fv-stringlength="true"
+                    data-fv-stringlength-max="30"
+                    data-fv-stringlength-message="30 caractères maximum" />
             </div>
         </div>
         
diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt
index e8f8005..6ea1a58 100644
--- a/mondumas/templates/dossier/dossier_view.pt
+++ b/mondumas/templates/dossier/dossier_view.pt
@@ -26,15 +26,15 @@
                     <td>
                         Etage - Code<br />
 						Ascenseur<br />
-                        Tél. domicile - prof.<br />
-                        Portable 1 - Portable 2
+                        Téléphone 1 et 2<br />
+                        Portable 1 et 2
                     </td>
                     <td>
                         ${dossier.C_ETAGE} - ${dossier.C_CODE}<br />
 						<span tal:condition="dossier.c_ascenseur==0">NON<br /></span>
 						<span tal:condition="dossier.c_ascenseur!=0">OUI<br /></span>
                         ${dossier.C_TEL1} - ${dossier.C_TEL2}<br />
-                        ${dossier.C_TELP} - ${dossier.C_FAX} (${dossier.C_FAX_CMT})
+                        ${dossier.C_TELP} - ${dossier.C_FAX} 
                     </td>
                 </tr>
                 <tr>
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 05c1060..73265b2 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -326,7 +326,7 @@ def upload_doc(request):
 @view_config(route_name='upload_img', renderer='../templates/dossier/upload_img.pt', permission='view')
 def upload_img(request):
     # Paramètres d'appel :
-    # - gérer images d'un dossier : upload_img/nodossier/0
+    # - gérer images d'un dossier : upload_img/nodossier/z0
     # - gérer images d'un rapport RDF : upload_img/norapport/nosection
     nosection = request.matchdict['nosection']
     # Gérer les photos d'un dossier (nosection=0) ?
@@ -858,7 +858,8 @@ def demandes(request):
     # 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" UNDELETED'] "
     search_criteria = ['FROM gestionsinistre@maif.fr SUBJECT "Intervention entreprise partenaire"', 
-                      'FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier" UNDELETED']
+                      'FROM service.sinistres@domus-services.fr UNDELETED']
+    # 'FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier" UNDELETED']
             
     emails=[]
     # lister les demandes par societe
@@ -1395,7 +1396,7 @@ def resize_photos(image_file):
     # set the resizing factor so the aspect ratio can be retained
     # factor > 1.0 increases size
     # factor < 1.0 decreases size
-    factor = 1
+    factor = 0.50
     width = int(width_org * factor)
     height = int(height_org * factor)
     # best down-sizing filter