Skip to content

#2492 get contraints via query instead of get and change get variabl… #2494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidBlaa merged 1 commit into from
Jun 9, 2026
Merged

#2492 get contraints via query instead of get and change get variabl… #2494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BExIS++.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ole/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Controllers/DataStructureController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
}

Expand Down
32 changes: 31 additions & 1 deletion Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/VariableHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public List<ListItem> 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<ListItem> list = new List<ListItem>();

if (constraints.Any())
Expand Down Expand Up @@ -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<string>() { 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<MeaningItem> ConvertTo(ICollection<Meaning> meanings)
{
using (var meaningManager = new MeaningManager())
Expand Down
Loading