Revize 15c7afbe

re #8153 Assembly -> Configuration synchronization

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

@@ -175 +175 @@
 
         if (generateTable != null)
         {
+            Assembly assembly = this.assemblyManager.getAssemblyById(Long.parseLong(id));
+            newConfiguration.setAssembly(assembly);
+            newConfiguration.setTableName(assembly.getName());
+
+            // If configuration name is empty, then replace it by assembly name.
+            if (newConfiguration.getName().equals("")) {
+                newConfiguration.setName(assembly.getName());
+            }
+
             System.out.println("Generuj tabulku");
             prepareForTable(newConfiguration);
             System.out.println("Generuj tabulku");
@@ -183 +192 @@
             modelMap.addAttribute("contingencyTableRows", this.sqlQueryManager.getContingencyTableRow(newConfiguration));
             Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
             initializeFields(newConfiguration);
+
             modelMap.addAttribute("configuration", newConfiguration);
             modelMap.addAttribute("comparator", comparator);
             modelMap.addAttribute("formAction", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
@@ -310 +320 @@
 
             // TODO: chybí defaultValue.
             Long assemblyID = this.assemblyManager.updateAssembly(assembly);
+
             this.parameterManager.updateParameters(assemblyID, assembly.getParameters());
             Assembly updatedAssembly = this.assemblyManager.getAssemblyById(assemblyID);