From ed897c728f48b168f3a39d3ea4c855bc0dce00f9 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Mon, 7 Feb 2022 11:53:23 +0100
Subject: [PATCH] fixed article update

---
 mondumas/models/default.py    |  2 +-
 mondumas/models/parametres.py |  5 +++++
 mondumas/views/default.py     |  4 ++--
 mondumas/views/parametres.py  |  8 ++++++--
 mondumas/views/utils.py       | 12 ++++++------
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/mondumas/models/default.py b/mondumas/models/default.py
index a22da27..ac815e2 100644
--- a/mondumas/models/default.py
+++ b/mondumas/models/default.py
@@ -103,7 +103,7 @@ def delete_membre(request, cd_uti):
     query = "DELETE FROM p_users WHERE cd_uti = :cd_uti ;"
     execute_query(request, query, {'cd_uti': cd_uti})
 
-def get_article(request, type, groupe, libelle):
+def get_tarif_ajax(request, type, groupe, libelle):
     if type == 'LIB':
         if groupe == 'TEXTE':
             # lire tous les textes dont le libelle commençe par 
diff --git a/mondumas/models/parametres.py b/mondumas/models/parametres.py
index c229442..3ee283a 100644
--- a/mondumas/models/parametres.py
+++ b/mondumas/models/parametres.py
@@ -104,6 +104,11 @@ def get_articles_byFam(request, fam):
     results = request.dbsession.execute(query, ).fetchall()           
     return results
 
+def get_article(request, ref):
+    query = "SELECT * FROM articles WHERE REF = ref;"
+    results = request.dbsession.execute(query, ).first()           
+    return results
+
 def update_article(request, ref, new_values):
     # formater les champs
     s = ''
diff --git a/mondumas/views/default.py b/mondumas/views/default.py
index bd627f3..27c9761 100644
--- a/mondumas/views/default.py
+++ b/mondumas/views/default.py
@@ -382,7 +382,7 @@ def ajax_texte(request):
     # import pdb;pdb.set_trace()
     
     # lire les articles commencant par
-    items = get_article(request, 'LIB', groupe, libelle)
+    items = get_tarif_ajax(request, 'LIB', groupe, libelle)
     
     liste=[]
     for row in items:
@@ -400,7 +400,7 @@ def ajax_article(request):
     ref = request.GET['ref']
     
     # lire l'article 
-    items = get_article(request, 'REF', groupe, ref)
+    items = get_tarif_ajax(request, 'REF', groupe, ref)
     # puis retourne son libellé et son prixht
     liste=[]
     d = {}
diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py
index 859e6e7..6fe8220 100644
--- a/mondumas/views/parametres.py
+++ b/mondumas/views/parametres.py
@@ -385,7 +385,11 @@ def articles(request):
 def article_edit(request):
     ref = request.matchdict['ref']
     url = request.route_url('article_edit', ref=ref)
-    logged_in = request.authenticated_userid
+    logged_in = request.authenticated_userid.upper()
+    # modification d'article temporairement désactivé
+    # if logged_in != 'CAO':
+    #     return HTTPFound(location=request.route_url('articles'))
+
     message = ''
     
     familles = ["Article", "Texte"]
@@ -407,7 +411,7 @@ def article_edit(request):
         page_title= 'Nouvel article'
     else:
         # lire l'article 
-        item = get_article(request, 'REF', ref)
+        item = get_article(request, ref)
         if not item:
             request.session.flash("article non trouvé : %s" % ref, 'warning')
             return HTTPFound(location=request.route_url('articles'))
diff --git a/mondumas/views/utils.py b/mondumas/views/utils.py
index d29dadd..dd01af4 100644
--- a/mondumas/views/utils.py
+++ b/mondumas/views/utils.py
@@ -197,7 +197,7 @@ def batch_test(request):
     TODAY = date.today()
     
     # ------ UPDATE statut DEVIS COMMANDE
-    update_devis_statut_4(request)
+    # update_devis_statut_4(request)
 
     """
     # ----- MAJ STATS DELAIS de traitements des dossiers sur 1 an
@@ -207,11 +207,11 @@ def batch_test(request):
         datejour = datejour + relativedelta(months=-1)
 
     """
-    # until_date = date(TODAY.year - 10, TODAY.month, 1)
-    # purge_mensuelle(request, until_date)
-    # purge_clients(request)
-
-    # delete_orphan_attached_files(request)
+    # données de + 10 ans
+    until_date = date(TODAY.year - 10, TODAY.month, 1)
+    purge_mensuelle(request, until_date)
+    purge_clients(request)
+    delete_orphan_attached_files(request)
 
     # update_chantiers_delais(request, date(TODAY.year - 1, TODAY.month, 1))
     insert_log(request, 'TEST','- Fin -')