From 2305f4761ee1732e2e7c83d172412167fadc9666 Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Sat, 2 Oct 2021 16:47:32 +0200 Subject: [PATCH] =?UTF-8?q?afficher=20nb=20de=20mails=20=C3=A0=20importer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mondumas/models/default.py | 2 +- mondumas/templates/default/home.pt | 13 ++++++------- mondumas/views/default.py | 15 ++++++--------- mondumas/views/dossier.py | 14 +------------- 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/mondumas/models/default.py b/mondumas/models/default.py index abe1166..c496128 100644 --- a/mondumas/models/default.py +++ b/mondumas/models/default.py @@ -159,6 +159,6 @@ def get_rdv_by_date(request, date, agenda): def get_rdf_null(request): # lire les RDF non validés depuis moins d'un an - query = """SELECT COUNT(*) AS nb_rdf FROM bddevfac.dem_rdf WHERE date_relu IS NULL;""" + query = """SELECT COUNT(*) AS nb_rdf FROM bddevfac.dem_rdf WHERE date_relu IS NULL AND year(date_inter) > 2021;""" results = request.dbsession.execute(query).first() return results.nb_rdf diff --git a/mondumas/templates/default/home.pt b/mondumas/templates/default/home.pt index 2be901c..33725e0 100644 --- a/mondumas/templates/default/home.pt +++ b/mondumas/templates/default/home.pt @@ -10,7 +10,7 @@
AGENDA - RDV JOUR  ${nb_rdv} + RDV JOUR : ${nb_rdv}
@@ -21,7 +21,7 @@
RDF - À VALIDER  ${nb_rdf} + À VALIDER : ${nb_rdf}
s @@ -56,8 +56,7 @@
EMAILS - À IMPORTER : - ${nb_mails} + À IMPORTER : ${nb_mails}
@@ -84,7 +83,7 @@
DEM. DEVIS À TRAITER - ${nb_dd_restants.nb_PE} + ${nb_dd_restants.nb_PE} ${nb_dd_restants.nb_ME} ${nb_dd_restants.nb_PL}
@@ -98,7 +97,7 @@
CHANTIERS DERNIERS SUIVIS - ${nb_de_restants.nb_PE} + ${nb_de_restants.nb_PE} ${nb_de_restants.nb_ME} ${nb_de_restants.nb_PL}
@@ -112,7 +111,7 @@
FACTURES À RÉGLER - ${nb_fa_restants.nb_PE} + ${nb_fa_restants.nb_PE} ${nb_fa_restants.nb_ME} ${nb_fa_restants.nb_PL}
diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 6f2c28a..bd627f3 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -125,7 +125,7 @@ def home(request): 'FROM service.sinistres@domus-services.fr UNDELETED'] nb_mails = 0 - """ + # lister les demandes par societe for societe in societes: conn = mailbox_connect(request, societe) @@ -136,17 +136,14 @@ def home(request): # créer la liste des entêtes des messages à afficher for criteria in search_criteria: rv, data = conn.search(None, criteria) - if rv != 'OK': - request.session.flash("ERREUR de lecture de la boîte de réception", 'danger') - return HTTPFound(location=request.route_url('home')) - - # ng de mails dans la mailbax - nb_mails += len(data[0]) + # nb de mails dans la mailbax + mail_ids = data[0] + nb_mails += len(mail_ids.split()) # deconnexion du serveur conn.close() conn.logout() - """ + return { 'page_title': 'Bienvenue sur %s' % request.host, 'project': 'mondumas', @@ -154,7 +151,7 @@ def home(request): 'logged_in': logged_in, 'nb_dd_restants': nb_dd_restants, 'nb_de_restants': nb_de_restants, - # 'nb_fa_restants': nb_fa_restants, + 'nb_fa_restants': nb_fa_restants, 'nb_rdv': nb_rdv, 'nb_rdf': nb_rdf, 'nb_mails': nb_mails, diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index 5d578ac..5c52e72 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -1,17 +1,10 @@ # -*- coding: utf8 -*- -from pyramid.response import Response -from pyramid.renderers import render, get_renderer from pyramid.view import ( view_config, - forbidden_view_config, ) from pyramid.httpexceptions import ( HTTPFound, - HTTPNotFound, - HTTPForbidden, ) -from pyramid_mailer import get_mailer -from pyramid_mailer.message import Message, Attachment from datetime import * @@ -20,7 +13,6 @@ import os import io import shutil import pdfkit -import imaplib import base64 import email @@ -56,11 +48,9 @@ def dossier_lookup(request): member = get_member_by_id(request, logged_in) societe_defaut = member.societe societe = societe_defaut - access_defaut = member.access liste=[] name = '' - cb_tous = "non" - + if 'form.submitted' in request.params: name = request.params['name'] societe = request.params['societe'] @@ -959,8 +949,6 @@ def demandes(request): for societe in societes: emails = emails + demandes_lister(societe, search_criteria) - # messages lus - msglus = bool(emails) dossiers_traites = get_dossiers_importes(request) return {