remplacer devis-en-attente par derniers-suivis

mondumas/models/dossier.py

@@ -58,7 +58,13 @@ def get_clients_byName(request, societe, nom):
     results = request.dbsession.execute(query).fetchall()
     return results
 
-
+def get_derniers_suivis(request):
+    query = """SELECT l.*, CONCAT(l.societe,'-',l.no_id) AS nodossier, d.C_NOM FROM dem_lig l
+    INNER JOIN dem_devis d ON l.societe=d.societe AND l.no_id=d.no_id
+    WHERE DATEDIFF(CURDATE(), l.date) <= 7 AND l.usermaj in ('CG','MP','RV','VD') ORDER BY l.date, l.societe DESC;""" 
+    results = request.dbsession.execute(query, ).fetchall()
+    return results
+    
 
 def get_dossier_rdv_by_no(request,nodossier, nolig):
     societe = nodossier[0:2]
@@ -287,6 +293,16 @@ def update_rapport_client(request, norapport, nomClient, codeClient):
     query = "UPDATE dem_rdf SET CD_CLI = :cd_cli, NOMCLI = :nomClient WHERE no_id = :norapport" 
     execute_query(request, query, {'norapport': norapport, 'cd_cli': cd_cli, 'nomClient': nomClient})
 
+def update_rapport_nochantier(request, norapport, new_nochantier):
+    # controler que le no du nouveau dossier existe
+    dossier = get_dossier_by_no(request,'PL-' + new_nochantier)
+    if dossier:
+        query = "UPDATE dem_rdf SET nochantier = :new_nochantier WHERE no_id = :norapport" 
+        execute_query(request, query, {'norapport': norapport, 'new_nochantier': new_nochantier})
+        return "OK"
+    else:
+        return "NOK"
+
 def insert_facture_rdf(request, societe, nochantier, cd_cli, nomcli, user, ref, date_rapport):
     # créer une facture vierge à partir du dossier
     query = "CALL spINS_FACTURE_RDF(:societe, :nochantier, :cd_cli, :nomcli, :user, :ref, :date_rapport)"