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

migration new_home + ajout tableaux devis et factures

Browse Source
This commit is contained in:
thienan
2021-07-06 10:37:34 +02:00
parent 0161c72cd4
commit 7a436e2218
12 changed files with 757 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
development.ini
View File

@@ -19,8 +19,8 @@ pyramid.includes =
pyramid_tm pyramid_tm
sqlalchemy.url = mysql://phuoc:phuoc!@localhost/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.1.17/bddevfac?charset=utf8
# sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8 # sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8
mondumas.admin_email = cao.thien-phuoc@orange.fr mondumas.admin_email = cao.thien-phuoc@orange.fr

295
mondumas/models/default.py
View File

@@ -1,131 +1,164 @@
# -*- coding: utf8 -*- # -*- coding: utf8 -*-
from sqlalchemy import text from sqlalchemy import text
from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.orm import ( from sqlalchemy.orm import (
scoped_session, scoped_session,
sessionmaker, sessionmaker,
) )
from zope.sqlalchemy import ( from zope.sqlalchemy import (
ZopeTransactionExtension, ZopeTransactionExtension,
mark_changed mark_changed
) )
from datetime import * from datetime import *
import transaction import transaction
def execute_query(request, query, params): def execute_query(request, query, params):
"""Execute query and mark session as changed""" """Execute query and mark session as changed"""
request.dbsession.execute(query, params) request.dbsession.execute(query, params)
mark_changed(request.dbsession) mark_changed(request.dbsession)
transaction.commit() transaction.commit()
def get_userAccess(request, logged_in): def get_userAccess(request, logged_in):
member = get_member_by_id(request, logged_in) member = get_member_by_id(request, logged_in)
if member: if member:
return member.access return member.access
else: else:
return 0 return 0
def get_member_by_mdp_oublie(request, lien): def get_member_by_mdp_oublie(request, lien):
query = "SELECT * FROM p_users WHERE mdp_oublie=:lien;" query = "SELECT * FROM p_users WHERE mdp_oublie=:lien;"
results = request.dbsession.execute(query, {'lien':lien}).first() results = request.dbsession.execute(query, {'lien':lien}).first()
return results return results
def get_member_by_id(request, mbr_id): def get_member_by_id(request, mbr_id):
if mbr_id == '0': if mbr_id == '0':
query = "SELECT * FROM p_users ORDER BY cd_uti" query = "SELECT * FROM p_users ORDER BY cd_uti"
results = request.dbsession.execute(query).fetchall() results = request.dbsession.execute(query).fetchall()
else: else:
# lire le membres par son identifianr # lire le membres par son identifianr
query = """SELECT * FROM p_users WHERE CD_UTI=:mbr_id;""" query = """SELECT * FROM p_users WHERE CD_UTI=:mbr_id;"""
results = request.dbsession.execute(query, {'mbr_id': mbr_id}).first() results = request.dbsession.execute(query, {'mbr_id': mbr_id}).first()
return results return results
def get_member_info(request, logged_in): def get_member_info(request, logged_in):
# lire le membres par son identifianr # lire le membres par son identifianr
query = """SELECT nom, email, access, societe FROM p_users WHERE CD_UTI=:logged_in;""" query = """SELECT nom, email, access, societe FROM p_users WHERE CD_UTI=:logged_in;"""
results = request.dbsession.execute(query, {'logged_in': logged_in}).first() results = request.dbsession.execute(query, {'logged_in': logged_in}).first()
if results.access == 9: if results.access == 9:
fonction = 'Administrateur' fonction = 'Administrateur'
elif results.access == 8: elif results.access == 8:
fonction = 'Comptabilité' fonction = 'Comptabilité'
elif results.access == 5: elif results.access == 5:
fonction = 'Gestion' fonction = 'Gestion'
else: else:
fonction = 'Production' fonction = 'Production'
return { return {
'nom': results.nom, 'nom': results.nom,
'email': results.email, 'email': results.email,
'fonction': fonction, 'fonction': fonction,
'societe': results.societe, 'societe': results.societe,
} }
def update_membre_mdp_oublie(request, login): def update_membre_mdp_oublie(request, login):
import uuid, base64 import uuid, base64
# get a UUID - URL safe, Base64 # get a UUID - URL safe, Base64
uid = uuid.uuid1() uid = uuid.uuid1()
urlslug = base64.urlsafe_b64encode(uid.bytes).decode("utf-8").rstrip('=\n').replace('/', '_') 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;" query = "UPDATE p_users SET mdp_oublie=:urlslug, mdp_oublie_date=now() WHERE CD_UTI=:login;"
execute_query(request, query, {'urlslug':urlslug, 'login':login}) execute_query(request, query, {'urlslug':urlslug, 'login':login})
return urlslug return urlslug
def update_membre_mdp(request, login, password): def update_membre_mdp(request, login, password):
"""Update password for member login""" """Update password for member login"""
query = "UPDATE p_users SET mdp = SHA1(:password), mdp_oublie=NULL, mdp_oublie_date=NULL WHERE cd_uti=: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}) execute_query(request, query, {'login': login, 'password': password})
def update_last_connection(request, login, ua_string): def update_last_connection(request, login, ua_string):
"""Update last connection for login """ """Update last connection for login """
query = "UPDATE p_users SET dern_cnx_le=NOW(), ua_string=:ua_string WHERE cd_uti=: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}) execute_query(request, query, {'login': login, 'ua_string': ua_string})
def update_membre(request, cd_uti, new_values): def update_membre(request, cd_uti, new_values):
# formater les champs # formater les champs
s = '' s = ''
for param in new_values.keys(): for param in new_values.keys():
if param == 'nom': if param == 'nom':
new_values['nom'] = new_values['nom'].upper() new_values['nom'] = new_values['nom'].upper()
if param == 'access': if param == 'access':
' ne prend que le 1er caractère' ' ne prend que le 1er caractère'
new_values['access'] = new_values['access'][0] new_values['access'] = new_values['access'][0]
if s: if s:
s += ",%s=:%s" % (param, param) s += ",%s=:%s" % (param, param)
else: else:
s = "%s=:%s" % (param, param) s = "%s=:%s" % (param, param)
if cd_uti == '0': if cd_uti == '0':
query = "INSERT INTO p_users SET %s" % s query = "INSERT INTO p_users SET %s" % s
else: else:
new_values['cd_uti'] = cd_uti new_values['cd_uti'] = cd_uti
query = "UPDATE p_users SET %s WHERE cd_uti = :cd_uti;" % s query = "UPDATE p_users SET %s WHERE cd_uti = :cd_uti;" % s
execute_query(request, query, new_values) execute_query(request, query, new_values)
def delete_membre(request, cd_uti): def delete_membre(request, cd_uti):
query = "DELETE FROM p_users WHERE cd_uti = :cd_uti ;" query = "DELETE FROM p_users WHERE cd_uti = :cd_uti ;"
execute_query(request, query, {'cd_uti': cd_uti}) execute_query(request, query, {'cd_uti': cd_uti})
def get_article(request, type, groupe, libelle): def get_article(request, type, groupe, libelle):
if type == 'LIB': if type == 'LIB':
if groupe == 'TEXTE': if groupe == 'TEXTE':
# lire tous les textes dont le libelle commençe par # lire tous les textes dont le libelle commençe par
query = "SELECT * FROM tarifs WHERE groupe='TEXTE' and libelle like :libelle;" query = "SELECT * FROM tarifs WHERE groupe='TEXTE' and libelle like :libelle;"
results = request.dbsession.execute(query, {'libelle': libelle + "%"}).fetchall() results = request.dbsession.execute(query, {'libelle': libelle + "%"}).fetchall()
else: else:
# lire tous les tarifs du grupe dont le ref commençe par libelle # lire tous les tarifs du grupe dont le ref commençe par libelle
query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref like :libelle;" query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref like :libelle;"
results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle + "%"}).fetchall() results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle + "%"}).fetchall()
else: else:
# lire tous les tarif du grupe dont le ref est égale à # lire tous les tarif du grupe dont le ref est égale à
query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref = :libelle;" query = "SELECT * FROM tarifs WHERE groupe=:groupe and ref = :libelle;"
results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle}).first() results = request.dbsession.execute(query, {'groupe': groupe, 'libelle': libelle}).first()
return results return results
def get_codespostaux(request, codep): def get_codespostaux(request, codep):
query = "SELECT * FROM p_codespostaux WHERE code_postal LIKE :code;" query = "SELECT * FROM p_codespostaux WHERE code_postal LIKE :code;"
results = request.dbsession.execute(query, {'code': codep+"%"}).fetchall() results = request.dbsession.execute(query, {'code': codep+"%"}).fetchall()
return results 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

12
mondumas/models/dossier.py
View File

@@ -48,7 +48,7 @@ def get_dossier_by_sinistre(request,societe, nosin):
return results return results
def get_dossiers_traites(request): 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() results = request.dbsession.execute(query).fetchall()
return results return results
@@ -336,4 +336,14 @@ def get_status_by_id(request, code):
else: else:
query = """SELECT * FROM p_statuts WHERE code = :code;""" query = """SELECT * FROM p_statuts WHERE code = :code;"""
results = request.dbsession.execute(query, {'code': code}).first() 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 return results

36
mondumas/models/parametres.py
View File

@@ -226,38 +226,4 @@ def get_tarifs_byGroupe(request, groupe):
def get_tarif(request, groupe, ref): def get_tarif(request, groupe, ref):
query = "SELECT * FROM tarifs WHERE groupe = :groupe and ref = :ref;" query = "SELECT * FROM tarifs WHERE groupe = :groupe and ref = :ref;"
results = request.dbsession.execute(query, {'groupe': groupe, 'ref': ref}).first() results = request.dbsession.execute(query, {'groupe': groupe, 'ref': ref}).first()
return results 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

6
mondumas/routes.py
View File

@@ -5,7 +5,7 @@ def includeme(config):
config.add_route('planning', '/planning/{date}') config.add_route('planning', '/planning/{date}')
config.add_route('rdv_edit','/rdv_edit/{nodossier}/{nolig}') config.add_route('rdv_edit','/rdv_edit/{nodossier}/{nolig}')
# default # default
config.add_route('home', '/') config.add_route('new_home', '/')
config.add_route('affiche_message','/affiche_message/{login}') config.add_route('affiche_message','/affiche_message/{login}')
config.add_route('ajax_article', '/ajax_article') config.add_route('ajax_article', '/ajax_article')
config.add_route('ajax_client', '/ajax_client') 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_img', '/upload_img/{norapport}/{origine}')
config.add_route('upload_om', '/upload_om') config.add_route('upload_om', '/upload_om')
config.add_route('dem_devis','/dem_devis') 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 # parametres
config.add_route('parametres', '/parametres') config.add_route('parametres', '/parametres')
config.add_route('article_edit', '/article_edit/{ref}') 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('user_edit', '/user_edit/{cd_uti}')
config.add_route('users', '/users') config.add_route('users', '/users')
config.add_route('users_ua', '/users_ua') config.add_route('users_ua', '/users_ua')
config.add_route('new_home', '/new_home') config.add_route('home', '/new_home')
# stats # stats
config.add_route('stats', '/stats') config.add_route('stats', '/stats')

40
mondumas/templates/parametres/new_home.pt → mondumas/templates/default/new_home.pt
View File

@@ -104,28 +104,32 @@
</a> </a>
</div> </div>
<div class="col-sm-3"> <div class="col-sm-3">
<div class="info-box bg-gest"> <a href="${request.application_url}/devis_en_att" tal:condition="access > 0">
<span class="info-box-icon"><i class="glyphicon glyphicon-file"></i></span> <div class="info-box bg-gest">
<div class="info-box-content"> <span class="info-box-icon"><i class="glyphicon glyphicon-file"></i></span>
<span class="info-box-number">DEVIS</span> <div class="info-box-content">
<span class="info-box-text">A traiter : </span> <span class="info-box-number">DEVIS</span>
<span class="info-box-number"><span class="badge bg-PE">${nb_de_restants.nb_PE}</span> <span class="info-box-text">A traiter : </span>
<span class="badge bg-ME">${nb_de_restants.nb_ME}</span> <span class="info-box-number"><span class="badge bg-PE">${nb_de_restants.nb_PE}</span>
<span class="badge bg-PL">${nb_de_restants.nb_PL}</span></span> <span class="badge bg-ME">${nb_de_restants.nb_ME}</span>
<span class="badge bg-PL">${nb_de_restants.nb_PL}</span></span>
</div>
</div> </div>
</div> </a>
</div> </div>
<div class="col-sm-3"> <div class="col-sm-3">
<div class="info-box bg-gest"> <a href="${request.application_url}/factures_en_att" tal:condition="access > 0">
<span class="info-box-icon"><i class="glyphicon glyphicon-inbox"></i></span> <div class="info-box bg-gest">
<div class="info-box-content"> <span class="info-box-icon"><i class="glyphicon glyphicon-inbox"></i></span>
<span class="info-box-number">FACTURES</span> <div class="info-box-content">
<span class="info-box-text">A traiter : </span> <span class="info-box-number">FACTURES</span>
<span class="info-box-number"><span class="badge bg-PE">${nb_fa_restants.nb_PE}</span> <span class="info-box-text">A traiter : </span>
<span class="badge bg-ME">${nb_fa_restants.nb_ME}</span> <span class="info-box-number"><span class="badge bg-PE">${nb_fa_restants.nb_PE}</span>
<span class="badge bg-PL">${nb_fa_restants.nb_PL}</span></span> <span class="badge bg-ME">${nb_fa_restants.nb_ME}</span>
<span class="badge bg-PL">${nb_fa_restants.nb_PL}</span></span>
</div>
</div> </div>
</div> </a>
</div> </div>
</div> </div>
<br /> <br />

30
mondumas/templates/dossier/devis_en_att.pt Normal file
View File

@@ -0,0 +1,30 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<br />
<table class="table table-condensed">
<tr tal:repeat="item list_devis_en_att">
<td>${item.DATEMAJ.strftime('%d %b')}</td>
<td><a href="${request.application_url}/devis_view/${item.societe}-DE${item.NO_ID}">${item.societe}-DE${item.NO_ID}</td>
<td>${item.NOMCLI}</td>
<td>${item.C_NOM}</td>
<td>${item.USERMAJ}</td>
<td><span class="badge bg-${item.STATUS}">${item.libelle}</span></td>
</tr>
</table>
<br />
<br />
<script type="text/javascript">
$('#generateButton').on('click', function(){
$('i.gly-spin').removeClass('gly-spin');
$('i').addClass('gly-spin');
});
</script>
</div><!-- content -->
</metal:block>

30
mondumas/templates/dossier/factures_en_att.pt Normal file
View File

@@ -0,0 +1,30 @@
<metal:block use-macro="main_template">
<div metal:fill-slot="content">
<br />
<table class="table table-condensed">
<tr tal:repeat="item list_factures_en_att">
<td>${item.DATEMAJ.strftime('%d %b')}</td>
<td><a href="${request.application_url}/devis_view/${item.societe}-FA${item.NO_ID}">${item.societe}-FA${item.NO_ID}</td>
<td>${item.NOMCLI}</td>
<td>${item.C_NOM}</td>
<td>${item.USERMAJ}</td>
<td><span class="badge bg-${item.STATUS}">${item.libelle}</span></td>
</tr>
</table>
<br />
<br />
<script type="text/javascript">
$('#generateButton').on('click', function(){
$('i.gly-spin').removeClass('gly-spin');
$('i').addClass('gly-spin');
});
</script>
</div><!-- content -->
</metal:block>

805
mondumas/views/default.py
View File

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

54
mondumas/views/dossier.py
View File

@@ -844,34 +844,6 @@ def rdf_bill(request):
'articles': articles, 'articles': articles,
'article' : article, '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') @view_config(route_name='demandes', renderer='../templates/dossier/demandes.pt', permission='view')
def demandes(request): def demandes(request):
@@ -1582,4 +1554,30 @@ def dem_devis(request):
'page_title': 'Dossiers générés à traiter', 'page_title': 'Dossiers générés à traiter',
'url': url, 'url': url,
'dossiers_traites':dossiers_traites, '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,
} }

95
mondumas/views/parametres.py
View File

@@ -837,99 +837,4 @@ def tarifs_import(request):
'message': message, 'message': message,
'groupes': groupes, 'groupes': groupes,
'groupe': groupe, '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,
} }

4
mondumas/views/stats.py
View File

@@ -176,8 +176,8 @@ def ca_groupes(request):
print(datedeb) print(datedeb)
chart_ca_12m = [] chart_ca_12m = []
# titre des colonnes # titre des colonnes
chart_ca_12m.append(('Mois', 'AXA', { 'type':'string','role': 'tooltip'}, 'MAIF', { 'type':'string','role': 'tooltip'},'DOMUS', { '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'})) 'GMF', { 'type':'string','role': 'tooltip'},'MACIF', { 'type':'string','role': 'tooltip'}, 'MAIF', { 'type':'string','role': 'tooltip'}))
title = 'CA sur 12 mois' title = 'CA sur 12 mois'
for item in items: for item in items:
date_aff = item.date[:3] + ' ' + item.date[-4:] date_aff = item.date[:3] + ' ' + item.date[-4:]