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

email_sent.pt : order by sent date descending

Browse Source
This commit is contained in:
Phuoc
2019-08-27 08:59:12 +02:00
parent 6859ddcacd
commit fcf08eea4f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mondumas/models/parametres.py
View File

@@ -63,7 +63,7 @@ def get_emails_sent(request, nolig):
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.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, {'datedeb': datedeb}).fetchall()
else: else:
query = """SELECT * FROM dem_lig WHERE nolig=:nolig;""" query = """SELECT * FROM dem_lig WHERE nolig=:nolig;"""

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

@@ -41,7 +41,8 @@
return '<a href="/emails_msg/' + row[4] + '">' + data + '</a>'; return '<a href="/emails_msg/' + row[4] + '">' + data + '</a>';
}, },
}, },
] ],
order: [[0, 'desc']],
}); });
}); });

1
mondumas/views/default.py
View File

@@ -197,7 +197,6 @@ def login(request):
record = get_member_by_id(request, login) record = get_member_by_id(request, login)
if record : if record :
# mot de passe hash valide ? # mot de passe hash valide ?
import pdb;pdb.set_trace()
if record.mdp == to_sha1(password) and record.actif == 1: if record.mdp == to_sha1(password) and record.actif == 1:
# get user agent string from request # get user agent string from request
ua_string = request.user_agent ua_string = request.user_agent