remettre demandes.pt comme avant

This commit is contained in:
2021-08-23 12:15:45 +02:00
parent 0f37a80263
commit 4a0810acb3
6 changed files with 26 additions and 6 deletions

7
.vscode/launch.json vendored
View File

@@ -8,11 +8,12 @@
"type": "python", "type": "python",
"request": "launch", "request": "launch",
"name": "Pserve", "name": "Pserve",
"python": "/Users/Thien-An/AppData/Local/Programs/Python/Python37", "python": "C:/pyramid10/Scripts/python.exe",
"program": "/pyramid/Scripts/pserve", "program": "/pyramid10/Scripts/pserve.exe",
"args": [ "args": [
"-v", "-v",
"development.ini" "development.ini",
"--reload"
], ],
"console": "integratedTerminal", "console": "integratedTerminal",
"debugOptions": [ "debugOptions": [

View File

@@ -1,5 +1,5 @@
{ {
"html.validate.scripts": false, "html.validate.scripts": false,
"editor.minimap.enabled": false, "editor.minimap.enabled": false,
"python.pythonPath": "C:\\Users\\Thien-An\\AppData\\Local\\Programs\\Python\\Python37\\python.exe" "python.pythonPath": "C:\\pyramid10\\Scripts\\python.exe"
} }

View File

@@ -53,6 +53,11 @@ def get_dossiers_traites(request, societe):
results = request.dbsession.execute(query, {'societe': societe}).fetchall() results = request.dbsession.execute(query, {'societe': societe}).fetchall()
return results return results
def get_dossiers_importes(request):
query = "SELECT * FROM dem_devis WHERE usermaj='EMAIL' ORDER BY DATEMAJ";
results = request.dbsession.execute(query).fetchall()
return results
def get_clients_byName(request, societe, nom): def get_clients_byName(request, societe, nom):
query = "SELECT * FROM clients WHERE societe = '%s' and nom LIKE '%s';" % (societe, nom + '%'); query = "SELECT * FROM clients WHERE societe = '%s' and nom LIKE '%s';" % (societe, nom + '%');
results = request.dbsession.execute(query).fetchall() results = request.dbsession.execute(query).fetchall()

View File

@@ -31,6 +31,18 @@
</tr> </tr>
</table> </table>
<br />
<h2>Dossiers générés à contrôler</h2>
<table class="table table-condensed">
<tr tal:repeat="item dossiers_traites">
<td>${item.DATEMAJ.strftime('%d %b')}</td>
<td><a href="${request.application_url}/dossier_view/${item.societe}-${item.NO_ID}">${item.societe}-${item.NO_ID}</td>
<td>${item.NOMCLI}</td>
<td>${item.C_NOM}</td>
<td>${item.USERMAJ}</td>
</tr>
</table>
<br /> <br />
<br /> <br />

View File

@@ -962,11 +962,13 @@ def demandes(request):
# messages lus # messages lus
msglus = bool(emails) msglus = bool(emails)
dossiers_traites = get_dossiers_importes(request)
return { return {
'page_title': "Liste des emails de demandes d'intervention", 'page_title': "Liste des emails de demandes d'intervention",
'url': url, 'url': url,
'emails': emails, 'emails': emails,
'dossiers_traites': dossiers_traites,
} }
@view_config(route_name='demandes_dl', permission='view') @view_config(route_name='demandes_dl', permission='view')