diff --git a/Manager.Interfaces/DTO/ConfigurationDTO.cs b/Manager.Interfaces/DTO/ConfigurationDTO.cs index 214dd35..47dfc66 100644 --- a/Manager.Interfaces/DTO/ConfigurationDTO.cs +++ b/Manager.Interfaces/DTO/ConfigurationDTO.cs @@ -13,6 +13,7 @@ namespace Manager.Interfaces.DTO public List languages { get; set; } // fr, en, de, nl => Sélection dans une liste déjà établie dans l'application ! public DateTime dateCreation { get; set; } public bool isMobile { get; set; } // MyVisit - True if for mobile (MyVisit) + public bool isTablet { get; set; } public bool isOffline { get; set; } // MyVisit - True if MyVisit is full offline /*public string latitude { get; set; } // MyVisit - latitude of visit ? (MyVisit) public string longitude { get; set; } // MyVisit - True if for mobile (MyVisit)*/ diff --git a/Manager.Interfaces/DTO/SubSection/ArticleDTO.cs b/Manager.Interfaces/DTO/SubSection/ArticleDTO.cs index dd3dd84..5c74103 100644 --- a/Manager.Interfaces/DTO/SubSection/ArticleDTO.cs +++ b/Manager.Interfaces/DTO/SubSection/ArticleDTO.cs @@ -7,8 +7,8 @@ namespace Manager.Interfaces.DTO { public class ArticleDTO { - public List title { get; set; } - public List description { get; set; } + //public List title { get; set; } + //public List description { get; set; } public List content { get; set; } public string qrCode { get; set; } // MyVisit - QR code identifier int ? String ? public bool isContentTop { get; set; } // MyVisit - True if content is displayed at top, false otherwise diff --git a/Manager.Interfaces/Models/Configuration.cs b/Manager.Interfaces/Models/Configuration.cs index 927dedb..86e3c98 100644 --- a/Manager.Interfaces/Models/Configuration.cs +++ b/Manager.Interfaces/Models/Configuration.cs @@ -34,6 +34,9 @@ namespace Manager.Interfaces.Models [BsonElement("IsMobile")] public bool IsMobile { get; set; } + [BsonElement("IsTablet")] + public bool IsTablet { get; set; } + [BsonElement("IsOffline")] public bool IsOffline { get; set; } @@ -48,6 +51,7 @@ namespace Manager.Interfaces.Models languages = Languages, secondaryColor = SecondaryColor, isMobile = IsMobile, + isTablet = IsTablet, isOffline = IsOffline }; } @@ -62,6 +66,7 @@ namespace Manager.Interfaces.Models languages = Languages, secondaryColor = SecondaryColor, isMobile = IsMobile, + isTablet = IsTablet, isOffline = IsOffline, sections = sections, resources = resources diff --git a/ManagerService/Controllers/ConfigurationController.cs b/ManagerService/Controllers/ConfigurationController.cs index 37b21ef..c02eeea 100644 --- a/ManagerService/Controllers/ConfigurationController.cs +++ b/ManagerService/Controllers/ConfigurationController.cs @@ -112,6 +112,7 @@ namespace ManagerService.Controllers configuration.Languages = new List { "FR", "NL", "EN", "DE" }; // by default all languages configuration.DateCreation = DateTime.Now; configuration.IsMobile = newConfiguration.isMobile; + configuration.IsTablet = newConfiguration.isTablet; configuration.IsOffline = newConfiguration.isOffline; Configuration configurationCreated = _configurationService.Create(configuration); @@ -160,6 +161,7 @@ namespace ManagerService.Controllers configuration.SecondaryColor = updatedConfiguration.secondaryColor; configuration.Languages = updatedConfiguration.languages; configuration.IsMobile = updatedConfiguration.isMobile; + configuration.IsTablet = updatedConfiguration.isTablet; configuration.IsOffline = updatedConfiguration.isOffline; Configuration configurationModified = _configurationService.Update(updatedConfiguration.id, configuration); @@ -403,6 +405,7 @@ namespace ManagerService.Controllers configuration.SecondaryColor = exportConfiguration.secondaryColor; configuration.Languages = exportConfiguration.languages; configuration.IsMobile = exportConfiguration.isMobile; + configuration.IsTablet = exportConfiguration.isTablet; configuration.IsOffline = exportConfiguration.isOffline; _configurationService.Create(configuration);