From aa25e0d4a05fe6f75cfc39d9a42fbc79b95523e2 Mon Sep 17 00:00:00 2001 From: Thomas Fransolet Date: Wed, 28 Feb 2024 11:56:53 +0100 Subject: [PATCH] Update agenda (multiple languages) --- Manager.Interfaces/DTO/SubSection/AgendaDTO.cs | 3 +-- ManagerService/Controllers/ConfigurationController.cs | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Manager.Interfaces/DTO/SubSection/AgendaDTO.cs b/Manager.Interfaces/DTO/SubSection/AgendaDTO.cs index 0dd9dbf..54ba348 100644 --- a/Manager.Interfaces/DTO/SubSection/AgendaDTO.cs +++ b/Manager.Interfaces/DTO/SubSection/AgendaDTO.cs @@ -6,7 +6,6 @@ namespace Manager.Interfaces.DTO { public class AgendaDTO { - public string resourceId { get; set; } // url to resource id - public string resourceUrl { get; set; } // url to resource firebase or on internet => JSON file + public List resourceIds { get; set; } // All json files for all languages } } diff --git a/ManagerService/Controllers/ConfigurationController.cs b/ManagerService/Controllers/ConfigurationController.cs index c06f81c..2213008 100644 --- a/ManagerService/Controllers/ConfigurationController.cs +++ b/ManagerService/Controllers/ConfigurationController.cs @@ -545,9 +545,13 @@ namespace ManagerService.Controllers break; case SectionType.Agenda: AgendaDTO agendaDTO = JsonConvert.DeserializeObject(section.data); - if (agendaDTO.resourceId != null) + var resourceIds = language != null ? agendaDTO.resourceIds.Where(a => a.language == language) : agendaDTO.resourceIds; + foreach (var resourceId in resourceIds) { - addResourceToList(resourceDTOs, agendaDTO.resourceId); + if (resourceId.value != null) + { + addResourceToList(resourceDTOs, resourceId.value); + } } break; case SectionType.Menu: