From ab562f886ccbcb210bd67afa2409d7d6f11fffdc Mon Sep 17 00:00:00 2001 From: Thomas Fransolet Date: Tue, 26 Dec 2023 11:42:10 +0100 Subject: [PATCH] Add isHour, IsDate to config + Resource to response in quizz --- Manager.Interfaces/DTO/ConfigurationDTO.cs | 4 ++++ Manager.Interfaces/DTO/SubSection/QuizzDTO.cs | 3 +++ Manager.Interfaces/Models/Configuration.cs | 10 ++++++++++ ManagerService/Controllers/ConfigurationController.cs | 6 ++++++ 4 files changed, 23 insertions(+) diff --git a/Manager.Interfaces/DTO/ConfigurationDTO.cs b/Manager.Interfaces/DTO/ConfigurationDTO.cs index 82fedec..933d7aa 100644 --- a/Manager.Interfaces/DTO/ConfigurationDTO.cs +++ b/Manager.Interfaces/DTO/ConfigurationDTO.cs @@ -25,5 +25,9 @@ namespace Manager.Interfaces.DTO public string loaderImageId { get; set; } // == ResourceId public string loaderImageUrl { get; set; } // == Image url public string weatherCity { get; set; } // weatherCity + public bool isDate { get; set; } + + public bool isHour { get; set; } + } } diff --git a/Manager.Interfaces/DTO/SubSection/QuizzDTO.cs b/Manager.Interfaces/DTO/SubSection/QuizzDTO.cs index 2d806b5..d8fff4b 100644 --- a/Manager.Interfaces/DTO/SubSection/QuizzDTO.cs +++ b/Manager.Interfaces/DTO/SubSection/QuizzDTO.cs @@ -28,6 +28,9 @@ namespace Manager.Interfaces.DTO { public List label { get; set; } public bool isGood { get; set; } + public string resourceId { get; set; } // question image, audio or video + public ResourceType resourceType { get; set; } + public string resourceUrl { get; set; } // url to firebase storage or on internet public int order { get; set; } // Order to show } diff --git a/Manager.Interfaces/Models/Configuration.cs b/Manager.Interfaces/Models/Configuration.cs index 7d4644f..2bdd9a9 100644 --- a/Manager.Interfaces/Models/Configuration.cs +++ b/Manager.Interfaces/Models/Configuration.cs @@ -64,6 +64,12 @@ namespace Manager.Interfaces.Models [BsonElement("WeatherCity")] public string WeatherCity { get; set; } + [BsonElement("IsDate")] + public bool IsDate { get; set; } + + [BsonElement("IsHour")] + public bool IsHour { get; set; } + public ConfigurationDTO ToDTO(List sectionIds) { return new ConfigurationDTO() @@ -84,6 +90,8 @@ namespace Manager.Interfaces.Models isTablet = IsTablet, isOffline = IsOffline, instanceId = InstanceId, + isDate = IsDate, + isHour = IsHour, sectionIds = sectionIds }; } @@ -109,6 +117,8 @@ namespace Manager.Interfaces.Models sections = sections, resources = resources, instanceId = InstanceId, + isDate = IsDate, + isHour = IsHour, sectionIds = sections.Select(s => s.id).ToList() }; } diff --git a/ManagerService/Controllers/ConfigurationController.cs b/ManagerService/Controllers/ConfigurationController.cs index dcd0bf4..88d6283 100644 --- a/ManagerService/Controllers/ConfigurationController.cs +++ b/ManagerService/Controllers/ConfigurationController.cs @@ -167,6 +167,8 @@ namespace ManagerService.Controllers configuration.LoaderImageId = newConfiguration.loaderImageId; configuration.LoaderImageUrl = newConfiguration.loaderImageUrl; configuration.WeatherCity = newConfiguration.weatherCity; + configuration.IsDate = newConfiguration.isDate; + configuration.IsHour = newConfiguration.isHour; configuration.Languages = _configuration.GetSection("SupportedLanguages").Get>(); @@ -233,6 +235,8 @@ namespace ManagerService.Controllers configuration.LoaderImageId = updatedConfiguration.loaderImageId; configuration.LoaderImageUrl = updatedConfiguration.loaderImageUrl; configuration.WeatherCity = updatedConfiguration.weatherCity; + configuration.IsDate = updatedConfiguration.isDate; + configuration.IsHour = updatedConfiguration.isHour; Configuration configurationModified = _configurationService.Update(updatedConfiguration.id, configuration); @@ -515,6 +519,8 @@ namespace ManagerService.Controllers } configuration.WeatherCity = exportConfiguration.weatherCity; + configuration.IsDate = exportConfiguration.isDate; + configuration.IsHour = exportConfiguration.isHour; _configurationService.Create(configuration);