agoraplus: returns full nursery enrollment results
This commit is contained in:
parent
5be56d4aa8
commit
0435dc5f4c
|
@ -307,6 +307,9 @@ def normalize_planning(planning):
|
|||
return new_planning
|
||||
|
||||
def normalize_nursery_enroll_results(results):
|
||||
"""
|
||||
return only last month result, if exists
|
||||
"""
|
||||
if not results:
|
||||
return {'decision': ''}
|
||||
result = results.pop()
|
||||
|
@ -316,10 +319,32 @@ def normalize_nursery_enroll_results(results):
|
|||
date = datetime.strptime(result['dateCommission'], '%d/%m/%y').date()
|
||||
if (datetime.today().date() - date).days > 30:
|
||||
return {'decision': ''}
|
||||
# return only last month results, if exists
|
||||
new_result = {}
|
||||
new_result['date'] = date
|
||||
new_result['date_fr'] = date.strftime('%d/%m/%Y')
|
||||
new_result['decision'] = slugify(result['decision'])
|
||||
new_result['struct'] = result['strctProposee']
|
||||
new_result['proposed_structure'] = result['strctProposee']
|
||||
if result.get('dateDecisionFammille'):
|
||||
try:
|
||||
date = datetime.strptime(result['dateDecisionFammille'], '%d/%m/%Y').date()
|
||||
except ValueError:
|
||||
date = datetime.strptime(result['dateDecisionFammille'], '%d/%m/%y').date()
|
||||
new_result['family_decision_date'] = date
|
||||
new_result['family_decision_date_fr'] = date.strftime('%d/%m/%Y')
|
||||
else:
|
||||
new_result['family_decision_date'] = ''
|
||||
new_result['family_decision_date_fr'] = ''
|
||||
new_result['family_decision'] = result.get('decisionFamille') or ''
|
||||
new_result['family_decision_reason'] = result.get('MotifRefusFamille') or ''
|
||||
new_result['comment'] = result.get('commentaire') or ''
|
||||
if result.get('dateMaintien'):
|
||||
try:
|
||||
date = datetime.strptime(result['dateMaintien'], '%d/%m/%Y').date()
|
||||
except ValueError:
|
||||
date = datetime.strptime(result['dateMaintien'], '%d/%m/%y').date()
|
||||
new_result['maintain_date'] = date
|
||||
new_result['maintain_date_fr'] = date.strftime('%d/%m/%Y')
|
||||
else:
|
||||
new_result['maintain_date'] = ''
|
||||
new_result['maintain_date_fr'] = ''
|
||||
return new_result
|
||||
|
|
Loading…
Reference in New Issue