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

ajout module Default et suivi_edit.pt

Browse Source
This commit is contained in:
Phuoc
2018-11-27 17:33:50 +01:00
parent 4980349d26
commit 4bc65dae42
19 changed files with 398 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
mondumas/models/agenda.py
View File

@@ -26,39 +26,6 @@ def get_users_agenda(request):
results = request.dbsession.execute(query).fetchall()
return results
def get_dossier_by_no(request,nodossier):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = """
SELECT d.*, c.*, a.NOM as nom_cabinet, e.NOM as nom_expert FROM dem_devis d
INNER JOIN clients c ON d.societe = c.societe and d.cd_cli = c.cd_cli
INNER JOIN p_cabinet a ON d.cabinet = a.code
INNER JOIN p_experts e ON d.cabinet = e.code_cab and d.expert = e.code_exp
where d.societe = '%s' and d.no_id=%s;""" % (societe, no_id);
results = request.dbsession.execute(query).first()
return results
def get_dossier_rdv_by_no(request,nodossier, nolig):
societe = nodossier[0:2]
no_id = nodossier[3:]
if nolig == '0':
query = "SELECT * FROM dem_lig where societe = '%s' and no_id=%s;" % (societe, no_id)
results = request.dbsession.execute(query).fetchall()
else:
query = "SELECT * FROM dem_lig where societe = '%s' and no_id=%s and nolig=%s;" % (societe, no_id, nolig)
results = request.dbsession.execute(query).first()
return results
def get_documents_byChantier(request,nodossier):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = "CALL spGET_DOSSIERS_byNumeo('%s',%s);" % (societe, no_id)
results = request.dbsession.execute(query).fetchall()
return results
def get_rendez_vous(request, itc):
d = datetime.now()
d = d - dateutil.relativedelta.relativedelta(months=3)
@@ -66,7 +33,7 @@ def get_rendez_vous(request, itc):
datedeb = d.strftime('%Y-%m-01')
# lire les rdv de l'ITC
query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.rdv_debut, l.rdv_fin, e.c_nom, e.c_ville FROM dem_lig l
query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.nolig, l.rdv_debut, l.rdv_fin, e.c_nom, e.c_ville FROM dem_lig l
INNER JOIN dem_devis e ON l.societe=e.societe AND l.no_id=e.no_id
WHERE l.datevi >= :datedeb AND l.liste=:itc ORDER BY l.datevi, l.heurevi
"""
@@ -80,20 +47,27 @@ def delete_rdv(request, nodossier, nolig):
query = "DELETE FROM dem_lig where societe = '%s' and no_id=%s and nolig=%s;" % (societe, no_id, nolig)
execute_query(request, query, {})
def update_rdv(request, nodossier, nolig, comment, commentvi, date_rdv):
def update_rdv(request, nodossier, nolig, new_values):
societe = nodossier[0:2]
no_id = nodossier[3:]
# formater les champs
ddate = datetime.strptime(date_rdv, '%d-%m-%Y %H:%M')
datevi = ddate.strftime("%Y-%m-%d")
heurevi = date_rdv[-5:]
auj = date.today().strftime("%Y-%m-%d")
# formater date et heure de visite
if new_values['rdv_debut']:
ddate = datetime.strptime(new_values['rdv_debut'], '%d-%m-%Y %H:%M')
new_values['DATEVI'] = ddate.strftime("%Y-%m-%d")
new_values['HEUREVI'] = ddate.strftime("%H:%M")
if nolig == '0':
query = "INSERT INTO dem_devis SET societe='%s',no_id=%s,date='%s',datevi='%s',heurevi='%s',comment='%s',commentvi='%s'" % (societe, no_id,auj,datevi, heurevi, comment, commentvi)
else:
query = "UPDATE dem_ligs SET datevi='%s', heurevi='%s', comment='%s', commentvi='%s' where societe = '%s' and no_id=%s and nolig=%s;" % (datevi, heurevi, comment, commentvi, societe, no_id, nolig)
del new_values['rdv_debut']
s = ''
for param in new_values.keys():
if s:
s += ",%s=:%s" % (param, param)
else:
s = "%s=:%s" % (param, param)
execute_query(request, query, {})
new_values['societe'] = societe
new_values['no_id'] = no_id
new_values['nolig'] = nolig
query = "UPDATE dem_lig SET %s WHERE societe = :societe AND NO_ID = :no_id AND NOLIG = :nolig ;" % s
execute_query(request, query, new_values)

54
mondumas/models/default.py
View File

@@ -87,3 +87,57 @@ def get_chantiers_byName(request, societe, name, tous):
results = request.dbsession.execute(query).fetchall()
return results
def get_dossier_by_no(request,nodossier):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = """
SELECT d.*, c.*, a.NOM as nom_cabinet, e.NOM as nom_expert FROM dem_devis d
INNER JOIN clients c ON d.societe = c.societe and d.cd_cli = c.cd_cli
INNER JOIN p_cabinet a ON d.cabinet = a.code
INNER JOIN p_experts e ON d.cabinet = e.code_cab and d.expert = e.code_exp
where d.societe = '%s' and d.no_id=%s;""" % (societe, no_id);
results = request.dbsession.execute(query).first()
return results
def get_dossier_rdv_by_no(request,nodossier, nolig):
societe = nodossier[0:2]
no_id = nodossier[3:]
if nolig == '0':
query = "SELECT * FROM dem_lig where societe = '%s' and no_id=%s;" % (societe, no_id)
results = request.dbsession.execute(query).fetchall()
else:
query = "SELECT * FROM dem_lig where societe = '%s' and no_id=%s and nolig=%s;" % (societe, no_id, nolig)
results = request.dbsession.execute(query).first()
return results
def get_documents_byChantier(request,nodossier):
societe = nodossier[0:2]
no_id = nodossier[3:]
query = "CALL spGET_DOSSIERS_byNumeo('%s',%s);" % (societe, no_id)
results = request.dbsession.execute(query).fetchall()
return results
def update_suivi(request, nodossier, nolig, new_values):
societe = nodossier[0:2]
no_id = nodossier[3:]
new_values['societe'] = societe
new_values['NO_ID'] = no_id
s = ''
for param in new_values.keys():
if s:
s += ",%s=:%s" % (param, param)
else:
s = "%s=:%s" % (param, param)
if nolig == '0':
query = "INSERT INTO dem_lig SET %s" % s
else:
new_values['nolig'] = nolig
query = "UPDATE dem_lig SET %s WHERE societe = :societe AND NO_ID = :no_id AND NOLIG = :nolig ;" % s
execute_query(request, query, new_values)