Revize 74db519b

re #8119 - fix values functions bug, js refactoring

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

@@ -92 +92 @@
                                     </div>
                                 </td>
 
-                                <select class="form-control hidden" th:id="'function-select-' + ${itemStat.index}"
-                                        th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].functions}"
-                                        multiple>
+                                <select class="form-control hidden" th:id="'tmp-function-select-' + ${itemStat.index}" multiple>
                                     <option th:each="function : ${parameterInConfiguration.parameter.functions}"
                                             th:text="${function.name}" th:value="${{function.id}}"></option>
                                 </select>

src/main/webapp/js/assemblyScripts.js

@@ -4 +4 @@
 
 $(document).ready(function() {
 
+    // init handlers for position buttons
+    initPositionButtons();
+
+    // init actions
+    initParameters();
+
+    // spinner init
+    initSpinnerToButtons();
+
+    // generation init
+    initTableGenerationButtons();
+
+    // sort selected parameters
+    initSelectedParameters();
+
+    // set up tooltips
+    initTooltips();
+
+});
+
+/**
+ * Sets up functionality for position buttons (add/remove elements from position box), headlights
+ */
+function initPositionButtons() {
     // reaction for add/delete parameters from selected fields (row, column, value)
     $('.select-action-button').on('click', function () {
         // if input has headlight class (parameter is already added -> remove)
@@ -38 +62 @@
 
         validateCombination();
     });
-
-    // init actions
-    initParameters();
-
-    // spinner init
-    initSpinnerToButtons();
-
-    // generation init
-    initTableGenerationButtons();
-
-    // sort selected parameters
-    initSelectedParameters();
-
-    // set up tooltips
-    initTooltips();
-
-});
+}
 
 /**
  * Remove value from all selected fields
@@ -90 +98 @@
  * @param hiddenValue
  */
 function addParameter(index, parameterName, type, hiddenValue) {
+    // basic set up for mapping element to dao object
     var row = document.createElement('tr');
     row.classList.add(type + '-parameter', 'parameter');
 
@@ -122 +131 @@
 
     var thirdTdBody;
 
-
+    // for value copy hidden select
     if (type == VALUE)
     {
-        thirdTdBody = $('#function-select-' + index).clone()[0];
+        // get parameter select for functions
+        thirdTdBody = $('#tmp-function-select-' + index).clone()[0];
+
+        // set up id for select
+        thirdTdBody.id = `parametersInConfiguration${index}.functions`;
+
+        // set up name for select
+        thirdTdBody.name = `parametersInConfiguration[${index}].functions`;
+
+        // select first option
         thirdTdBody.selectedIndex = 0;
 
+        // remove hidden class
         $(thirdTdBody).removeClass('hidden');
     }
+    // for row and column add textfield
     else
     {
         var secondTd = document.createElement('td');
@@ -151 +171 @@
 
     row.appendChild(thirdTd);
 
+    // append element to type wrapper
     $('#' + type + '-wrapper').append($(row));
 
+    // reindex parameters order
     reindexOrder();
 
 }
@@ -225 +247 @@
 }
 
 /**
- * Init base actions
+ * Allow sort on parameters
  */
 function initParameters()
 {
     $('.sortable').sortable({
        stop: function () {
+           // after change reindex parameters order
            reindexOrder();
        }
     });