entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

toulouse-maelis: use libelle2 to display activities (#77291)
gitea/passerelle/pipeline/head This commit looks good Details

This commit is contained in:
Nicolas Roche 2023-05-09 15:14:48 +02:00 committed by Nicolas Roche
parent d87dd7b107
commit 135cdbf46a
7 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
passerelle/contrib/toulouse_maelis/models.py
View File

@ -1465,7 +1465,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
if school_year not in school_years:
continue
item['id'] = item['idActivity']
item['text'] = item['libelle']
item['text'] = item.get('libelle2') or item['libelle']
data.append(item)
return {'data': data}
@ -2185,15 +2185,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
booking['details']['status_color'] = color
booking['details']['activity_id'] = activity_id
booking['details']['activity_type'] = activity['activityType']['code']
if (
activity['activityType']['natureSpec']['code']
in self.get_perisco_nature_codes()
):
booking['details']['activity_label'] = activity['activityType']['libelle']
else:
booking['details']['activity_label'] = (
activity['libelle2'] or activity['libelle']
)
booking['details']['activity_label'] = activity['libelle2'] or activity['libelle']
if many_units:
booking['details']['activity_label'] += ' (%s)' % unit['unit']['libelle']
booking['details']['child_id'] = child_id
@ -2754,7 +2746,9 @@ class ToulouseMaelis(BaseResource, HTTPResource):
if not activity_nature or activity_nature['code'] not in self.get_loisir_nature_codes():
continue
activity['id'] = activity['activityPortail']['idAct']
activity['text'] = activity['activityPortail']['libelle']
activity['text'] = (
activity['activityPortail']['libelle2'] or activity['activityPortail']['libelle']
)
for label_key in criterias:
criterias[label_key]['data'] = {}
@ -3098,7 +3092,8 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'id': '%s:%s:%s' % (item['activity_id'], item['unit_id'], item['place_id']),
'text': '%s / %s / %s'
% (
item['activity']['activity']['libelle1'],
item['activity']['activity']['libelle2']
or item['activity']['activity']['libelle1'],
item['unit']['libelle'],
item['place']['place']['lib1'],
),
@ -3292,7 +3287,12 @@ class ToulouseMaelis(BaseResource, HTTPResource):
}
booking['details']['day_str'] = day_str
booking['details']['status_color'] = 'white'
booking['details']['activity_label'] = unit['unit']['libelle'] if many_units else ''
booking['details']['activity_label'] = (
response['activity']['libelle2'] or response['activity']['libelle1']
)
if many_units:
booking['details']['activity_label'] += ' (%s)' % unit['unit']['libelle']
# uncheck other units selected on same day
booking['details']['activity_id'] = unit['unit']['idUnit']
@ -3792,6 +3792,8 @@ class ToulouseMaelis(BaseResource, HTTPResource):
item['unit_ids'][unit['typeAcc']] = unit['idUnit']
if code_psu:
item['unit_id'] = item['unit_ids'].get(code_psu)
if item['libelle2']:
item['text'] = item['libelle2']
return {'data': nurseries}
@endpoint(

3
tests/data/toulouse_maelis/R_get_person_schedule_list.xml
View File

@ -15,6 +15,7 @@
<activity>
<idAct>A10049327689</idAct>
<libelle>CLAE MATIN 22/23</libelle>
<libelle2>Accueil du matin</libelle2>
<activityType>
<code>ACCMAT</code>
<libelle>Accueil du matin</libelle>
@ -131,6 +132,7 @@
<activity>
<idAct>A10049327682</idAct>
<libelle>RESTAURATION SCOLAIRE 22/23</libelle>
<libelle2>Restauration scolaire</libelle2>
<activityType>
<code>RESTSCOL</code>
<libelle>Restauration scolaire</libelle>
@ -247,6 +249,7 @@
<activity>
<idAct>A10049327682</idAct>
<libelle>RESTAURATION SCOLAIRE 22/23</libelle>
<libelle2>Restauration scolaire</libelle2>
<activityType>
<code>RESTSCOL</code>
<libelle>Restauration scolaire</libelle>

2
tests/data/toulouse_maelis/R_get_person_schedule_list_with_activity.xml
View File

@ -12,6 +12,7 @@
<activity>
<idAct>A10049327689</idAct>
<libelle>CLAE MATIN 22/23</libelle>
<libelle2>Accueil du matin</libelle2>
<activityType>
<code>ACCMAT</code>
<libelle>Accueil du matin</libelle>
@ -264,6 +265,7 @@
<activity>
<idAct>A10049354913</idAct>
<libelle>SEMST2 ADL MERC. ELEM Maourine 22/23</libelle>
<libelle2>ADL Élémentaire Maourine</libelle2>
<activityType>
<code>EXTMERC</code>
<libelle>Mercredi</libelle>

4
tests/data/toulouse_maelis/R_get_person_schedule_list_with_multi_units.xml
View File

@ -15,6 +15,7 @@
<activity>
<idAct>A10049327682</idAct>
<libelle>RESTAURATION SCOLAIRE 22/23</libelle>
<libelle2>Restauration scolaire</libelle2>
<activityType>
<code>RESTSCOL</code>
<libelle>Restauration scolaire</libelle>
@ -53,6 +54,7 @@
<activity>
<idAct>A10049327689</idAct>
<libelle>CLAE MATIN 22/23</libelle>
<libelle2>Accueil du matin</libelle2>
<activityType>
<code>ACCMAT</code>
<libelle>Accueil du matin</libelle>
@ -79,6 +81,7 @@
<activity>
<idAct>A10049327691</idAct>
<libelle>CLAE SOIR 22/23</libelle>
<libelle2>Accueil du soir</libelle2>
<activityType>
<code>ACCSOIR</code>
<libelle>Accueil du soir</libelle>
@ -105,6 +108,7 @@
<activity>
<idAct>A10049327693</idAct>
<libelle>CLAE MIDI 22/23</libelle>
<libelle2>Accueil p\xc3\xa9riscolaire</libelle2>
<activityType>
<code>ACCPERI</code>
<libelle>Accueil p\xc3\xa9riscolaire</libelle>

1
tests/data/toulouse_maelis/R_get_person_unit_info_with_open_day_list.xml
View File

@ -16,6 +16,7 @@
<activity>
<idActivity>A10049354913</idActivity>
<libelle1>SEMST2 ADL MERC. ELEM Maourine 22/23</libelle1>
<libelle2>ADL Élémentaire Maourine</libelle2>
<activityType>
<code>EXTMERC</code>
<libelle>Mercredi</libelle>

1
tests/data/toulouse_maelis/R_get_person_unit_info_with_open_day_list_with_multi_units.xml
View File

@ -16,6 +16,7 @@
<activity>
<idActivity>A10055597158</idActivity>
<libelle1>ADL ELEMENTAIRE Maourine Avril 2023</libelle1>
<libelle2>ADL Élémentaire Maourine</libelle2>
<activityType>
<code>EXTVAC</code>
<libelle>Vacances</libelle>

30
tests/test_toulouse_maelis.py
View File

@ -5177,7 +5177,7 @@ def test_read_child_agenda_with_activity(activity_service, con, app):
'status_color': 'green',
'activity_id': 'A10049354913',
'activity_type': 'EXTMERC',
'activity_label': 'SEMST2 ADL MERC. ELEM Maourine 22/23',
'activity_label': 'ADL Élémentaire Maourine',
'child_id': '322423',
'day_str': '2023-05-10',
'unit_id': 'A10049354915',
@ -7090,7 +7090,7 @@ def test_get_person_subscription_info_with_agenda(activity_service, con, app):
'hasPlace': True,
'day_str': '2023-05-10',
'status_color': 'white',
'activity_label': '',
'activity_label': 'ADL Élémentaire Maourine',
'activity_id': 'A10049354915',
},
},
@ -7104,7 +7104,7 @@ def test_get_person_subscription_info_with_agenda(activity_service, con, app):
'hasPlace': True,
'day_str': '2023-05-17',
'status_color': 'white',
'activity_label': '',
'activity_label': 'ADL Élémentaire Maourine',
'activity_id': 'A10049354915',
},
},
@ -7118,7 +7118,7 @@ def test_get_person_subscription_info_with_agenda(activity_service, con, app):
'hasPlace': False,
'day_str': '2023-05-24',
'status_color': 'white',
'activity_label': '',
'activity_label': 'ADL Élémentaire Maourine',
'activity_id': 'A10049354915',
},
},
@ -7132,7 +7132,7 @@ def test_get_person_subscription_info_with_agenda(activity_service, con, app):
'hasPlace': True,
'day_str': '2023-05-31',
'status_color': 'white',
'activity_label': '',
'activity_label': 'ADL Élémentaire Maourine',
'activity_id': 'A10049354915',
},
},
@ -7168,7 +7168,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': True,
'day_str': '2023-04-11',
'status_color': 'white',
'activity_label': 'Demi-journée',
'activity_label': 'ADL Élémentaire Maourine (Demi-journée)',
'activity_id': 'A10055597162',
},
},
@ -7182,7 +7182,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': True,
'day_str': '2023-04-11',
'status_color': 'white',
'activity_label': 'Journée',
'activity_label': 'ADL Élémentaire Maourine (Journée)',
'activity_id': 'A10055597164',
},
},
@ -7196,7 +7196,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': True,
'day_str': '2023-04-12',
'status_color': 'white',
'activity_label': 'Demi-journée',
'activity_label': 'ADL Élémentaire Maourine (Demi-journée)',
'activity_id': 'A10055597162',
},
},
@ -7210,7 +7210,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': True,
'day_str': '2023-04-12',
'status_color': 'white',
'activity_label': 'Journée',
'activity_label': 'ADL Élémentaire Maourine (Journée)',
'activity_id': 'A10055597164',
},
},
@ -7224,7 +7224,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': True,
'day_str': '2023-04-13',
'status_color': 'white',
'activity_label': 'Demi-journée',
'activity_label': 'ADL Élémentaire Maourine (Demi-journée)',
'activity_id': 'A10055597162',
},
},
@ -7238,7 +7238,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': True,
'day_str': '2023-04-13',
'status_color': 'white',
'activity_label': 'Journée',
'activity_label': 'ADL Élémentaire Maourine (Journée)',
'activity_id': 'A10055597164',
},
},
@ -7252,7 +7252,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': True,
'day_str': '2023-04-14',
'status_color': 'white',
'activity_label': 'Demi-journée',
'activity_label': 'ADL Élémentaire Maourine (Demi-journée)',
'activity_id': 'A10055597162',
},
},
@ -7266,7 +7266,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': True,
'day_str': '2023-04-14',
'status_color': 'white',
'activity_label': 'Journée',
'activity_label': 'ADL Élémentaire Maourine (Journée)',
'activity_id': 'A10055597164',
},
},
@ -7280,7 +7280,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': False,
'day_str': '2023-04-19',
'status_color': 'white',
'activity_label': 'Demi-journée',
'activity_label': 'ADL Élémentaire Maourine (Demi-journée)',
'activity_id': 'A10055597162',
},
},
@ -7294,7 +7294,7 @@ def test_get_person_subscription_info_with_agenda_multi_units(activity_service,
'hasPlace': False,
'day_str': '2023-04-19',
'status_color': 'white',
'activity_label': 'Journée',
'activity_label': 'ADL Élémentaire Maourine (Journée)',
'activity_id': 'A10055597164',
},
},