From 7a436e221885ec5bb8f02f4d0cbc73944f938870 Mon Sep 17 00:00:00 2001 From: thienan Date: Tue, 6 Jul 2021 10:37:34 +0200 Subject: [PATCH] migration new_home + ajout tableaux devis et factures --- development.ini | 4 +- mondumas/models/default.py | 295 ++++--- mondumas/models/dossier.py | 12 +- mondumas/models/parametres.py | 36 +- mondumas/routes.py | 6 +- .../{parametres => default}/new_home.pt | 40 +- mondumas/templates/dossier/devis_en_att.pt | 30 + mondumas/templates/dossier/factures_en_att.pt | 30 + mondumas/views/default.py | 805 ++++++++++-------- mondumas/views/dossier.py | 54 +- mondumas/views/parametres.py | 95 --- mondumas/views/stats.py | 4 +- 12 files changed, 757 insertions(+), 654 deletions(-) rename mondumas/templates/{parametres => default}/new_home.pt (76%) create mode 100644 mondumas/templates/dossier/devis_en_att.pt create mode 100644 mondumas/templates/dossier/factures_en_att.pt diff --git a/development.ini b/development.ini index 7bbc137..552442e 100644 --- a/development.ini +++ b/development.ini @@ -19,8 +19,8 @@ pyramid.includes = pyramid_tm -sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8 -#sqlalchemy.url = mysql://phuoc:phuoc!@192.168.1.17/bddevfac?charset=utf8 +#sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8 +sqlalchemy.url = mysql://phuoc:phuoc!@192.168.1.17/bddevfac?charset=utf8 # sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8 mondumas.admin_email = cao.thien-phuoc@orange.fr diff --git a/mondumas/models/default.py b/mondumas/models/default.py index bd59530..128f77a 100644 --- a/mondumas/models/default.py +++ b/mondumas/models/default.py @@ -1,131 +1,164 @@ -# -*- coding: utf8 -*- -from sqlalchemy import text -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import ( - scoped_session, - sessionmaker, -) -from zope.sqlalchemy import ( - ZopeTransactionExtension, - mark_changed -) - -from datetime import * -import transaction - -def execute_query(request, query, params): - """Execute query and mark session as changed""" - request.dbsession.execute(query, params) - mark_changed(request.dbsession) - transaction.commit() - -def get_userAccess(request, logged_in): - member = get_member_by_id(request, logged_in) - if member: - return member.access - else: - return 0 - -def get_member_by_mdp_oublie(request, lien): - query = "SELECT * FROM p_users WHERE mdp_oublie=:lien;" - results = request.dbsession.execute(query, {'lien':lien}).first() - return results - -def get_member_by_id(request, mbr_id): - if mbr_id == '0': - query = "SELECT * FROM p_users ORDER BY cd_uti" - results = request.dbsession.execute(query).fetchall() - else: - # lire le membres par son identifianr - query = """SELECT * FROM p_users WHERE CD_UTI=:mbr_id;""" - results = request.dbsession.execute(query, {'mbr_id': mbr_id}).first() - return results - -def get_member_info(request, logged_in): - # lire le membres par son identifianr - query = """SELECT nom, email, access, societe FROM p_users WHERE CD_UTI=:logged_in;""" - results = request.dbsession.execute(query, {'logged_in': logged_in}).first() - if results.access == 9: - fonction = 'Administrateur' - elif results.access == 8: - fonction = 'Comptabilité' - elif results.access == 5: - fonction = 'Gestion' - else: - fonction = 'Production' - - return { - 'nom': results.nom, - 'email': results.email, - 'fonction': fonction, - 'societe': results.societe, - } - -def update_membre_mdp_oublie(request, login): - import uuid, base64 - # get a UUID - URL safe, Base64 - - uid = uuid.uuid1() - urlslug = base64.urlsafe_b64encode(uid.bytes).decode("utf-8").rstrip('=\n').replace('/', '_') - query = "UPDATE p_users SET mdp_oublie=:urlslug, mdp_oublie_date=now() WHERE CD_UTI=:login;" - execute_query(request, query, {'urlslug':urlslug, 'login':login}) - - return urlslug - -def update_membre_mdp(request, login, password): - """Update password for member login""" - query = "UPDATE p_users SET mdp = SHA1(:password), mdp_oublie=NULL, mdp_oublie_date=NULL WHERE cd_uti=:login;" - execute_query(request, query, {'login': login, 'password': password}) - -def update_last_connection(request, login, ua_string): - """Update last connection for login """ - query = "UPDATE p_users SET dern_cnx_le=NOW(), ua_string=:ua_string WHERE cd_uti=:login;" - execute_query(request, query, {'login': login, 'ua_string': ua_string}) - -def update_membre(request, cd_uti, new_values): - # formater les champs - s = '' - for param in new_values.keys(): - if param == 'nom': - new_values['nom'] = new_values['nom'].upper() - if param == 'access': - ' ne prend que le 1er caractère' - new_values['access'] = new_values['access'][0] - - if s: - s += ",%s=:%s" % (param, param) - else: - s = "%s=:%s" % (param, param) - - if cd_uti == '0': - query = "INSERT INTO p_users SET %s" % s - else: - new_values['cd_uti'] = cd_uti - query = "UPDATE p_users SET %s WHERE cd_uti = :cd_uti;" % s - execute_query(request, query, new_values) - -def delete_membre(request, cd_uti): - query = "DELETE FROM p_users WHERE cd_uti = :cd_uti ;" - execute_query(request, query, {'cd_uti': cd_uti}) - -def get_article(request, type, groupe, libelle): - if type == 'LIB': - if groupe == 'TEXTE': - # lire tous les textes dont le libelle commençe par - query = "SELECT * FROM tarifs WHERE groupe='TEXTE' and libelle like :libelle;" - results = request.dbsession.execute(query, {'libelle': libelle + "%"}).fetchall() - else: - # lire tous les tarifs du grupe dont le ref commençe par libelle - query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref like :libelle;" - results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle + "%"}).fetchall() - else: - # lire tous les tarif du grupe dont le ref est égale à - query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref = :libelle;" - results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle}).first() - return results - -def get_codespostaux(request, codep): - query = "SELECT * FROM p_codespostaux WHERE code_postal LIKE :code;" - results = request.dbsession.execute(query, {'code': codep+"%"}).fetchall() - return results - +# -*- coding: utf8 -*- +from sqlalchemy import text +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import ( + scoped_session, + sessionmaker, +) +from zope.sqlalchemy import ( + ZopeTransactionExtension, + mark_changed +) + +from datetime import * +import transaction + +def execute_query(request, query, params): + """Execute query and mark session as changed""" + request.dbsession.execute(query, params) + mark_changed(request.dbsession) + transaction.commit() + +def get_userAccess(request, logged_in): + member = get_member_by_id(request, logged_in) + if member: + return member.access + else: + return 0 + +def get_member_by_mdp_oublie(request, lien): + query = "SELECT * FROM p_users WHERE mdp_oublie=:lien;" + results = request.dbsession.execute(query, {'lien':lien}).first() + return results + +def get_member_by_id(request, mbr_id): + if mbr_id == '0': + query = "SELECT * FROM p_users ORDER BY cd_uti" + results = request.dbsession.execute(query).fetchall() + else: + # lire le membres par son identifianr + query = """SELECT * FROM p_users WHERE CD_UTI=:mbr_id;""" + results = request.dbsession.execute(query, {'mbr_id': mbr_id}).first() + return results + +def get_member_info(request, logged_in): + # lire le membres par son identifianr + query = """SELECT nom, email, access, societe FROM p_users WHERE CD_UTI=:logged_in;""" + results = request.dbsession.execute(query, {'logged_in': logged_in}).first() + if results.access == 9: + fonction = 'Administrateur' + elif results.access == 8: + fonction = 'Comptabilité' + elif results.access == 5: + fonction = 'Gestion' + else: + fonction = 'Production' + + return { + 'nom': results.nom, + 'email': results.email, + 'fonction': fonction, + 'societe': results.societe, + } + +def update_membre_mdp_oublie(request, login): + import uuid, base64 + # get a UUID - URL safe, Base64 + + uid = uuid.uuid1() + urlslug = base64.urlsafe_b64encode(uid.bytes).decode("utf-8").rstrip('=\n').replace('/', '_') + query = "UPDATE p_users SET mdp_oublie=:urlslug, mdp_oublie_date=now() WHERE CD_UTI=:login;" + execute_query(request, query, {'urlslug':urlslug, 'login':login}) + + return urlslug + +def update_membre_mdp(request, login, password): + """Update password for member login""" + query = "UPDATE p_users SET mdp = SHA1(:password), mdp_oublie=NULL, mdp_oublie_date=NULL WHERE cd_uti=:login;" + execute_query(request, query, {'login': login, 'password': password}) + +def update_last_connection(request, login, ua_string): + """Update last connection for login """ + query = "UPDATE p_users SET dern_cnx_le=NOW(), ua_string=:ua_string WHERE cd_uti=:login;" + execute_query(request, query, {'login': login, 'ua_string': ua_string}) + +def update_membre(request, cd_uti, new_values): + # formater les champs + s = '' + for param in new_values.keys(): + if param == 'nom': + new_values['nom'] = new_values['nom'].upper() + if param == 'access': + ' ne prend que le 1er caractère' + new_values['access'] = new_values['access'][0] + + if s: + s += ",%s=:%s" % (param, param) + else: + s = "%s=:%s" % (param, param) + + if cd_uti == '0': + query = "INSERT INTO p_users SET %s" % s + else: + new_values['cd_uti'] = cd_uti + query = "UPDATE p_users SET %s WHERE cd_uti = :cd_uti;" % s + execute_query(request, query, new_values) + +def delete_membre(request, cd_uti): + query = "DELETE FROM p_users WHERE cd_uti = :cd_uti ;" + execute_query(request, query, {'cd_uti': cd_uti}) + +def get_article(request, type, groupe, libelle): + if type == 'LIB': + if groupe == 'TEXTE': + # lire tous les textes dont le libelle commençe par + query = "SELECT * FROM tarifs WHERE groupe='TEXTE' and libelle like :libelle;" + results = request.dbsession.execute(query, {'libelle': libelle + "%"}).fetchall() + else: + # lire tous les tarifs du grupe dont le ref commençe par libelle + query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref like :libelle;" + results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle + "%"}).fetchall() + else: + # lire tous les tarif du grupe dont le ref est égale à + query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref = :libelle;" + results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle}).first() + return results + +def get_codespostaux(request, codep): + query = "SELECT * FROM p_codespostaux WHERE code_postal LIKE :code;" + results = request.dbsession.execute(query, {'code': codep+"%"}).fetchall() + return results + +def get_dd_restant(request): + query = """SELECT SUM(IF(societe='PE',1,0)) AS nb_PE, + SUM(IF(societe='ME',1,0)) AS nb_ME, + SUM(IF(societe='PL',1,0)) AS nb_PL + FROM dem_devis WHERE STATUS=0;""" + results = request.dbsession.execute(query).first() + return results + +def get_de_restant(request): + query = """SELECT SUM(IF(societe='PE',1,0)) AS nb_PE, + SUM(IF(societe='ME',1,0)) AS nb_ME, + SUM(IF(societe='PL',1,0)) AS nb_PL + FROM devis WHERE STATUS<4;""" + results = request.dbsession.execute(query).first() + return results + +def get_fa_restant(request): + query = """SELECT SUM(IF(societe='PE',1,0)) AS nb_PE, + SUM(IF(societe='ME',1,0)) AS nb_ME, + SUM(IF(societe='PL',1,0)) AS nb_PL + FROM facture WHERE STATUS<8;""" + results = request.dbsession.execute(query).first() + return results + +def get_rdv_by_date(request, date, agenda): + query = """SELECT COUNT(*) AS nb_rdv FROM bddevfac.dem_lig WHERE DATEVI=:date AND LISTE=:agenda;""" + results = request.dbsession.execute(query, {'date': date, 'agenda': agenda}).first() + return results + +def get_rdf_null(request): + query = """SELECT COUNT(*) AS nb_rdf FROM bddevfac.dem_rdf WHERE date_relu IS NULL;""" + results = request.dbsession.execute(query).first() + return results diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py index 876a021..fbba416 100644 --- a/mondumas/models/dossier.py +++ b/mondumas/models/dossier.py @@ -48,7 +48,7 @@ def get_dossier_by_sinistre(request,societe, nosin): return results def get_dossiers_traites(request): - query = "SELECT d.*, s.libelle FROM dem_devis d JOIN p_statuts s ON d.STATUS = s.CODE WHERE d.usermaj='EMAIL' ORDER BY d.DATEMAJ"; + query = "SELECT d.*, s.libelle FROM dem_devis d JOIN p_statuts s ON d.STATUS = s.CODE WHERE d.STATUS < 2 ORDER BY d.societe, d.STATUS, d.nomcli"; results = request.dbsession.execute(query).fetchall() return results @@ -336,4 +336,14 @@ def get_status_by_id(request, code): else: query = """SELECT * FROM p_statuts WHERE code = :code;""" results = request.dbsession.execute(query, {'code': code}).first() + return results + +def get_devis_en_att(request): + query = "SELECT d.*, s.libelle FROM devis d JOIN p_statuts s ON d.STATUS = s.CODE WHERE d.STATUS < 4 ORDER BY d.societe, d.STATUS, d.nomcli;" + results = request.dbsession.execute(query).fetchall() + return results + +def get_factures_en_att(request): + query = "SELECT f.*, s.libelle FROM facture f JOIN p_statuts s ON f.STATUS = s.CODE WHERE f.STATUS < 8 ORDER BY f.societe, f.STATUS, f.nomcli;" + results = request.dbsession.execute(query).fetchall() return results \ No newline at end of file diff --git a/mondumas/models/parametres.py b/mondumas/models/parametres.py index 2cbc56e..0a8acef 100644 --- a/mondumas/models/parametres.py +++ b/mondumas/models/parametres.py @@ -226,38 +226,4 @@ def get_tarifs_byGroupe(request, groupe): def get_tarif(request, groupe, ref): query = "SELECT * FROM tarifs WHERE groupe = :groupe and ref = :ref;" results = request.dbsession.execute(query, {'groupe': groupe, 'ref': ref}).first() - return results - -def get_dd_restant(request): - query = """SELECT SUM(IF(societe='PE',1,0)) AS nb_PE, - SUM(IF(societe='ME',1,0)) AS nb_ME, - SUM(IF(societe='PL',1,0)) AS nb_PL - FROM dem_devis WHERE STATUS=0;""" - results = request.dbsession.execute(query).first() - return results - -def get_de_restant(request): - query = """SELECT SUM(IF(societe='PE',1,0)) AS nb_PE, - SUM(IF(societe='ME',1,0)) AS nb_ME, - SUM(IF(societe='PL',1,0)) AS nb_PL - FROM devis WHERE STATUS<4;""" - results = request.dbsession.execute(query).first() - return results - -def get_fa_restant(request): - query = """SELECT SUM(IF(societe='PE',1,0)) AS nb_PE, - SUM(IF(societe='ME',1,0)) AS nb_ME, - SUM(IF(societe='PL',1,0)) AS nb_PL - FROM facture WHERE STATUS<8;""" - results = request.dbsession.execute(query).first() - return results - -def get_rdv_by_date(request, date, agenda): - query = """SELECT COUNT(*) AS nb_rdv FROM bddevfac.dem_lig WHERE DATEVI=:date AND LISTE=:agenda;""" - results = request.dbsession.execute(query, {'date': date, 'agenda': agenda}).first() - return results - -def get_rdf_null(request): - query = """SELECT COUNT(*) AS nb_rdf FROM bddevfac.dem_rdf WHERE date_relu IS NULL;""" - results = request.dbsession.execute(query).first() - return results + return results \ No newline at end of file diff --git a/mondumas/routes.py b/mondumas/routes.py index 6964c8d..f627649 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -5,7 +5,7 @@ def includeme(config): config.add_route('planning', '/planning/{date}') config.add_route('rdv_edit','/rdv_edit/{nodossier}/{nolig}') # default - config.add_route('home', '/') + config.add_route('new_home', '/') config.add_route('affiche_message','/affiche_message/{login}') config.add_route('ajax_article', '/ajax_article') config.add_route('ajax_client', '/ajax_client') @@ -48,6 +48,8 @@ def includeme(config): config.add_route('upload_img', '/upload_img/{norapport}/{origine}') config.add_route('upload_om', '/upload_om') config.add_route('dem_devis','/dem_devis') + config.add_route('devis_en_att','/devis_en_att') + config.add_route('factures_en_att','/factures_en_att') # parametres config.add_route('parametres', '/parametres') config.add_route('article_edit', '/article_edit/{ref}') @@ -73,7 +75,7 @@ def includeme(config): config.add_route('user_edit', '/user_edit/{cd_uti}') config.add_route('users', '/users') config.add_route('users_ua', '/users_ua') - config.add_route('new_home', '/new_home') + config.add_route('home', '/new_home') # stats config.add_route('stats', '/stats') diff --git a/mondumas/templates/parametres/new_home.pt b/mondumas/templates/default/new_home.pt similarity index 76% rename from mondumas/templates/parametres/new_home.pt rename to mondumas/templates/default/new_home.pt index a93280c..0ea085f 100644 --- a/mondumas/templates/parametres/new_home.pt +++ b/mondumas/templates/default/new_home.pt @@ -104,28 +104,32 @@
-
- -
- DEVIS - A traiter : - ${nb_de_restants.nb_PE} - ${nb_de_restants.nb_ME} - ${nb_de_restants.nb_PL} + +
+ +
+ DEVIS + A traiter : + ${nb_de_restants.nb_PE} + ${nb_de_restants.nb_ME} + ${nb_de_restants.nb_PL} +
-
+
-
- -
- FACTURES - A traiter : - ${nb_fa_restants.nb_PE} - ${nb_fa_restants.nb_ME} - ${nb_fa_restants.nb_PL} + +
+ +
+ FACTURES + A traiter : + ${nb_fa_restants.nb_PE} + ${nb_fa_restants.nb_ME} + ${nb_fa_restants.nb_PL} +
-
+

diff --git a/mondumas/templates/dossier/devis_en_att.pt b/mondumas/templates/dossier/devis_en_att.pt new file mode 100644 index 0000000..509af31 --- /dev/null +++ b/mondumas/templates/dossier/devis_en_att.pt @@ -0,0 +1,30 @@ + +
+ +
+ + + + + + + + + + +
${item.DATEMAJ.strftime('%d %b')}${item.societe}-DE${item.NO_ID}${item.NOMCLI}${item.C_NOM}${item.USERMAJ}${item.libelle}
+ +
+
+ + + +
+ + + diff --git a/mondumas/templates/dossier/factures_en_att.pt b/mondumas/templates/dossier/factures_en_att.pt new file mode 100644 index 0000000..e9cfbac --- /dev/null +++ b/mondumas/templates/dossier/factures_en_att.pt @@ -0,0 +1,30 @@ + +
+ +
+ + + + + + + + + + +
${item.DATEMAJ.strftime('%d %b')}${item.societe}-FA${item.NO_ID}${item.NOMCLI}${item.C_NOM}${item.USERMAJ}${item.libelle}
+ +
+
+ + + +
+ + + diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 5339b6b..4b5fcae 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -1,340 +1,465 @@ -# -*- 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.security import ( - remember, - forget, -) -from pyramid.httpexceptions import ( - HTTPFound, - HTTPNotFound, - HTTPForbidden, -) -from datetime import * -from sqlalchemy.exc import DBAPIError -from ..security import groupfinder -from user_agents import parse - -import json -import locale -import hashlib - -from ..models.default import * -from ..models.agenda import * -from ..models.dossier import ( - get_chantiers_byName, - get_clients_byName -) - -from ..views.utils import * - -def to_decimal(x): - import decimal - return decimal.Decimal(str(x)) - -def to_euro(x): - """Takes a float and returns 12 345,67 €""" - locale.setlocale(locale.LC_ALL,'') - return locale.currency(x, True, True) - -def to_euroz(x): - """Takes a float and returns 12 345,67 € if not zero""" - if x == 0: - return '' - else: - return to_euro(x) - -def to_decz(x): - """Takes a float and returns a number with 2 dec""" - locale.setlocale(locale.LC_ALL,'') - if x == 0: - return "" - else: - return locale.format_string('%.2f',x, False) - -def to_sha1(message): - return hashlib.sha1(message.encode('utf-8')).hexdigest() - -def to_int(x): - try: - number = int(x.replace(',', '.')) - return number - except ValueError: - return 0 - -def to_percent(x): - """Takes a float and returns a string""" - return ("%.2f " % x).replace('.', ',') + "%" - - -@view_config(route_name='home', renderer='../templates/default/home.pt', permission='view') -def home(request): - logged_in = request.authenticated_userid.upper() - # lire la fiche de l'utilisateur - member = get_member_by_id(request, logged_in) - access = member.access - - return { - 'page_title': 'Bienvenue sur %s' % request.host, - 'project': 'mondumas', - 'access': access, - 'logged_in': logged_in, - } - -@view_config(route_name='envoyer_mdp', renderer='../templates/default/envoyer_mdp.pt') -def envoyer_mdp(request): - url = request.route_url('envoyer_mdp') - message = '' - - if 'form.submitted' in request.params: - login = request.params['login'] - member = get_member_by_id(request, login) - if member: - # Fabrication du corps du email_passwordMessage - lien = update_membre_mdp_oublie(request, login) - body = """ -

Bonjour,

- -

Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser votre mot de passe d'accès à gestion.entreprise-dumas.com:

- -

%s

- -

(Ce lien est valide pendant 168 heures.

- - -

-Cordialement,
-gestion.entreprise-dumas.com -

-""" % (request.route_url('redefinir_mdp', lien=lien)) - # envoyer l'email - expediteur = request.registry.settings['mondumas.admin_email'] - send_mail(request, expediteur, [member.email,], "[Ent. Dumas] Demande de ré-initialisation du mot de passe", body) - - request.session.flash("Le lien permettant de redéfinir votre mot de passe vous a été envoyé à l'adresse : %s." % member.email, 'success') - return HTTPFound(location=request.route_url('affiche_message', login=login)) - else: - message = "Le mot de passe fourni est incorrect." - return { - 'page_title': "Changer mon mot de passe", - 'url': url, - 'message': message, - } - -@view_config(route_name='changer_mdp', renderer='../templates/default/changer_mdp.pt', permission='view') -def changer_mdp(request): - url = request.route_url('changer_mdp') - logged_in = request.authenticated_userid - message = '' - - member = get_member_by_id(request, logged_in) - if member: - if 'form.submitted' in request.params: - old_password = request.params['old_password'] - new_password = request.params['new_password1'] - if member.mdp == to_sha1(old_password): - update_membre_mdp(request, logged_in, new_password) - request.session.flash("Votre mot de passe a été mis à jour avec succès.") - return HTTPFound(location=request.route_url('home')) - else: - message = "Le mot de passe actuel n'est pas correct." - - return { - 'page_title': "Changer mon mot de passe", - 'url': url, - 'member': member, - 'message': message, - } - -@view_config(route_name='redefinir_mdp', renderer='../templates/default/redefinir_mdp.pt') -@view_config(route_name='init_mdp', renderer='../templates/default/redefinir_mdp.pt') -def redefinir_mdp(request): - if request.matched_route.name == 'redefinir_mdp': - lien = request.matchdict["lien"] - url = request.route_url('redefinir_mdp', lien=lien) - # tester si le champ "motdepasse_oublie" est encore valide - membre = get_member_by_mdp_oublie(request, lien) - else: - user = request.matchdict["user"] - lien = request.matchdict["lien"] - url = request.route_url('init_mdp', user=user, lien=lien) - # tester valeur OK ? - if lien == date.today().strftime('%d%m%Y'): - # oui, lire le membre - membre = get_member_by_id(request, user) - else: - membre = None - - if membre: - if 'form.submitted' in request.params: - login = request.params["login"] - mdp = request.params["new_password1"] - if login == membre.CD_UTI: - update_membre_mdp(request, login, mdp) - request.session.flash("Votre mot de passe a été modifié avec succès.", 'success') - return HTTPFound(location=request.route_url('login')) - else: - request.session.flash("Identifiant incorrect.", 'danger') - return HTTPFound(location=request.route_url('login')) - else: - request.session.flash("Le lien n'est plus valable.", 'warning') - return HTTPFound(location=request.route_url('login')) - - return { - 'page_title': "Définissez votre mot de passe", - 'url': url, - } - - -@view_config(route_name='login', renderer='../templates/default/login.pt', permission='view') -@view_config(route_name='login_as', renderer='../templates/default/login.pt', permission='view') -@forbidden_view_config(renderer='../templates/default/login.pt') -def login(request): - - current_route_path = request.current_route_path() - login = '' - login_url = request.route_url('login') - - referrer = request.url - if referrer == login_url: - referrer = '/' # never use the login form itself as came_from - - came_from = request.params.get('came_from', referrer) - password = '' - message = '' - if 'form.submitted' in request.params: - login = request.params['login'] - password = request.params['password'] - record = get_member_by_id(request, login) - if record : - # mot de passe hash valide ? - if record.mdp == to_sha1(password) and record.actif == 1: - # get user agent string from request - ua_string = request.user_agent - user_agent = parse(ua_string) - update_last_connection(request, login, request.client_addr + ' - ' + str(user_agent)) - - # force le commit car il ne se fait pas automatiquement après l'update - transaction.commit() - - headers = remember(request, login) - return HTTPFound(location=came_from, headers=headers) - - message = "Email et mot de passe invalides. La connexion a échoué." - - return { - 'page_title': "", - 'url': login_url, - 'came_from': came_from, - 'login': login, - 'message': message, - } - - -@view_config(route_name='logout') -def logout(request): - request.session.invalidate() - headers = forget(request) - request.session.flash("Vous avez bien été déconnecté.") - return HTTPFound(location=request.route_url('login', login=''), - headers=headers) - - -@view_config(route_name='affiche_message', renderer='../templates/default/affiche_message.pt') -def affiche_message(request): - - login = request.matchdict['login'] - messages = request.session.pop_flash() - - return { - 'page_title': "Demande effectuée", - 'login': login, - 'messages' : messages, - 'url_identification': request.route_url('login_as', login=login) - } - -@view_config(route_name='ajax_codepostal') -def ajax_codepostal(request): - recherche = request.GET['recherche'] - - # lire les codes postaux commencant par - items = get_codespostaux(request, recherche) - liste=[] - for row in items: - d = row.code_postal + " - " + row.libelle - liste.append(d) - - return Response(json.dumps(liste)) - -@view_config(route_name='ajax_lookup') -def ajax_lookup(request): - recherche = request.GET['recherche'] - societe = recherche[:2] # 1er car. - name = recherche[2:] - - # lire les chantiers - chantiers = get_chantiers_byName(request, societe, name) - liste=[] - for row in chantiers: - d = "%s | %s-%s"% (row.chantier, societe, row.numero) - liste.append(d) - - return Response(json.dumps(liste)) - -@view_config(route_name='ajax_client') -def ajax_client(request): - recherche = request.GET['recherche'] - societe = recherche[:2] # 1er car. - name = recherche[2:] - - # lire les clients - clients = get_clients_byName(request, societe, name) - liste=[] - for row in clients: - d = "%s | %s-%s"% (row.NOM, societe, row.CD_CLI) - liste.append(d) - - return Response(json.dumps(liste)) - -@view_config(route_name='ajax_texte') -def ajax_texte(request): - groupe = request.GET['groupe'] - libelle = request.GET['libelle'] - - # import pdb;pdb.set_trace() - - # lire les articles commencant par - items = get_article(request, 'LIB', groupe, libelle) - - liste=[] - for row in items: - if groupe == 'TEXTE': - d = row.libelle - else: - d = '%s | %s | %s' % (row.ref, row.libelle, to_euro(row.prixht)) - liste.append(d) - - return Response(json.dumps(liste)) - -@view_config(route_name='ajax_article') -def ajax_article(request): - groupe = request.GET['groupe'] - ref = request.GET['ref'] - - # lire l'article - items = get_article(request, 'REF', groupe, ref) - # puis retourne son libellé et son prixht - liste=[] - d = {} - d['ref'] = items.ref - d['libelle'] = items.libelle - d['prixht'] = "%.2f" % items.prixht - liste.append(d) - - return Response(json.dumps(liste)) - - +# -*- 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.security import ( + remember, + forget, +) +from pyramid.httpexceptions import ( + HTTPFound, + HTTPNotFound, + HTTPForbidden, +) +from datetime import * +from sqlalchemy.exc import DBAPIError +from ..security import groupfinder +from user_agents import parse + +import json +import locale +import hashlib +import imaplib +import email + +from ..models.default import * +from ..models.agenda import * +from ..models.dossier import ( + get_chantiers_byName, + get_clients_byName +) + +from ..views.utils import * + +def to_decimal(x): + import decimal + return decimal.Decimal(str(x)) + +def to_euro(x): + """Takes a float and returns 12 345,67 €""" + locale.setlocale(locale.LC_ALL,'') + return locale.currency(x, True, True) + +def to_euroz(x): + """Takes a float and returns 12 345,67 € if not zero""" + if x == 0: + return '' + else: + return to_euro(x) + +def to_decz(x): + """Takes a float and returns a number with 2 dec""" + locale.setlocale(locale.LC_ALL,'') + if x == 0: + return "" + else: + return locale.format_string('%.2f',x, False) + +def to_sha1(message): + return hashlib.sha1(message.encode('utf-8')).hexdigest() + +def to_int(x): + try: + number = int(x.replace(',', '.')) + return number + except ValueError: + return 0 + +def to_percent(x): + """Takes a float and returns a string""" + return ("%.2f " % x).replace('.', ',') + "%" + + +@view_config(route_name='home', renderer='../templates/default/home.pt', permission='view') +def home(request): + logged_in = request.authenticated_userid.upper() + # lire la fiche de l'utilisateur + member = get_member_by_id(request, logged_in) + access = member.access + + return { + 'page_title': 'Bienvenue sur %s' % request.host, + 'project': 'mondumas', + 'access': access, + 'logged_in': logged_in, + } + +def mailbox_connect(request, societe): + # connecter au serveur IMAP de la societe + if societe == 'PE': + mbx_name = 'peinture-dumas@entreprise-dumas.com' + mbx_pwd = 'sasdumas' + elif societe == 'ME': + mbx_name = 'menuiserie-dumas@entreprise-dumas.com' + mbx_pwd = 'sasdumas' + elif societe == 'PL': + mbx_name = 'versanit-dumas@entreprise-dumas.com' + mbx_pwd = 'sasdumas' + elif societe == 'PO': + mbx_name = 'polynet-dumas@entreprise-dumas.com' + mbx_pwd = 'sasdumas' + else: + request.session.flash("Cette société est inconnue ou non traitée : %s" % societe, 'danger') + return None + + conn = imaplib.IMAP4_SSL('imap.entreprise-dumas.com') + try: + # se connecter à la mailbox + conn.login(mbx_name, mbx_pwd) + except imaplib.IMAP4.error: + request.session.flash("ERREUR connexion au compte %s" % mbx_name, 'danger') + return None + + return conn + +@view_config(route_name='new_home', renderer='../templates/default/new_home.pt', permission='view') +def new_home(request): + logged_in = request.authenticated_userid.upper() + url = request.route_url('new_home') + # lire la fiche de l'utilisateur + member = get_member_by_id(request, logged_in) + access = member.access + agenda = member.agenda + + datedeb = date.today().strftime("%Y-%m-%d") + + 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) + + # Récupération de la listes des mails pour ensuite avoir leur nombre + def demandes_lister(societe, search_criteria): + # connecter au serveur de mail + conn = mailbox_connect(request, societe) + # select INBOX + rv, data = conn.select('INBOX', readonly =True) + + # créer la liste des entêtes des messages à afficher + liste = [] + 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')) + + mail_ids = data[0] + for email_UID in mail_ids.split(): + rv, msg_data = conn.fetch(email_UID, '(RFC822)') + if rv != 'OK': + request.session.flash("ERREUR de lecture du message %s" % email_UID, 'danger') + return HTTPFound(location=request.route_url('home')) + + msg = email.message_from_bytes(msg_data[0][1]) + hdr = email.header.make_header(email.header.decode_header(msg['Subject'])) + email_subject = str(hdr) + email_from = email.utils.parseaddr(msg['from'])[1] + # Now convert to local date-time + date_tuple = email.utils.parsedate_tz(msg['Date']) + if date_tuple: + email_date = datetime.fromtimestamp(email.utils.mktime_tz(date_tuple)) + else: + email_date = datetime.now() + + d = { + "email_societe": societe, + "email_date": email_date, + "email_from": email_from.split('@')[1], + 'email_subject':email_subject, + "email_uid": email_UID + } + liste.append(d) + + # deconnexion du serveur + conn.close() + conn.logout() + return liste + + societes = ['PE','ME','PL','PO'] + + # critères de recherche des demandes d'interventions de la MAIF + # search_criteria = ['FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier" UNDELETED'] " + search_criteria = ['FROM gestionsinistre@maif.fr SUBJECT "Intervention entreprise partenaire"', + 'FROM service.sinistres@domus-services.fr UNDELETED'] + # 'FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier" UNDELETED'] + + emails=[] + # lister les demandes par societe + for societe in societes: + emails = emails + demandes_lister(societe, search_criteria) + + # messages lus + msglus = bool(emails) + + return { + 'page_title': 'Bienvenue sur %s' % request.host, + 'project': 'mondumas', + 'access': access, + 'logged_in': logged_in, + 'nb_dd_restants': nb_dd_restants, + 'nb_de_restants': nb_de_restants, + 'nb_fa_restants': nb_fa_restants, + 'nb_rdv': nb_rdv, + 'nb_rdf': nb_rdf, + 'nb_mails': len(emails), + #'mails': emails, + } + +@view_config(route_name='envoyer_mdp', renderer='../templates/default/envoyer_mdp.pt') +def envoyer_mdp(request): + url = request.route_url('envoyer_mdp') + message = '' + + if 'form.submitted' in request.params: + login = request.params['login'] + member = get_member_by_id(request, login) + if member: + # Fabrication du corps du email_passwordMessage + lien = update_membre_mdp_oublie(request, login) + body = """ +

Bonjour,

+ +

Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser votre mot de passe d'accès à gestion.entreprise-dumas.com:

+ +

%s

+ +

(Ce lien est valide pendant 168 heures.

+ + +

+Cordialement,
+gestion.entreprise-dumas.com +

+""" % (request.route_url('redefinir_mdp', lien=lien)) + # envoyer l'email + expediteur = request.registry.settings['mondumas.admin_email'] + send_mail(request, expediteur, [member.email,], "[Ent. Dumas] Demande de ré-initialisation du mot de passe", body) + + request.session.flash("Le lien permettant de redéfinir votre mot de passe vous a été envoyé à l'adresse : %s." % member.email, 'success') + return HTTPFound(location=request.route_url('affiche_message', login=login)) + else: + message = "Le mot de passe fourni est incorrect." + return { + 'page_title': "Changer mon mot de passe", + 'url': url, + 'message': message, + } + +@view_config(route_name='changer_mdp', renderer='../templates/default/changer_mdp.pt', permission='view') +def changer_mdp(request): + url = request.route_url('changer_mdp') + logged_in = request.authenticated_userid + message = '' + + member = get_member_by_id(request, logged_in) + if member: + if 'form.submitted' in request.params: + old_password = request.params['old_password'] + new_password = request.params['new_password1'] + if member.mdp == to_sha1(old_password): + update_membre_mdp(request, logged_in, new_password) + request.session.flash("Votre mot de passe a été mis à jour avec succès.") + return HTTPFound(location=request.route_url('home')) + else: + message = "Le mot de passe actuel n'est pas correct." + + return { + 'page_title': "Changer mon mot de passe", + 'url': url, + 'member': member, + 'message': message, + } + +@view_config(route_name='redefinir_mdp', renderer='../templates/default/redefinir_mdp.pt') +@view_config(route_name='init_mdp', renderer='../templates/default/redefinir_mdp.pt') +def redefinir_mdp(request): + if request.matched_route.name == 'redefinir_mdp': + lien = request.matchdict["lien"] + url = request.route_url('redefinir_mdp', lien=lien) + # tester si le champ "motdepasse_oublie" est encore valide + membre = get_member_by_mdp_oublie(request, lien) + else: + user = request.matchdict["user"] + lien = request.matchdict["lien"] + url = request.route_url('init_mdp', user=user, lien=lien) + # tester valeur OK ? + if lien == date.today().strftime('%d%m%Y'): + # oui, lire le membre + membre = get_member_by_id(request, user) + else: + membre = None + + if membre: + if 'form.submitted' in request.params: + login = request.params["login"] + mdp = request.params["new_password1"] + if login == membre.CD_UTI: + update_membre_mdp(request, login, mdp) + request.session.flash("Votre mot de passe a été modifié avec succès.", 'success') + return HTTPFound(location=request.route_url('login')) + else: + request.session.flash("Identifiant incorrect.", 'danger') + return HTTPFound(location=request.route_url('login')) + else: + request.session.flash("Le lien n'est plus valable.", 'warning') + return HTTPFound(location=request.route_url('login')) + + return { + 'page_title': "Définissez votre mot de passe", + 'url': url, + } + + +@view_config(route_name='login', renderer='../templates/default/login.pt', permission='view') +@view_config(route_name='login_as', renderer='../templates/default/login.pt', permission='view') +@forbidden_view_config(renderer='../templates/default/login.pt') +def login(request): + + current_route_path = request.current_route_path() + login = '' + login_url = request.route_url('login') + + referrer = request.url + if referrer == login_url: + referrer = '/' # never use the login form itself as came_from + + came_from = request.params.get('came_from', referrer) + password = '' + message = '' + if 'form.submitted' in request.params: + login = request.params['login'] + password = request.params['password'] + record = get_member_by_id(request, login) + if record : + # mot de passe hash valide ? + if record.mdp == to_sha1(password) and record.actif == 1: + # get user agent string from request + ua_string = request.user_agent + user_agent = parse(ua_string) + update_last_connection(request, login, request.client_addr + ' - ' + str(user_agent)) + + # force le commit car il ne se fait pas automatiquement après l'update + transaction.commit() + + headers = remember(request, login) + return HTTPFound(location=came_from, headers=headers) + + message = "Email et mot de passe invalides. La connexion a échoué." + + return { + 'page_title': "", + 'url': login_url, + 'came_from': came_from, + 'login': login, + 'message': message, + } + + +@view_config(route_name='logout') +def logout(request): + request.session.invalidate() + headers = forget(request) + request.session.flash("Vous avez bien été déconnecté.") + return HTTPFound(location=request.route_url('login', login=''), + headers=headers) + + +@view_config(route_name='affiche_message', renderer='../templates/default/affiche_message.pt') +def affiche_message(request): + + login = request.matchdict['login'] + messages = request.session.pop_flash() + + return { + 'page_title': "Demande effectuée", + 'login': login, + 'messages' : messages, + 'url_identification': request.route_url('login_as', login=login) + } + +@view_config(route_name='ajax_codepostal') +def ajax_codepostal(request): + recherche = request.GET['recherche'] + + # lire les codes postaux commencant par + items = get_codespostaux(request, recherche) + liste=[] + for row in items: + d = row.code_postal + " - " + row.libelle + liste.append(d) + + return Response(json.dumps(liste)) + +@view_config(route_name='ajax_lookup') +def ajax_lookup(request): + recherche = request.GET['recherche'] + societe = recherche[:2] # 1er car. + name = recherche[2:] + + # lire les chantiers + chantiers = get_chantiers_byName(request, societe, name) + liste=[] + for row in chantiers: + d = "%s | %s-%s"% (row.chantier, societe, row.numero) + liste.append(d) + + return Response(json.dumps(liste)) + +@view_config(route_name='ajax_client') +def ajax_client(request): + recherche = request.GET['recherche'] + societe = recherche[:2] # 1er car. + name = recherche[2:] + + # lire les clients + clients = get_clients_byName(request, societe, name) + liste=[] + for row in clients: + d = "%s | %s-%s"% (row.NOM, societe, row.CD_CLI) + liste.append(d) + + return Response(json.dumps(liste)) + +@view_config(route_name='ajax_texte') +def ajax_texte(request): + groupe = request.GET['groupe'] + libelle = request.GET['libelle'] + + # import pdb;pdb.set_trace() + + # lire les articles commencant par + items = get_article(request, 'LIB', groupe, libelle) + + liste=[] + for row in items: + if groupe == 'TEXTE': + d = row.libelle + else: + d = '%s | %s | %s' % (row.ref, row.libelle, to_euro(row.prixht)) + liste.append(d) + + return Response(json.dumps(liste)) + +@view_config(route_name='ajax_article') +def ajax_article(request): + groupe = request.GET['groupe'] + ref = request.GET['ref'] + + # lire l'article + items = get_article(request, 'REF', groupe, ref) + # puis retourne son libellé et son prixht + liste=[] + d = {} + d['ref'] = items.ref + d['libelle'] = items.libelle + d['prixht'] = "%.2f" % items.prixht + liste.append(d) + + return Response(json.dumps(liste)) + + diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index 9990145..2cb2097 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -844,34 +844,6 @@ def rdf_bill(request): 'articles': articles, 'article' : article, } - -def mailbox_connect(request, societe): - # connecter au serveur IMAP de la societe - if societe == 'PE': - mbx_name = 'peinture-dumas@entreprise-dumas.com' - mbx_pwd = 'sasdumas' - elif societe == 'ME': - mbx_name = 'menuiserie-dumas@entreprise-dumas.com' - mbx_pwd = 'sasdumas' - elif societe == 'PL': - mbx_name = 'versanit-dumas@entreprise-dumas.com' - mbx_pwd = 'sasdumas' - elif societe == 'PO': - mbx_name = 'polynet-dumas@entreprise-dumas.com' - mbx_pwd = 'sasdumas' - else: - request.session.flash("Cette société est inconnue ou non traitée : %s" % societe, 'danger') - return None - - conn = imaplib.IMAP4_SSL('imap.entreprise-dumas.com') - try: - # se connecter à la mailbox - conn.login(mbx_name, mbx_pwd) - except imaplib.IMAP4.error: - request.session.flash("ERREUR connexion au compte %s" % mbx_name, 'danger') - return None - - return conn @view_config(route_name='demandes', renderer='../templates/dossier/demandes.pt', permission='view') def demandes(request): @@ -1582,4 +1554,30 @@ def dem_devis(request): 'page_title': 'Dossiers générés à traiter', 'url': url, 'dossiers_traites':dossiers_traites, + } + +@view_config(route_name='devis_en_att', renderer='../templates/dossier/devis_en_att.pt', permission='view') +def dem_devis(request): + logged_in = request.authenticated_userid.upper() + url = request.route_url('devis_en_att') + + list_devis_en_att = get_devis_en_att(request) + + return { + 'page_title': "Devis en attente d'acceptation", + 'url': url, + 'list_devis_en_att':list_devis_en_att, + } + +@view_config(route_name='factures_en_att', renderer='../templates/dossier/factures_en_att.pt', permission='view') +def dem_devis(request): + logged_in = request.authenticated_userid.upper() + url = request.route_url('factures_en_att') + + list_factures_en_att = get_factures_en_att(request) + + return { + 'page_title': "Factures en attente de réglement", + 'url': url, + 'list_factures_en_att':list_factures_en_att, } \ No newline at end of file diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py index 336dea1..4495458 100644 --- a/mondumas/views/parametres.py +++ b/mondumas/views/parametres.py @@ -837,99 +837,4 @@ def tarifs_import(request): 'message': message, 'groupes': groupes, 'groupe': groupe, - } - -@view_config(route_name='new_home', renderer='../templates/parametres/new_home.pt', permission='view') -def new_home(request): - logged_in = request.authenticated_userid.upper() - url = request.route_url('new_home') - # lire la fiche de l'utilisateur - member = get_member_by_id(request, logged_in) - access = member.access - agenda = member.agenda - - datedeb = date.today().strftime("%Y-%m-%d") - - 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) - - # Récupération de la listes des mails pour ensuite avoir leur nombre - def demandes_lister(societe, search_criteria): - # connecter au serveur de mail - conn = mailbox_connect(request, societe) - # select INBOX - rv, data = conn.select('INBOX', readonly =True) - - # créer la liste des entêtes des messages à afficher - liste = [] - 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')) - - mail_ids = data[0] - for email_UID in mail_ids.split(): - rv, msg_data = conn.fetch(email_UID, '(RFC822)') - if rv != 'OK': - request.session.flash("ERREUR de lecture du message %s" % email_UID, 'danger') - return HTTPFound(location=request.route_url('home')) - - msg = email.message_from_bytes(msg_data[0][1]) - hdr = email.header.make_header(email.header.decode_header(msg['Subject'])) - email_subject = str(hdr) - email_from = email.utils.parseaddr(msg['from'])[1] - # Now convert to local date-time - date_tuple = email.utils.parsedate_tz(msg['Date']) - if date_tuple: - email_date = datetime.fromtimestamp(email.utils.mktime_tz(date_tuple)) - else: - email_date = datetime.now() - - d = { - "email_societe": societe, - "email_date": email_date, - "email_from": email_from.split('@')[1], - 'email_subject':email_subject, - "email_uid": email_UID - } - liste.append(d) - - # deconnexion du serveur - conn.close() - conn.logout() - return liste - - societes = ['PE','ME','PL','PO'] - - # critères de recherche des demandes d'interventions de la MAIF - # search_criteria = ['FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier" UNDELETED'] " - search_criteria = ['FROM gestionsinistre@maif.fr SUBJECT "Intervention entreprise partenaire"', - 'FROM service.sinistres@domus-services.fr UNDELETED'] - # 'FROM service.sinistres@domus-services.fr SUBJECT "Ordre de mission DOMUS - Dossier" UNDELETED'] - - emails=[] - # lister les demandes par societe - for societe in societes: - emails = emails + demandes_lister(societe, search_criteria) - - # messages lus - msglus = bool(emails) - - return { - 'page_title': 'Bienvenue sur %s' % request.host, - 'project': 'mondumas', - 'access': access, - 'logged_in': logged_in, - 'nb_dd_restants': nb_dd_restants, - 'nb_de_restants': nb_de_restants, - 'nb_fa_restants': nb_fa_restants, - 'nb_rdv': nb_rdv, - 'nb_rdf': nb_rdf, - 'nb_mails': len(emails), - #'mails': emails, } \ No newline at end of file diff --git a/mondumas/views/stats.py b/mondumas/views/stats.py index 23a8ac8..bfd487b 100644 --- a/mondumas/views/stats.py +++ b/mondumas/views/stats.py @@ -176,8 +176,8 @@ def ca_groupes(request): print(datedeb) chart_ca_12m = [] # titre des colonnes - chart_ca_12m.append(('Mois', 'AXA', { 'type':'string','role': 'tooltip'}, 'MAIF', { 'type':'string','role': 'tooltip'},'DOMUS', { 'type':'string','role': 'tooltip'}, - 'GMF', { 'type':'string','role': 'tooltip'},'MACIF', { 'type':'string','role': 'tooltip'})) + chart_ca_12m.append(('Mois', 'AXA', { 'type':'string','role': 'tooltip'},'DOMUS', { 'type':'string','role': 'tooltip'}, + 'GMF', { 'type':'string','role': 'tooltip'},'MACIF', { 'type':'string','role': 'tooltip'}, 'MAIF', { 'type':'string','role': 'tooltip'})) title = 'CA sur 12 mois' for item in items: date_aff = item.date[:3] + ' ' + item.date[-4:]