Revize 9714fae3

re #7981 parameter order in configuration implementation finished

src/main/java/vldc/aswi/domain/parameter/ParameterInConfiguration.java

@@ -17 +17 @@
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @OperatorValueConstraint
-public class ParameterInConfiguration extends EntityParent {
+public class ParameterInConfiguration extends EntityParent implements Comparable<ParameterInConfiguration> {
 
     /** Specific configuration in which is this parameterConfiguration presented. */
     @ManyToOne(fetch = FetchType.LAZY)
@@ -100 +100 @@
         functions.remove(function);
         function.getParametersInConfigurations().remove(this);
     }
+
+    /**
+     * Compare two parameters in configuration by parameterOrder from 0 to X.
+     * @param parameterInConfiguration - Compared parameter in configuration.
+     * @return difference between orders
+     */
+    @Override
+    public int compareTo(ParameterInConfiguration parameterInConfiguration) {
+        return (this.getParameterOrder() - parameterInConfiguration.getParameterOrder());
+    }
 }

src/main/java/vldc/aswi/service/ConfigurationManagerImpl.java

@@ -171 +171 @@
             ParameterInConfiguration parameterInConfiguration = new ParameterInConfiguration();
             parameterInConfiguration.setParameter(assembly.getParameters().get(i));
             parameterInConfiguration.setConfiguration(savedConfiguration);
+            parameterInConfiguration.setParameterOrder(newConfiguration.getParametersInConfiguration().get(i).getParameterOrder());
             parameterInConfiguration.setOperatorValue(newConfiguration.getParametersInConfiguration().get(i).getOperatorValue());
             parameterInConfiguration.setColumnName(assembly.getParameters().get(i).getName());
             if(newConfiguration.getParametersInConfiguration().get(i).getColumnName() != null &&
@@ -213 +214 @@
 
         for(int i = 0; i < configuration.getParametersInConfiguration().size(); i++) {
             ParameterInConfiguration parameterInConfiguration = configuration.getParametersInConfiguration().get(i);
+            parameterInConfiguration.setParameterOrder(newConfiguration.getParametersInConfiguration().get(i).getParameterOrder());
             parameterInConfiguration.setOperatorValue(newConfiguration.getParametersInConfiguration().get(i).getOperatorValue());
             if(newConfiguration.getParametersInConfiguration().get(i).getColumnName() != null &&
                     !newConfiguration.getParametersInConfiguration().get(i).getColumnName().equals("")) {

src/main/java/vldc/aswi/web/controller/AssemblyController.java

@@ -26 +26 @@
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Comparator;
 
 /**
  * Controller for assemblies and configurations
@@ -114 +115 @@
             parameterInConfiguration.setConfiguration(configuration);
             parameterInConfiguration.setOperator(new Operator());
             parameterInConfiguration.setLocation(new Location());
+            parameterInConfiguration.setParameterOrder(parameter.getParameterOrder());
             configuration.getParametersInConfiguration().add(parameterInConfiguration);
         }
 
+        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
+
         modelMap.addAttribute("configuration", configuration);
+        modelMap.addAttribute("comparator", comparator);
 
         return modelAndView;
     }

src/main/java/vldc/aswi/web/controller/ConfigurationController.java

@@ -18 +18 @@
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * Manager for configuration.
@@ -42 +44 @@
 
         Configuration configuration = configurationManager.getConfigurationById(Long.parseLong(id));
 
+        List<ParameterInConfiguration> parametersInConfiguration = new ArrayList<>(configuration.getParametersInConfiguration());
+        configuration.setParametersInConfiguration(parametersInConfiguration);
+
         initializeFields(configuration);
+        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
 
         modelMap.addAttribute("configuration", configuration);
+        modelMap.addAttribute("comparator", comparator);
 
         return modelAndView;
     }

src/main/webapp/WEB-INF/templates/assembly.html

@@ -45 +45 @@
                     <input type="text" class="form-control name-input" th:field="*{tableName}"
                            th:value="${configuration?.tableName}">
                 </div>
-
                 <span>Parametry:</span>
                 <div class="col-md-9">
                     <table class="table">
@@ -57 +56 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}" class="parameter-row">
+                        <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration, comparator)}" class="parameter-row">
                            <input type="hidden" class="parameterIndex" th:value="${itemStat.index}">
                             <td>
                                 <span class="select-text-padding parameter-name"
@@ -123 +122 @@
                             </tr>
                             </thead>
                             <tbody id="row-wrapper" class="sortable">
-                            <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}" th:if="${parameterInConfiguration.location.name?.equals('Řádek')}" class="row-parameter parameter">
+                            <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Řádek')}" class="row-parameter parameter">
                                 <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="1">
-                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
+                                <input type="hidden" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
                                 <td>
                                     <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
                                 </td>
@@ -155 +154 @@
                             </tr>
                             </thead>
                             <tbody id="column-wrapper" class="sortable">
-                            <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}" th:if="${parameterInConfiguration.location.name?.equals('Sloupec')}" class="column-parameter parameter">
+                            <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Sloupec')}" class="column-parameter parameter">
                                 <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="2">
-                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
+                                <input type="hidden" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
                                 <td>
                                     <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
                                 </td>
@@ -186 +185 @@
                             </tr>
                             </thead>
                             <tbody id="value-wrapper">
-                            <tr th:each="parameterInConfiguration, itemStat : ${configuration.parametersInConfiguration}" th:if="${parameterInConfiguration.location.name?.equals('Hodnota')}" class="value-parameter parameter">
+                            <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Hodnota')}" class="value-parameter parameter">
                                 <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="3">
-                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
+                                <input type="hidden" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
                                 <td>
                                     <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
                                 </td>