toulouse-maelis: refine type criteria on activity catalog (#74510)
gitea-wip/passerelle/pipeline/pr-main This commit looks good Details
gitea/passerelle/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Nicolas Roche 2023-02-14 13:14:55 +01:00 committed by Gitea
parent 6e5fdb7c31
commit f8be527246
3 changed files with 10 additions and 4 deletions

View File

@ -26,6 +26,7 @@ from django.core.serializers.json import DjangoJSONEncoder
from django.db import models
from django.utils import dateformat
from django.utils.dateparse import parse_date
from django.utils.text import slugify
from django.utils.timezone import now
from zeep.helpers import serialize_object
from zeep.wsse.username import UsernameToken
@ -2213,7 +2214,8 @@ class ToulouseMaelis(BaseResource, HTTPResource):
for label_key in criterias:
criterias[label_key]['data'] = {}
add_criteria('nature', activity_nature['code'], activity_nature['libelle'])
add_criteria('type', activity_type['code'], activity_type['libelle'])
type_value = activity_type['libelle'].split('-')[0].strip()
add_criteria('type', slugify(type_value), type_value)
if activity['activityPortail']['weeklyCalendarActivityList']:
for day in activity['activityPortail']['weeklyCalendarActivityList'][0]['dayWeekInfoList']:

View File

@ -16,8 +16,8 @@
</calendarGeneration>
<calendarMode>C</calendarMode>
<activityType>
<code>LOI_ADU</code>
<libelle>Loisirs Adultes</libelle>
<code>27</code>
<libelle>ACTIVITE REGULIERE - ART PLASTIQUE</libelle>
<natureSpec>
<code>P</code>
<libelle>Loisirs</libelle>

View File

@ -4871,7 +4871,11 @@ def test_read_activity_list(con, app, freezer):
'place': 'N/A',
'criterias': {
'nature': {'text': "Nature de l'activité", 'data': {'P': 'Loisirs'}, 'order': ['P']},
'type': {'text': "Type d'activité", 'data': {'LOI_ADU': 'Loisirs Adultes'}, 'order': ['LOI_ADU']},
'type': {
'text': "Type d'activité",
'data': {'activite-reguliere': 'ACTIVITE REGULIERE'},
'order': ['activite-reguliere'],
},
'public': {
'text': 'Public',
'data': {