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
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

33
mondumas/models/default.py
View File

@@ -129,3 +129,36 @@ def get_codespostaux(request, codep):
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

12
mondumas/models/dossier.py
View File

@@ -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
@@ -337,3 +337,13 @@ def get_status_by_id(request, code):
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

34
mondumas/models/parametres.py
View File

@@ -227,37 +227,3 @@ 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

6
mondumas/routes.py
View File

@@ -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')

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

@@ -104,6 +104,7 @@
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/devis_en_att" tal:condition="access > 0">
<div class="info-box bg-gest">
<span class="info-box-icon"><i class="glyphicon glyphicon-file"></i></span>
<div class="info-box-content">
@@ -114,8 +115,10 @@
<span class="badge bg-PL">${nb_de_restants.nb_PL}</span></span>
</div>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="${request.application_url}/factures_en_att" tal:condition="access > 0">
<div class="info-box bg-gest">
<span class="info-box-icon"><i class="glyphicon glyphicon-inbox"></i></span>
<div class="info-box-content">
@@ -126,6 +129,7 @@
<span class="badge bg-PL">${nb_fa_restants.nb_PL}</span></span>
</div>
</div>
</a>
</div>
</div>
<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>

125
mondumas/views/default.py
View File

@@ -22,6 +22,8 @@ from user_agents import parse
import json
import locale
import hashlib
import imaplib
import email
from ..models.default import *
from ..models.agenda import *
@@ -85,6 +87,129 @@ def home(request):
'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')

54
mondumas/views/dossier.py
View File

@@ -845,34 +845,6 @@ def rdf_bill(request):
'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):
@@ -1583,3 +1555,29 @@ def dem_devis(request):
'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,
}

95
mondumas/views/parametres.py
View File

@@ -838,98 +838,3 @@ def tarifs_import(request):
'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,
}

4
mondumas/views/stats.py
View File

@@ -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:]