Revize 1d137fc6

re #7882 change of form javascript

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

@@ -91 +91 @@
         <div class="panel panel-default">
           <div class="panel-heading">
             <span class="panel-title">
-              <a data-toggle="collapse" data-parent="#accordion" th:attr="href='#collapse' + *{parameters[__${i.index}__].id}">
+              <a data-toggle="collapse" data-parent="#accordion" th:attr="href='#collapse' + ${i.index}">
                 <i class="fas fa-angle-right"></i> <span th:text="*{parameters[__${i.index}__].name}"></span>
               </a>
               <span class="align-right collapse-actions">
@@ -104 +104 @@
               </span>
             </span>
           </div>
-          <div th:id="'collapse' + *{parameters[__${i.index}__].id}" class="panel-collapse collapse">
+          <div th:id="'collapse' + ${i.index}" class="panel-collapse collapse">
             <div class="panel-body">
               <div class="form-group row">
                 <label for="name" class="col-sm-2 col-form-label">Název:</label>
@@ -131 +131 @@
                 Hodnoty:
                 <div class="enum_values col-md-8">
                   <div class="enum-wrapper">
+                    <input type="hidden" class="enum-index" th:value="${i.index}">
                     <div th:each="parameterValue, j : *{parameters[__${i.index}__].parameterValues}" class="input-action-box input-border-bottom enum-row">
                       <input type="text" readonly class="form-control-plaintext" th:field="*{parameters[__${i.index}__].parameterValues[__${j.index}__].value}" th:value="*{parameters[__${i.index}__].parameterValues[__${j.index}__].value}">
 
@@ -333 +334 @@
 
   function addEnumRow(context, value)
   {
+    let enumIndex = $(context).closest('.enum_box').find('.enum-index').val();
+    let countIndex = $(context).closest('.enum_box').find('.enum-row').length;
+
     let row = document.createElement('div');
     row.classList.add('input-action-box', 'input-border-bottom', 'enum-row');
 
@@ -342 +346 @@
     input.classList.add('form-control-plaintext');
     input.value = value;
     input.setAttribute('readonly', "true");
+    input.setAttribute('id', `parameters${enumIndex}.parameterValues${countIndex}.value`);
+    input.setAttribute('name', `parameters[${enumIndex}].parameterValues[${countIndex}].value`);
 
     row.appendChild(input);
 
@@ -398 +404 @@
 
   function addCollapse() {
 
-    var index = $(".parameter").length + 1;
+    var index = $(".parameter").length;
 
     var typeSelectValues = $("#allParametersHiddenSelect").html();
     var functionSelectValues = $("#allFunctionsHiddenSelect").html();
@@ -427 +433 @@
             '              <div class="form-group row">\n' +
             '                <label for="name" class="col-sm-2 col-form-label">Název:</label>\n' +
             '                <div class="col-sm-10">\n' +
-            `                  <input type="text" class="form-control" name="parametersName[${index}]" id="parameterName[${index}]" value="Nový parametr" required>\n` +
+            `                  <input type="text" class="form-control" name="parameters[${index}].name" id="parameterName${index}" value="Nový parametr" required>\n` +
             '                </div>\n' +
             '              </div>\n' +
             '              <div class="form-group row">\n' +
             '                <label for="name" class="col-sm-2 col-form-label">V&nbsp;SQL:</label>\n' +
             '                <div class="col-sm-10">\n' +
-            `                  <input type="text" class="form-control" name="parametersSQLName[${index}]" id="parameterSQLName[${index}]" required>\n` +
+            `                  <input type="text" class="form-control" name="parameters[${index}].nameOfSelect" id="parameterSQLName${index}" required>\n` +
             '                </div>\n' +
             '              </div>\n' +
             '              <div class="form-group row">\n' +
@@ -449 +455 @@
             '                Hodnoty:\n' +
             '                <div class="enum_values col-md-8">\n' +
             '                  <div class="enum-wrapper">\n' +
+            `                     <input type="hidden" class="enum-index" value="${index}">\n` +
             '                  </div>\n' +
             '\n' +
             '                  <div class="form-group row form-add-item">\n' +
@@ -465 +472 @@
             '                <div class="col-sm-10">\n' +
             '                  <div class="form-check form-check-inline">\n' +
             `                    <input type="hidden" name="_parameters[${index}].locations" value="on">\n` +
-            `                    <input class="form-check-input" name="_parameters[${index}].locations}" type="checkbox" value="1">\n` +
-            '                    <label class="form-check-label" text="Sloupec"></label>\n' +
+            `                    <input class="form-check-input" name="parameters[${index}].locations" id="parameters${index}.locations1" type="checkbox" value="1">\n` +
+            `                    <label class="form-check-label" for="parameters[${index}].locations" >Sloupec</label>\n` +
             '                  </div>\n' +
             '                  <div class="form-check form-check-inline">\n' +
             `                    <input type="hidden" name="_parameters[${index}].locations" value="on">\n` +
-            `                    <input class="form-check-input" name="_parameters[${index}].locations}" type="checkbox" value="2">\n` +
-            '                    <label class="form-check-label" text="Řádek"></label>\n' +
+            `                    <input class="form-check-input" name="parameters[${index}].locations" id="parameters${index}.locations2" type="checkbox" value="2">\n` +
+            '                    <label class="form-check-label" for="parameters[${index}].locations">Řádek</label>\n' +
             '                  </div>\n' +
             '                  <div class="form-check form-check-inline">\n' +
             `                    <input type="hidden" name="_parameters[${index}].locations" value="on">\n` +
-            `                    <input class="form-check-input" name="_parameters[${index}].locations}" type="checkbox" value="3">\n` +
-            '                    <label class="form-check-label" text="Hodnota"></label>\n' +
+            `                    <input class="form-check-input" name="parameters[${index}].locations" id="parameters${index}.locations3" type="checkbox" value="3">\n` +
+            '                    <label class="form-check-label" for="parameters[${index}].locations" >Hodnota</label>\n' +
             '                  </div>\n' +
             '                </div>\n' +
             '              </div>\n' +
             '              <div class="form-group row">\n' +
             '                  <label for="exampleFormControlSelect1" class="col-sm-2">Funkce:</label>\n' +
             '                  <div class="col-sm-10">\n' +
-            `                    <select name="parameters[${index}].functions" class="mbSelect selectpicker" multiple data-live-search="true">\n` +
+            `                    <select name="parameters[${index}].functions" id="parameters${index}.functions" class="mbSelect selectpicker" multiple data-live-search="true">\n` +
                                     functionSelectValues +
             '                    </select>\n' +
             '                  </div>\n' +
@@ -491 +498 @@
             '              <div class="form-group row">\n' +
             '                  <label for="exampleFormControlSelect1" class="col-sm-2">Operátory:</label>\n' +
             '                  <div class="col-sm-10">\n' +
-            `                    <select name="parameters[${index}].operators" class="mbSelect selectpicker" multiple data-live-search="true">\n` +
+            `                    <select name="parameters[${index}].operators" id="parameters${index}.operators" class="mbSelect selectpicker" multiple data-live-search="true">\n` +
                                     operatorSelectValues +
             '                    </select>\n' +
             '                  </div>\n' +