From 944f145a511156d8cd082879f52d37755f1f4ee4 Mon Sep 17 00:00:00 2001 From: david schoene Date: Tue, 9 Jun 2026 13:55:01 +0200 Subject: [PATCH] #2492 get contraints via query instead of get and change get variable templates --- BExIS++.sln | 2 +- .../Controllers/DataStructureController.cs | 2 +- .../Helpers/VariableHelper.cs | 32 ++++++++++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/BExIS++.sln b/BExIS++.sln index 0e2a08025..c9cb56323 100644 --- a/BExIS++.sln +++ b/BExIS++.sln @@ -1630,8 +1630,8 @@ Global {C1AE3004-853A-4CCF-9099-AE919C6121C8} = {96384857-88D4-4282-8EFD-FE8FCB0319B7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64} EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35 + SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64} EndGlobalSection GlobalSection(SubversionScc) = preSolution Svn-Managed = True diff --git a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Controllers/DataStructureController.cs b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Controllers/DataStructureController.cs index f219287f7..191624313 100644 --- a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Controllers/DataStructureController.cs +++ b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Controllers/DataStructureController.cs @@ -804,7 +804,7 @@ public JsonResult GetVariableTemplates() { foreach (var variableTemplate in variableTemplates.Where(t => t.Approved)) { - list.Add(_helper.ConvertTo(variableTemplate, "other")); + list.Add(_helper.ConvertTo(variableTemplate, unitManager, "other")); } } diff --git a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/VariableHelper.cs b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/VariableHelper.cs index 7806f67f5..f65233870 100644 --- a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/VariableHelper.cs +++ b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/VariableHelper.cs @@ -126,7 +126,7 @@ public List GetConstraints() { using (var constraintManager = new ConstraintManager()) { - var constraints = constraintManager.Get().Where(c => c.DataContainer == null); + var constraints = constraintManager.ConstraintRepository.Query(c => c.DataContainer == null); List list = new List(); if (constraints.Any()) @@ -198,6 +198,36 @@ public VariableTemplateItem ConvertTo(VariableTemplate variableTemplate, string } } + public VariableTemplateItem ConvertTo(VariableTemplate variableTemplate, UnitManager unitManager, string group = "") + { + + VariableTemplateItem item = new VariableTemplateItem(); + item.Id = variableTemplate.Id; + item.Text = variableTemplate.Label; + item.DataType = variableTemplate.DataType.Name; + item.DataTypes = variableTemplate.Unit.AssociatedDataTypes.Select(x => x.Name).ToList(); + item.Meanings = variableTemplate.Meanings.Select(x => x.Name).ToList(); + item.Group = group; + item.Description = variableTemplate.Description; + item.Unit = variableTemplate.Unit.Abbreviation; + + + if (variableTemplate.VariableConstraints.Any()) + item.Constraints = variableTemplate.VariableConstraints.Select(x => x.Name).ToList(); + + // set units also from dimensions + item.Units = new List() { variableTemplate.Unit.Abbreviation }; // add unit + if (variableTemplate.Unit.Dimension != null) // if dimension exist add all units belong to this dimension + { + var dimension = unitManager.DimensionRepo.Get(variableTemplate.Unit.Dimension.Id); + dimension.Units.ToList().ForEach(u => item.Units.Add(u.Abbreviation)); + item.Units.Distinct(); + } + + return item; + + } + public List ConvertTo(ICollection meanings) { using (var meaningManager = new MeaningManager())