phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

affichage des emails envoyés par societe

Browse Source
This commit is contained in:
Phuoc
2019-09-23 14:36:58 +02:00
parent 375f676edc
commit ebf3efef9a
4 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mondumas/models/parametres.py
View File

@@ -54,17 +54,17 @@ def get_rdf_causes_by_id(request, code):
results = request.dbsession.execute(query, {'code': code}).first() results = request.dbsession.execute(query, {'code': code}).first()
return results return results
def get_emails_sent(request, nolig): def get_emails_sent(request, societe, nolig):
d = datetime.now() d = datetime.now()
d = d - dateutil.relativedelta.relativedelta(months=1) d = d - dateutil.relativedelta.relativedelta(months=2)
# début du mois M-3 # début du mois M-3
datedeb = d.strftime('%Y-%m-%d') datedeb = d.strftime('%Y-%m-%d')
if nolig == 0: 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 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 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;""" WHERE l.societe = :societe AND l.date >= :datedeb AND l.comment LIKE 'Envoi email -> %' ORDER BY l.datemaj;"""
results = request.dbsession.execute(query, {'datedeb': datedeb}).fetchall() results = request.dbsession.execute(query, {'societe': societe, 'datedeb': datedeb}).fetchall()
else: else:
query = """SELECT * FROM dem_lig WHERE nolig=:nolig;""" query = """SELECT * FROM dem_lig WHERE nolig=:nolig;"""
results = request.dbsession.execute(query, {'nolig': nolig}).first() results = request.dbsession.execute(query, {'nolig': nolig}).first()

47
mondumas/templates/parametres/emails_sent.pt
View File

@@ -1,23 +1,42 @@
<metal:block use-macro="main_template"> <metal:block use-macro="main_template">
<div metal:fill-slot="content"> <div metal:fill-slot="content">
<p> <div class="row">
<form id="emails_sent_form" 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="$('#emails_sent_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>
<a href="${request.application_url}/" class="btn btn-default" role="button"> <a href="${request.application_url}/" class="btn btn-default" role="button">
<span class="glyphicon glyphicon-chevron-left"></span> Retour</a> <span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
</p> </form>
</div>
<table id="emails_sent" class="table table-striped table-bordered"> <div class="row">
<thead> <table id="emails_sent" class="table table-striped table-bordered">
<tr> <thead>
<th>Date</th> <tr>
<th>Dossier</th> <th>Date</th>
<th>Client</th> <th>Dossier</th>
<th>Objet</th> <th>Client</th>
<th>No</th> <th>Objet</th>
<th>Par</th> <th>No</th>
</tr> <th>Par</th>
</thead> </tr>
</table> </thead>
</table>
</div>
<br /> <br />
<br /> <br />

6
mondumas/views/dossier.py
View File

@@ -720,14 +720,14 @@ def demandes(request):
# lire le INBOX # lire le INBOX
rv, data = conn.select('INBOX', readonly =True) 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 # traiter les demandes de la MAIF puis de DOMUS
# demandes_generer(request, conn, societe, mbx_search1) # demandes_generer(request, conn, societe, mbx_search1)
demandes_generer(request, conn, societe, mbx_search2) # demandes_generer(request, conn, societe, mbx_search2)
liste=[] liste=[]
# lire les demandes de la MAIF puis de DOMUS # 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) demandes_afficher(conn, mbx_name, mbx_search2, liste)
# messages lus # messages lus
msglus = bool(liste) msglus = bool(liste)

11
mondumas/views/parametres.py
View File

@@ -314,8 +314,15 @@ def rdf_cause_edit(request):
} }
@view_config(route_name='emails_sent', renderer='../templates/parametres/emails_sent.pt', permission='view') @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 # lire les messages envoyés
items = get_emails_sent(request, societe, 0) items = get_emails_sent(request, societe, 0)
# construire la liste # construire la liste
@@ -327,6 +334,8 @@ def emails_sent(request):
return { return {
'page_title': u'Liste des emails envoyés', 'page_title': u'Liste des emails envoyés',
'dt_data': json.dumps(liste),
'societe': societe,
'societes': societes, 'societes': societes,
} }