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

ajout Doc techniques dans dossier_view.pt et articles.pt

Browse Source
This commit is contained in:
Phuoc
2020-11-20 09:47:20 +01:00
parent dab24387a2
commit d03e90b7b8
26 changed files with 665 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mondumas/models/default.py
View File

@@ -120,8 +120,11 @@ def get_article(request, type, libelle):
elif type == 'AR':
query = "SELECT * FROM articles WHERE ref_cli2 like :libelle;"
results = request.dbsession.execute(query, {'libelle': libelle + "%"}).fetchall()
elif type == 'REF':
query = "SELECT * FROM articles WHERE ref = :ref;"
results = request.dbsession.execute(query, {'ref': libelle}).first()
else:
query = "SELECT * FROM articles WHERE ref_cli2 = :ref_cli2;"
results = request.dbsession.execute(query, {'ref_cli2': libelle}).first()
query = "SELECT * FROM articles WHERE ref_cli2 = :ref;"
results = request.dbsession.execute(query, {'ref': libelle}).first()
return results

10
mondumas/models/devis.py
View File

@@ -193,3 +193,13 @@ def move_devis_ligne(request, nodossier, nolig, move):
# remettre le précédent ou suivant à la place de la ligne déplacée
query = """UPDATE devis_lignes SET nolig = :nolig WHERE societe = :societe and no_id=:no_id and nolig = :max_no;"""
execute_query(request, query, {'societe': societe, 'no_id': no_id, 'nolig': nolig, 'max_no': max_no})
def get_societes(request, societe):
if societe == '0':
query = "SELECT * FROM p_societe;"
results = request.dbsession.execute(query, {'societe': societe, 'no_id': no_id}).fetchall()
else:
query = "SELECT * FROM p_societe WHERE societe = :societe;"
results = request.dbsession.execute(query, {'societe': societe}).first()
return results

34
mondumas/models/dossier.py
View File

@@ -121,17 +121,17 @@ WHERE societe<>:societe AND C_NOM=:C_NOM AND C_ADR=:C_ADR AND C_CP=:C_CP AND C_V
return results
def get_docs_attaches(request, nodossier, norapport, nosection, filename):
def get_docs_attaches(request, nodossier, norapport, nosection, origine, filename):
societe = nodossier[0:2]
nochantier = int(nodossier[3:])
if filename == '':
query = "SELECT * FROM dossier_attaches WHERE nomrep = 'DOCS_ATTACHES' AND societe = :societe AND nochantier = :nochantier AND nodossier=0 ORDER BY cree_le;"
query = "SELECT * FROM dossier_attaches WHERE nomrep = 'DOCS_ATTACHES' AND societe = :societe AND nochantier = :nochantier AND nodossier=0 AND origine = :origine ORDER BY cree_le;"
else:
query = """SELECT * FROM dossier_attaches WHERE nomrep = 'DOCS_ATTACHES' AND societe = :societe AND nochantier = :nochantier
AND nodossier = :norapport AND nomfichier = :filename ORDER BY cree_le;"""
results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport, 'filename': filename}).fetchall()
AND nodossier = :norapport AND origine = :origine AND nomfichier = :filename ORDER BY cree_le;"""
results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier,
'norapport': norapport, 'origine': origine, 'filename': filename}).fetchall()
return results
def get_photos(request, nodossier, norapport, nosection):
@@ -176,18 +176,26 @@ def update_dossier(request, nodossier, new_values):
query = "CALL spUPD_CHANTIER_COORD(:societe, :nochantier);"
execute_query(request, query, {'societe': societe, 'nochantier': nochantier})
def insert_dossier_attaches(request, nodossier, norapport, nosection, filename, filesize, user):
def update_dossier_cloture(request, nodossier, logged_in):
societe = nodossier[0:2]
nochantier = int(nodossier[3:])
# met le montant regle à 1 centime pour terminé le dossier
query = "UPDATE dem_devis SET mtregl = 0.01, USERMAJ = :logged_in WHERE societe=:societe AND no_id=:nochantier"
execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'logged_in': logged_in})
def insert_dossier_attaches(request, nodossier, norapport, nosection, origine, filename, filesize, user):
societe = nodossier[0:2]
nochantier = int(nodossier[3:])
# fichier existe ?
item = get_docs_attaches(request, nodossier, norapport, nosection, filename)
item = get_docs_attaches(request, nodossier, norapport, nosection, origine, filename)
if item:
return
# enregistrer dans la table dossier_attaches
query = """INSERT INTO dossier_attaches (nomrep, societe, nochantier, nodossier, nosection, nomfichier, taillefichier, cree_le, usermaj)
VALUES('DOCS_ATTACHES',:societe,:nochantier,:norapport,:nosection,:filename,:filesize,NOW(),:user);"""
execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport, 'nosection': nosection, 'filename': filename, 'filesize': filesize, 'user': user})
query = """INSERT INTO dossier_attaches (nomrep, societe, nochantier, nodossier, nosection, origine, nomfichier, taillefichier, cree_le, usermaj)
VALUES('DOCS_ATTACHES',:societe,:nochantier,:norapport,:nosection,:origine,:filename,:filesize,NOW(),:user);"""
execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'norapport': norapport,
'nosection': nosection, 'origine': origine, 'filename': filename, 'filesize': filesize, 'user': user})
def get_rapport_by_no(request,nodossier,date_inter):
societe = nodossier[0:2]
@@ -205,9 +213,9 @@ def get_rapport_by_no_id(request,no_id):
results = request.dbsession.execute(query, {'no_id': no_id}).first()
return results
def get_articles_by_fam(request, fam):
query = "SELECT * FROM articles WHERE FAM = :fam;"
results = request.dbsession.execute(query, {'fam': fam}).fetchall()
def get_articles_rdf(request):
query = "SELECT * FROM articles WHERE REF LIKE 'RDF%';"
results = request.dbsession.execute(query).fetchall()
return results
def get_rapport_rdf(request):

33
mondumas/models/parametres.py
View File

@@ -109,3 +109,36 @@ def delete_text(request, text_id):
"""supprimer la text"""
query = "delete from p_texts where text_id = :text_id;"
execute_query(request, query, {'text_id': text_id})
def get_articles_byFam(request, fam):
if fam == 'T':
query = "SELECT * FROM articles WHERE FAM = 'T';"
else:
query = "SELECT * FROM articles WHERE FAM != 'T';"
results = request.dbsession.execute(query, ).fetchall()
return results
def update_article(request, ref, new_values):
# formater les champs
s = ''
for param in new_values.keys():
if param == 'FAM':
' ne prend que 2 premiers caractères'
new_values['FAM'] = new_values['FAM'][0:2].upper()
if s:
s += ",%s=:%s" % (param, param)
else:
s = "%s=:%s" % (param, param)
if ref == '0':
query = "INSERT INTO articles SET %s" % s
else:
new_values['ref'] = ref
query = "UPDATE articles SET %s WHERE ref = :ref;" % s
execute_query(request, query, new_values)
def delete_article(request, ref):
query = "DELETE FROM articles WHERE ref = :ref ;"
execute_query(request, query, {'ref': ref})