diff --git a/mondumas/models/parametres.py b/mondumas/models/parametres.py index 0d64056..0c59d81 100644 --- a/mondumas/models/parametres.py +++ b/mondumas/models/parametres.py @@ -54,17 +54,17 @@ def get_rdf_causes_by_id(request, code): results = request.dbsession.execute(query, {'code': code}).first() return results -def get_emails_sent(request, nolig): +def get_emails_sent(request, societe, nolig): d = datetime.now() - d = d - dateutil.relativedelta.relativedelta(months=1) + d = d - dateutil.relativedelta.relativedelta(months=2) # début du mois M-3 datedeb = d.strftime('%Y-%m-%d') if nolig == 0: query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.datemaj, l.comment, l.nolig, l.usermaj, e.nomcli FROM dem_lig l INNER JOIN dem_devis e ON l.societe=e.societe AND l.no_id=e.no_id - WHERE l.date >= :datedeb AND l.comment LIKE 'Envoi email -> %' ORDER BY l.datemaj;""" - results = request.dbsession.execute(query, {'datedeb': datedeb}).fetchall() + WHERE l.societe = :societe AND l.date >= :datedeb AND l.comment LIKE 'Envoi email -> %' ORDER BY l.datemaj;""" + results = request.dbsession.execute(query, {'societe': societe, 'datedeb': datedeb}).fetchall() else: query = """SELECT * FROM dem_lig WHERE nolig=:nolig;""" results = request.dbsession.execute(query, {'nolig': nolig}).first() diff --git a/mondumas/templates/parametres/emails_sent.pt b/mondumas/templates/parametres/emails_sent.pt index 7da54d7..6fedd9f 100644 --- a/mondumas/templates/parametres/emails_sent.pt +++ b/mondumas/templates/parametres/emails_sent.pt @@ -1,23 +1,42 @@
-

+

+
+ +
+ +
+ +
+
Retour -

- - - - - - - - - - - - -
DateDossierClientObjetNoPar
+
+
+ +
+ + + + + + + + + + + +
DateDossierClientObjetNoPar
+


diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index 906ba35..8fbd333 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -720,14 +720,14 @@ def demandes(request): # lire le INBOX rv, data = conn.select('INBOX', readonly =True) - if 'form.submitted' in request.params: + # 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) + # 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_search1, liste) demandes_afficher(conn, mbx_name, mbx_search2, liste) # messages lus msglus = bool(liste) diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py index 5f43b8a..5f67bba 100644 --- a/mondumas/views/parametres.py +++ b/mondumas/views/parametres.py @@ -314,8 +314,15 @@ def rdf_cause_edit(request): @view_config(route_name='emails_sent', renderer='../templates/parametres/emails_sent.pt', permission='view') def emails_sent(request): + + societes = ['PE','ME','PL','PO','CD'] + societe = 'PE' + # prendre en compte les paramètres de saisie + if 'societe' in request.params: + societe = request.params["societe"] + # lire les messages envoyés - items = get_emails_sent(request, 0) + items = get_emails_sent(request, societe, 0) # construire la liste liste=[] @@ -327,6 +334,8 @@ def emails_sent(request): return { 'page_title': u'Liste des emails envoyés', 'dt_data': json.dumps(liste), + 'societe': societe, + 'societes': societes, } @view_config(route_name='emails_msg', renderer='../templates/parametres/emails_msg.pt', permission='view')