Revize cc39413d

re #7885 added SUM and ability to work with multiple values and sorted parameters in configuration, optimization

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

@@ -46 +46 @@
     @Autowired
     private AssemblyManager assemblyManager;
 
+    /** Autowired configuration manager */
+    @Autowired
+    private ConfigurationManager configurationManager;
+
     /** Autowired role manager. */
     @Autowired
     private RoleManager roleManager;
@@ -150 +154 @@
 
     /**
      * Post method for form, where configuration is created from assembly.
-     * @param assembly - Assembly values.
+     * @param newConfiguration - Configuration values.
      * @param bindingResult - Error results from assembly validators.
      * @param atts - Redirect attributes.
      * @return ModelAndView for assembly.
      */
     @PostMapping("/assembly")
-    public ModelAndView assemblyPost(Configuration configuration,
+    public ModelAndView assemblyPost(Configuration newConfiguration,
                                      BindingResult bindingResult,
                                      RedirectAttributes atts,
                                      @RequestParam("assemblyID") String id,
@@ -165 +169 @@
                                      @RequestParam(required=false, value="exportPdf") String exportPdf,
                                      @RequestParam(required=false, value="saveConfiguration") String saveConfiguration)
     {
+        ModelAndView modelAndView = new ModelAndView();
+
         if (generateTable != null)
         {
             System.out.println("Generuj tabulku");
+            prepareForTable(newConfiguration);
+            System.out.println("Generuj tabulku");
+            ModelMap modelMap = modelAndView.getModelMap();
+            modelMap.addAttribute("configurationID", id);
+            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());
+            modelAndView.setViewName("assembly");
         }
         else if (exportXls != null)
         {
@@ -180 +197 @@
         else if (saveConfiguration != null)
         {
             System.out.println("ulož konfiguraci");
-        }
 
+            Configuration configuration = configurationManager.saveConfiguration(newConfiguration, "");
 
+            initializeFields(configuration);
 
-        ModelAndView modelAndView = new ModelAndView("redirect:/assembly?assemblyID=" + id);
+            modelAndView.setViewName("redirect:/configuration?configurationID=" + configuration.getId());
+        }
 
         return modelAndView;
 /*
@@ -348 +367 @@
 
         return modelAndView;
     }
+
+    /**
+     * Initializes fields of a given configuration
+     * @param configuration configuration which fields should be initialized
+     */
+    private void initializeFields(Configuration configuration) {
+        for(ParameterInConfiguration parameterInConfiguration : configuration.getParametersInConfiguration()) {
+            if(parameterInConfiguration.getLocation() == null) {
+                parameterInConfiguration.setLocation(new Location());
+            }
+            if(parameterInConfiguration.getOperator() == null) {
+                parameterInConfiguration.setOperator(new Operator());
+            }
+            if(parameterInConfiguration.getFunctions() == null) {
+                parameterInConfiguration.setFunctions(new ArrayList<>());
+            }
+        }
+    }
+
+    /**
+     * Prepares the configuration for contingency table generation. Initializes assembly and parameters of parameters in
+     * configuration.
+     * @param configuration configuration to be prepared.
+     */
+    private void prepareForTable(Configuration configuration) {
+        Assembly assembly = assemblyManager.getAssemblyById(configuration.getAssembly().getId());
+        configuration.setAssembly(assembly);
+
+        for(int i = 0; i < configuration.getParametersInConfiguration().size(); i++) {
+            ParameterInConfiguration parameterInConfiguration = configuration.getParametersInConfiguration().get(i);
+            parameterInConfiguration.setParameter(assembly.getParameters().get(i));
+            if (parameterInConfiguration.getLocation() != null) {
+                parameterInConfiguration.setLocation(locationManager.getLocationById(parameterInConfiguration.getLocation().getId()));
+            }
+        }
+    }
 }