Revize d9b0bac7

sort selected parameters, fix constants in template (switch row/column index)

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

@@ -108 +108 @@
                                 </tr>
                                 </thead>
                                 <tbody id="column-wrapper" class="sortable">
-                                <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">
+                                <tr th:each="parameterInConfiguration, itemStat : ${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="1">
                                     <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>
@@ -139 +139 @@
                                 </tr>
                                 </thead>
                                 <tbody id="row-wrapper" class="sortable">
-                                <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">
+                                <tr th:each="parameterInConfiguration, itemStat : ${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="2">
                                     <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>
@@ -169 +169 @@
                                 </tr>
                                 </thead>
                                 <tbody id="value-wrapper">
-                                <tr th:each="parameterInConfiguration, itemStat : ${#lists.sort(configuration.parametersInConfiguration)}" th:if="${parameterInConfiguration.location.name?.equals('Hodnota')}" class="value-parameter parameter">
+                                <tr th:each="parameterInConfiguration, itemStat : ${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" class="parametr-order" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}" th:value="${configuration.parametersInConfiguration[__${itemStat.index}__].parameterOrder}">
                                     <td>

src/main/webapp/js/assemblyScripts.js

@@ -48 +48 @@
     // generation init
     initTableGenerationButtons();
 
+    // sort selected parameters
+    initSelectedParameters();
+
 });
 
 /**
@@ -359 +362 @@
  */
 function allowExport() {
     $('.show-spinner').removeAttr('disabled');
+}
+
+/**
+ * Sort selected parameters by order
+ */
+function initSelectedParameters() {
+
+    sortSelectedParameters('.column-parameter', '#column-wrapper');
+    sortSelectedParameters('.row-parameter', '#row-wrapper');
+
+}
+
+/**
+ * Checks and sort specific parameters
+ * @param parameterName
+ * @param parameterWrapper
+ */
+function sortSelectedParameters(parameterName, parameterWrapper) {
+
+    var tmpArray = [];
+
+    var parameters = $(parameterName);
+
+    // load specific parameters to array orderIndex => parameter
+    parameters.each(function () {
+        var orderIndex = $(this).find('.parametr-order').val();
+
+        tmpArray[orderIndex] = $(this);
+
+    });
+
+    // sort parameters by key (order index)
+    tmpArray.sort((a, b) => a - b);
+
+    let wrapper = $(parameterWrapper);
+
+    // clear wrapper
+    wrapper.empty();
+
+    // append sorted elements
+    wrapper.append(tmpArray);
 }