From 16f14b10c95c70e3c927330550987899e70bcfea Mon Sep 17 00:00:00 2001 From: Etienne Loupias Date: Wed, 28 Feb 2018 16:02:11 +0100 Subject: [PATCH] Modif GL --- grandlyon_iodas/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grandlyon_iodas/models.py b/grandlyon_iodas/models.py index a2e31b5..9bdde8c 100644 --- a/grandlyon_iodas/models.py +++ b/grandlyon_iodas/models.py @@ -99,8 +99,9 @@ class grandlyonIodas(BaseResource): if 'taches' in etape : for tache in etape['taches']['tache'] : if tache['idtypetache'] == 2 and datetime.strptime(tache['datearret'], "%d/%m/%Y") > datetime.now(): - moisfin = 1 if (datetime.strptime(tache['datearret'], "%d/%m/%Y") - dateutil.relativedelta.relativedelta(months=1)) == datetime.now() else 0 - droits.append({"libl":tache['produit']['libl'], "dateproposition":tache['dateproposition'], "datearret":tache['datearret'], "dateeffet":tache['dateeffet'], "moisfin":moisfin}) + for nb in [3,6] : + deltafindroit = nb if (datetime.strptime(tache['datearret'], "%d/%m/%Y") - dateutil.relativedelta.relativedelta(months=nb)) == datetime.now().replace(hour=0, minute=0, second=0, microsecond=0) else 0 + droits.append({"libl":tache['produit']['libl'], "dateproposition":tache['dateproposition'], "datearret":tache['datearret'], "dateeffet":tache['dateeffet'], "deltafindroit":deltafindroit}) return {'hash': hashlib.sha224(json.dumps(data)).hexdigest(), 'libl': data['procedures']['procedures']['procedure'][nbProc]['libl'] if 'procedures' in data else '',