From 681c9ebfbdb8dbe1f09907a26770e0368c219ef2 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Thu, 23 Jul 2020 15:50:33 +0200
Subject: [PATCH] bug creation rdv

---
 development.ini                    |  2 +-
 mondumas/templates/default/home.pt |  3 ++-
 mondumas/views/agenda.py           |  4 ++--
 mondumas/views/dossier.py          | 14 +++++++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/development.ini b/development.ini
index 162a951..6234a0d 100644
--- a/development.ini
+++ b/development.ini
@@ -20,7 +20,7 @@ pyramid.includes =
 
     
 sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8
-# sqlalchemy.url = mysql://root:cni/@srvbd/bddevfac?charset=utf8
+# sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8
 
 mondumas.admin_email = cao.thien-phuoc@orange.fr
 mondumas.devfac_url = mondumas:static/DEVFAC/
diff --git a/mondumas/templates/default/home.pt b/mondumas/templates/default/home.pt
index 474fbde..1bcd02b 100644
--- a/mondumas/templates/default/home.pt
+++ b/mondumas/templates/default/home.pt
@@ -10,7 +10,8 @@
 				<span class="glyphicon glyphicon-calendar logo-small"></span><br />
 				<h4>MON AGENDA</h4></a>				
 		</div>
-		<div class="col-sm-3" tal:condition="access >= 8">
+		<!-- autorisé que pour les gestionnaires-->
+		<div class="col-sm-3" tal:condition="access >= 5">
 			<a href="${request.application_url}/planning/today">
 				<span class="glyphicon glyphicon-calendar logo-small"></span><br />
 				<h4>PLANNING</h4></a>				
diff --git a/mondumas/views/agenda.py b/mondumas/views/agenda.py
index 5998cbf..636614b 100644
--- a/mondumas/views/agenda.py
+++ b/mondumas/views/agenda.py
@@ -45,7 +45,7 @@ def rdv_edit(request):
         rdv['C_NOM'] = ''
         rdv['rdv_debut'] = datetime.today()
         rdv['COMMENT'] = ''
-        rdv['LISTE'] = logged_in
+        rdv['LISTE'] = ''
         rdv['DATEMAJ'] = date.today()
         rdv['USERMAJ'] = logged_in
         page_title = "Nouveau rendez-vous"
@@ -65,7 +65,7 @@ def rdv_edit(request):
                 new_values[param] = request.params[param]
 
         if new_values:
-            new_values['USERMAJ'] = logged_in.upper()
+            new_values['USERMAJ'] = logged_in
             ddate = datetime.strptime(new_values['rdv_debut'], '%d-%m-%Y %H:%M')
             update_rdv(request, nodossier, nolig, new_values)
             request.session.flash(u"Le rendez-vous a été mis à jour avec succès.", 'success')
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 66d1ce6..b5ec7a0 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -942,7 +942,7 @@ def demandes(request):
         # connecter au serveur de mail
         conn = mailbox_connect(societe)
         # select INBOX
-        rv, data = conn.select('INBOX', readonly =True)
+        rv, data = conn.select('INBOX')
     
         nbLus = 0
         nbCrees = 0
@@ -955,6 +955,7 @@ def demandes(request):
                 return HTTPFound(location=request.route_url('home'))
             
             mail_ids = data[0]
+            # parcourir la liste des UID 
             for num in mail_ids.split():
                 rv, msg_data = conn.fetch(num, '(RFC822)')
                 if rv != 'OK':
@@ -989,21 +990,24 @@ def demandes(request):
                     # import pdb;pdb.set_trace()
                     n = generer_annul_maif(request, societe, extracted_file, temp_file_path)
                     nbAnnules = nbAnnules + n
-                    # conn.store(num, '+FLAGS', r'(\Deleted)')
+                    # déplacer le message dans la poubelle
+                    conn.uid('STORE',num, '+FLAGS', '(\\Deleted)')
                 elif 'ANNULATION ORDRE DE MISSION' in texte:
                     # genere ANNULATION mission DOMUS
                     nosin = str(body)[84:95]
                     # import pdb;pdb.set_trace()
                     n = generer_annul_domus(request, societe, nosin, temp_file_path)
                     nbAnnules = nbAnnules + n
-                    # conn.store(num, '+FLAGS', r'(\Deleted)')
+                    # déplacer le message dans la poubelle
+                    conn.uid('STORE',num, '+FLAGS', '(\\Deleted)')
                 else:
                     # genere le dossier d'après le mail
                     # import pdb;pdb.set_trace()
                     n = generer_mission(request, societe, criteria, extracted_file, temp_file_path)
                     nbCrees = nbCrees + n
-                    # marquer le message comme supprimé
-                    # conn.store(num, '+FLAGS', r'(\Deleted)')
+                    import pdb;pdb.set_trace()
+                    # déplacer le message dans la poubelle
+                    conn.uid('STORE',num, '+FLAGS', '(\\Deleted)')
         
         conn.expunge()
         conn.close()