diff --git a/.vscode/launch.json b/.vscode/launch.json index 9a0f16f..c722280 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,11 +8,12 @@ "type": "python", "request": "launch", "name": "Pserve", - "python": "/Users/Thien-An/AppData/Local/Programs/Python/Python37", - "program": "/pyramid/Scripts/pserve", + "python": "C:/pyramid10/Scripts/python.exe", + "program": "/pyramid10/Scripts/pserve.exe", "args": [ "-v", - "development.ini" + "development.ini", + "--reload" ], "console": "integratedTerminal", "debugOptions": [ diff --git a/.vscode/settings.json b/.vscode/settings.json index 0bf16ae..d5d9279 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { "html.validate.scripts": 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" } \ No newline at end of file diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py index c083c19..81b2c9c 100644 --- a/mondumas/models/dossier.py +++ b/mondumas/models/dossier.py @@ -53,6 +53,11 @@ def get_dossiers_traites(request, societe): results = request.dbsession.execute(query, {'societe': societe}).fetchall() 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): query = "SELECT * FROM clients WHERE societe = '%s' and nom LIKE '%s';" % (societe, nom + '%'); results = request.dbsession.execute(query).fetchall() diff --git a/mondumas/templates/dossier/demandes.pt b/mondumas/templates/dossier/demandes.pt index 37707ec..e2e390a 100644 --- a/mondumas/templates/dossier/demandes.pt +++ b/mondumas/templates/dossier/demandes.pt @@ -29,6 +29,18 @@ class="btn btn-primary btn-sm"> + + +
+

Dossiers générés à contrôler

+ + + + + + + +
${item.DATEMAJ.strftime('%d %b')}${item.societe}-${item.NO_ID}${item.NOMCLI}${item.C_NOM}${item.USERMAJ}

diff --git a/mondumas/views/default.py b/mondumas/views/default.py index cdf238f..ee28443 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -114,7 +114,7 @@ def home(request): nb_dd_restants = get_dd_restant(request) nb_de_restants = get_de_restant(request) nb_fa_restants = get_fa_restant(request) - + nb_rdv = get_rdv_by_date(request, datedeb, agenda) nb_rdf = get_rdf_null(request) @@ -124,7 +124,7 @@ def home(request): # critères de recherche des demandes d'interventions de la MAIF search_criteria = ['FROM gestionsinistre@maif.fr SUBJECT "Intervention entreprise partenaire" UNDELETED', 'FROM service.sinistres@domus-services.fr UNDELETED'] - + nb_mails = 0 # lister les demandes par societe for societe in societes: diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index 55c36e4..4a9ee1b 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -962,11 +962,13 @@ def demandes(request): # messages lus msglus = bool(emails) + dossiers_traites = get_dossiers_importes(request) return { 'page_title': "Liste des emails de demandes d'intervention", 'url': url, 'emails': emails, + 'dossiers_traites': dossiers_traites, } @view_config(route_name='demandes_dl', permission='view')