diff --git a/mondumas/models/utils.py b/mondumas/models/utils.py index 75e2bbc..ff84aa3 100644 --- a/mondumas/models/utils.py +++ b/mondumas/models/utils.py @@ -76,8 +76,8 @@ def get_all_chantiers(request,societe): return results def get_chantiers_month(request, societe, date_sel): - # provisoire : toute l'année -> AND MONTH(date)=MONTH(:date_sel) - query = """SELECT * FROM dem_devis WHERE societe = :societe AND YEAR(date)=YEAR(:date_sel) + # lire les chantiers du mois + query = """SELECT * FROM dem_devis WHERE societe = :societe AND YEAR(date)=YEAR(:date_sel) AND MONTH(date)=MONTH(:date_sel) AND delai_facture = 0 AND nomcli NOT IN ('DUMAS JEAN MICHEL','DUMAS MENUISERIE','DUMAS PEINTURE'); """ results = request.dbsession.execute(query, {'societe': societe, 'date_sel': date_sel}).fetchall() diff --git a/mondumas/views/utils.py b/mondumas/views/utils.py index cb050f1..17578ac 100644 --- a/mondumas/views/utils.py +++ b/mondumas/views/utils.py @@ -36,19 +36,23 @@ def batch_nuit(request): insert_log(request, 'PURGE','- Début PURGE DES DONNEES OBSOLETES') TODAY = date.today() # purger tous les 1er du mois - if TODAY.day() == 1 : + if TODAY.day == 1 : # données de + 10 ans - until_date = date(TODAY.year - 10, TODAY.month, 1).strftime('%Y-%m-%d') + until_date = date(TODAY.year - 10, TODAY.month, 1) purge_mensuelle(request, until_date) purge_clients(request) delete_orphan_attached_files(request) # ----- MAJ STATS DELAIS de traitements des dossiers sur 1 an insert_log(request, 'STATS', '- Début MAJ STATS DES PERFORMANCES') + update_chantiers_delais(request, date(TODAY.year, TODAY.month, 1)) + update_chantiers_delais(request, date(TODAY.year, TODAY.month-1, 1)) + update_chantiers_delais(request, date(TODAY.year, TODAY.month-2, 1)) + societes = ['PL', 'ME', 'PE'] datejour = TODAY groupes = ['MAIF', 'AXA', 'X'] - for i in range(12): + for i in range(4): for societe in societes: for groupe in groupes: update_stats_delais(request, societe, datejour.strftime('%Y-%m-%d'), groupe) @@ -61,10 +65,10 @@ def batch_nuit(request): sleep(5) # ----- envoyer les rappels - notifier_rappels(request) + # notifier_rappels(request) # ----- ENVOI RAPPORTS di traitement - email_rapport(request) + # email_rapport(request) return Response('Batch nuit terminé OK') @@ -195,22 +199,12 @@ def batch_test(request): TODAY = date.today() until_date = date(TODAY.year - 10, TODAY.month, 1) - purge_mensuelle(request, until_date) - purge_clients(request) + # purge_mensuelle(request, until_date) + # purge_clients(request) # delete_orphan_attached_files(request) - update_chantiers_delais(request, date(TODAY.year - 1, TODAY.month, 1)) - - societes = ['PL', 'ME', 'PE'] - datejour = TODAY - groupes = ['MAIF', 'AXA', 'X'] - for i in range(12): - for societe in societes: - for groupe in groupes: - update_stats_delais(request, societe, datejour.strftime('%Y-%m-%d'), groupe) - # recule d'un mois - datejour = datejour + relativedelta(months=-1) + # update_chantiers_delais(request, date(TODAY.year - 1, TODAY.month, 1)) return Response('Batch nuit terminé OK')