Update the value when default ValueSet is used in DefaultSelection

PxWeb/Code/Api2/DataSelection/SelectionHandler.cs

@@ -90,7 +90,7 @@
         /// <param name="variablesSelection">The VariablesSelection object to verify and apply codelists for</param>
         /// <param name="problem">Null if everything is ok, otherwise it describes whats wrong</param>
         /// <returns>True if everything was ok, else false</returns>
         private bool VerifyAndApplyCodelists(IPXModelBuilder builder, VariablesSelection? variablesSelection, out Problem? problem)
         {
             problem = null;
 
@@ -187,7 +187,7 @@
             return true;
         }
 
         private bool ApplyGrouping(IPXModelBuilder builder, Variable pxVariable, VariableSelection variable, out Problem? problem)
         {
             problem = null;
 
@@ -221,7 +221,7 @@
             return true;
         }
 
         private bool ApplyValueset(IPXModelBuilder builder, Variable pxVariable, VariableSelection variable, out Problem? problem)
         {
             problem = null;
 
@@ -260,7 +260,7 @@
         /// <param name="variablesSelection">VariablesSelection with the wanted variables and values</param>
         /// <param name="problem">Will be null if everything is ok, oterwise it will describe the problem</param>
         /// <returns></returns>
         private bool VerifyVariableValues(PXModel model, VariablesSelection variablesSelection, out Problem? problem)
         {
             problem = null;
 
@@ -268,14 +268,14 @@
             {
                 //Verify that variables have at least one value selected for mandatory varibles
                 var mandatory = Mandatory(model, variable);
                 if (variable.ValueCodes.Count().Equals(0) && mandatory)
                 {
                     problem = ProblemUtility.NonExistentValue();
                     return false;
                 }
 
                 //Check variable values if they exists in model.Metadata
                 if (!variable.ValueCodes.Count().Equals(0))
                 {
                     var modelVariable = model.Meta.Variables.GetByCode(variable.VariableCode);
 
@@ -362,7 +362,7 @@
         /// </summary>
         /// <param name="expression">The wildcard selection expression to validate</param>
         /// <returns>True if the expression is valid, else false</returns>
         private bool VerifyWildcardStarExpression(string expression)
         {
             if (expression.Equals("*"))
             {
@@ -397,7 +397,7 @@
         /// </summary>
         /// <param name="expression">The wildcard selection expression to validate</param>
         /// <returns>True if the expression is valid, else false</returns>
         private bool VerifyWildcardQuestionmarkExpression(string expression)
         {
             // What could be wrong?
             return true;
@@ -408,7 +408,7 @@
         /// </summary>
         /// <param name="expression">The TOP selection expression to validate</param>
         /// <returns>True if the expression is valid, else false</returns>
         private bool VerifyTopExpression(string expression)
         {
             return Regex.IsMatch(expression, REGEX_TOP, RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(100));
         }
@@ -418,7 +418,7 @@
         /// </summary>
         /// <param name="expression">The BOTTOM selection expression to validate</param>
         /// <returns>True if the expression is valid, else false</returns>
         private bool VerifyBottomExpression(string expression)
         {
             return Regex.IsMatch(expression, REGEX_BOTTOM, RegexOptions.IgnoreCase, TimeSpan.FromMilliseconds(100));
         }
@@ -1155,6 +1155,10 @@
                 {
                     builder.ApplyGrouping(variable.Code, variable.GetGroupingInfoById(variable.CurrentGrouping.ID), GroupingIncludesType.AggregatedValues);
                 }
+                else if (variable.CurrentValueSet != null)
+                {
+                    builder.ApplyValueSet(variable.Code, variable.CurrentValueSet);
+                }
             }
 
             var contents = meta.Variables.FirstOrDefault(v => v.IsContentVariable);