Revize 7f644dea

re #7981 re #7979 re #7974 default table name added, assembly order implemented, parameter order in configuration implemented

src/main/java/vldc/aswi/dao/AssemblyRepository.java

@@ -4 +4 @@
 import org.springframework.stereotype.Repository;
 import vldc.aswi.domain.Assembly;
 
+import java.util.List;
+
 /**
  * Repository for domain Assembly.
  */
@@ -23 +25 @@
      * @return Assembly with highest order.
      */
     Assembly findFirst1ByOrderByAssemblyOrder();
+
+    /**
+     * Find assemblies order by order
+     * @return ordered assemblies
+     */
+    List<Assembly> getByOrderByAssemblyOrderAsc();
 }

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

@@ -17 +17 @@
      */
     List<Assembly> getAssemblies();
 
+    /**
+     * Get all Assemblies from database by order.
+     * @return List of assemblies.
+     */
+    List<Assembly> getAssembliesOrdered();
+
     /**
      * Get assembly by id.
      * @param id - ID of assembly.
@@ -32 +38 @@
     Long updateAssembly(Assembly updatedAssemblyValues);
 
     /**
-     * Update assembly's order.
-     * @param id - ID of assembly.
-     * @param order - Assembly's order.
+     * Update assembly order.
+     * @param data - sorted IDs.
      */
-    void updateAssemblyOrder(Long id, int order);
+    void updateAssemblyOrder(String data);
 
     /**
      * Create new assembly.

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

@@ -68 +68 @@
         return retVal;
     }
 
+    /**
+     * Get all Assemblies from database ordered.
+     * @return List of assemblies.
+     */
+    @Override
+    public List<Assembly> getAssembliesOrdered() {
+        return this.assemblyRepository.getByOrderByAssemblyOrderAsc();
+    }
+
     /**
      * Get assembly by id.
      * @param id - ID of assembly.
@@ -81 +90 @@
     }
 
     /**
-     * Update assembly's order.
-     * @param id - ID of assembly.
-     * @param order - Assembly's order.
+     * Update assembly order.
+     * @param data - sorted IDs.
      */
     @Override
-    public void updateAssemblyOrder(Long id, int order) {
-        Assembly assembly = getAssemblyById(id);
-        assembly.setAssemblyOrder(order);
-        this.assemblyRepository.save(assembly);
+    public void updateAssemblyOrder(String data) {
+        String[] idOrder = data.split(",");
+        for (int i = 0; i < idOrder.length; i++) {
+            Assembly assembly = getAssemblyById(Long.valueOf(idOrder[i]));
+            assembly.setAssemblyOrder(i + 1);
+            this.assemblyRepository.save(assembly);
+        }
     }
 
     /**

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

@@ -170 +170 @@
         for(int i = 0; i < newConfiguration.getParametersInConfiguration().size(); i++) {
             ParameterInConfiguration parameterInConfiguration = new ParameterInConfiguration();
             parameterInConfiguration.setParameter(assembly.getParameters().get(i));
-            parameterInConfiguration.setColumnName(newConfiguration.getParametersInConfiguration().get(i).getColumnName());
             parameterInConfiguration.setConfiguration(savedConfiguration);
             parameterInConfiguration.setOperatorValue(newConfiguration.getParametersInConfiguration().get(i).getOperatorValue());
             parameterInConfiguration.setColumnName(assembly.getParameters().get(i).getName());
+            if(newConfiguration.getParametersInConfiguration().get(i).getColumnName() != null &&
+                    !newConfiguration.getParametersInConfiguration().get(i).getColumnName().equals("")) {
+                parameterInConfiguration.setColumnName(newConfiguration.getParametersInConfiguration().get(i).getColumnName());
+            }
             if(newConfiguration.getParametersInConfiguration().get(i).getLocation() != null) {
-                parameterInConfiguration.setLocation(locationRepository.getByName(
-                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getName()));
+                parameterInConfiguration.setLocation(locationRepository.getById(
+                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getId()));
             }
             if(newConfiguration.getParametersInConfiguration().get(i).getOperator() != null) {
                 parameterInConfiguration.setOperator(operatorRepository.getByName(
@@ -211 +214 @@
         for(int i = 0; i < configuration.getParametersInConfiguration().size(); i++) {
             ParameterInConfiguration parameterInConfiguration = configuration.getParametersInConfiguration().get(i);
             parameterInConfiguration.setOperatorValue(newConfiguration.getParametersInConfiguration().get(i).getOperatorValue());
-            if(newConfiguration.getParametersInConfiguration().get(i).getColumnName() != null) {
+            if(newConfiguration.getParametersInConfiguration().get(i).getColumnName() != null &&
+                    !newConfiguration.getParametersInConfiguration().get(i).getColumnName().equals("")) {
                 parameterInConfiguration.setColumnName(newConfiguration.getParametersInConfiguration().get(i).getColumnName());
             }
             if(newConfiguration.getParametersInConfiguration().get(i).getLocation() != null) {
-                parameterInConfiguration.setLocation(locationRepository.getByName(
-                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getName()));
+                parameterInConfiguration.setLocation(locationRepository.getById(
+                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getId()));
+            }
+            else {
+                parameterInConfiguration.setLocation(null);
             }
             if(newConfiguration.getParametersInConfiguration().get(i).getOperator() != null) {
                 parameterInConfiguration.setOperator(operatorRepository.getByName(

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

@@ -106 +106 @@
         Configuration configuration = new Configuration();
 
         configuration.setAssembly(assembly);
+        configuration.setTableName(assembly.getName());
         configuration.setParametersInConfiguration(new ArrayList<>());
         for(Parameter parameter : assembly.getParameters()) {
             ParameterInConfiguration parameterInConfiguration = new ParameterInConfiguration();
@@ -117 +118 @@
         }
 
         modelMap.addAttribute("configuration", configuration);
-        modelMap.addAttribute("isAssembly", false);
 
         return modelAndView;
     }

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

@@ -45 +45 @@
         initializeFields(configuration);
 
         modelMap.addAttribute("configuration", configuration);
-        modelMap.addAttribute("isAssembly", "0");
 
         return modelAndView;
     }

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

@@ -54 +54 @@
 
 		ModelMap modelMap = modelAndView.getModelMap();
 
-		List<Assembly> assemblies = assemblyManager.getAssemblies();
+		List<Assembly> assemblies = assemblyManager.getAssembliesOrdered();
 
 
 		modelMap.addAttribute("assemblies", assemblies);
@@ -101 +101 @@
 
 		return attributes;
 	}
+
 	@ResponseBody
 	@RequestMapping("/saveOrder")
 	public String saveOrder(@RequestBody String data) {
-		// seřazený idčka záznamů
-		System.out.println(data);
+		assemblyManager.updateAssemblyOrder(data);
 
 		return "Ok";
 	}

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

@@ -65 +65 @@
                             </td>
                             <td class="select-action-buttons">
                                 <optional th:each="location : ${parameterInConfiguration.parameter.locations}">
-                                <span th:if="${location.name?.equals('Řádek')}"
+                                    <span th:if="${location.name?.equals('Řádek')}"
                                       th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.name}"
                                       class="select-action-padding select-action-button select-input-action-margin-collapse unselectable row-button"
                                       th:classappend="(${configuration.parametersInConfiguration[__${itemStat.index}__].location.name?.equals('Řádek')}) ? select-action-headlight"  >
-                                  <i class="fas fa-align-justify"></i>
-                                </span>
+                                        <i class="fas fa-align-justify"></i>
+                                    </span>
                                     <span th:if="${location.name?.equals('Sloupec')}"
                                           th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.name}"
                                           class="select-action-padding select-action-button select-input-action-margin-collapse unselectable column-button"
                                           th:classappend="(${configuration.parametersInConfiguration[__${itemStat.index}__].location.name?.equals('Sloupec')}) ? select-action-headlight">
-                                  <i class="fas fa-align-justify transform"></i>
-                                </span>
+                                        <i class="fas fa-align-justify transform"></i>
+                                    </span>
                                     <span th:if="${location.name?.equals('Hodnota')}"
                                           th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.name}"
                                           class="select-action-padding select-action-button select-input-action-margin-collapse unselectable value-button"
                                           th:classappend="(${configuration.parametersInConfiguration[__${itemStat.index}__].location.name?.equals('Hodnota')}) ? select-action-headlight">
-                                    <i class="fas fa-heading"></i>
-                                </span>
+                                        <i class="fas fa-heading"></i>
+                                    </span>
                                 </optional>
                             </td>
                             <td class="s">
@@ -124 +124 @@
                             </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">
-                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${i.index}__].locations}">
+                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="1">
+                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
                                 <td>
                                     <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
                                 </td>
@@ -156 +157 @@
                             <tbody id="column-wrapper" class="sortable">
                             <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="2">
-
+                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
                                 <td>
                                     <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
                                 </td>
@@ -186 +187 @@
                             </thead>
                             <tbody id="value-wrapper">
                             <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}">
-
+                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].location.id}" value="3">
+                                <input type="hidden" th:field="${configuration.parametersInConfiguration[__${itemStat.index}__].order}">
                                 <td>
                                     <span class="parameter-name" th:text="${parameterInConfiguration.parameter.name}"></span>
                                 </td>