From 1ec85fedce62d25f52de31d9dce14931a27c9d12 Mon Sep 17 00:00:00 2001 From: Nicolas ROCHE Date: Fri, 24 Mar 2023 17:42:51 +0100 Subject: [PATCH] toulouse-maelis: remove hard coded activity natures (#75752) --- passerelle/contrib/toulouse_maelis/models.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/passerelle/contrib/toulouse_maelis/models.py b/passerelle/contrib/toulouse_maelis/models.py index 3abb6b2e..470cb5dc 100644 --- a/passerelle/contrib/toulouse_maelis/models.py +++ b/passerelle/contrib/toulouse_maelis/models.py @@ -1848,7 +1848,11 @@ class ToulouseMaelis(BaseResource, HTTPResource): activity = schedule['activity'] if not activity['activityType']['natureSpec']: continue - if activity['activityType']['natureSpec']['code'] not in ['A', 'R', 'X']: + if ( + activity['activityType']['natureSpec']['code'] not in self.get_perisco_nature_codes() + and activity['activityType']['natureSpec']['code'] + not in self.get_extrasco_nature_codes() + ): continue activity_id = activity['idAct'] many_units = len(schedule['unitScheduleList']) > 1 @@ -1864,7 +1868,8 @@ class ToulouseMaelis(BaseResource, HTTPResource): 'prefill': day['scheduledPresence'] > 0 or day['realPresence'] > 1, 'disabled': ( day['status'] != 'WRITABLE' - or activity['activityType']['natureSpec']['code'] in ['X'] + or activity['activityType']['natureSpec']['code'] + in self.get_extrasco_nature_codes() ), 'details': day, } @@ -1874,7 +1879,10 @@ 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 ['A', 'R']: + if ( + activity['activityType']['natureSpec']['code'] + in self.get_perisco_nature_codes() + ): booking['details']['activity_label'] = activity['activityType']['libelle'] else: booking['details']['activity_label'] = ( @@ -2274,8 +2282,7 @@ class ToulouseMaelis(BaseResource, HTTPResource): def read_activity_list(self, request, ref_date, nature_ids=None): reference_year = utils.get_reference_year_from_date(ref_date) if not nature_ids: - # actual loisir nature codes - nature_filter_codes = ['P', 'L', 'S'] + [str(i) for i in range(1, 10)] + nature_filter_codes = self.get_loisir_nature_codes() else: nature_filter_codes = [x.strip() for x in nature_ids.split(',') if x.strip()] labels = {