Revize 3309eb3e

re #7885 added option to show empty rows and columns, bug fixes re #8134 nothing; re #8154 added validator; re #8136 added column names no comments

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

@@ -3 +3 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@@ -19 +21 @@
 import vldc.aswi.service.SqlQueryManager;
 import vldc.aswi.utils.AuthControl;
 import vldc.aswi.utils.Utils;
+import vldc.aswi.validators.AssemblyValidator;
+import vldc.aswi.validators.ConfigurationValidator;
+
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -45 +51 @@
     @Autowired
     private ConfigurationManager configurationManager;
 
+    /** Autowired configuration validator */
+    @Autowired
+    private ConfigurationValidator configurationValidator;
+
+    /** Name of thymeleaf parameter, which will contain text in assembly form. */
+    private String assemblyTitleName = "title";
+
+    /** Title text for table generation form.  */
+    private String generateTableTitleText = "Generování tabulky - ";
+
     /**
      * Opens an configuration page after configuration name was clicked
      * @param id ID of configuration
@@ -96 +112 @@
      * @return modelAndView with redirection
      */
     @PostMapping("/configuration")
-    public ModelAndView configurationPost(Configuration newConfiguration,
+    public ModelAndView configurationPost(@Valid Configuration newConfiguration,
                                            BindingResult bindingResult,
                                            @RequestParam("configurationID") String id,
                                            @RequestParam(required=false, value="generateTable") String generateTable,
@@ -119 +135 @@
         if (generateTable != null)
         {
             prepareForTable(newConfiguration);
-            System.out.println("Generuj tabulku");
-
-            List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly().getSQLQuery(),
-                    newConfiguration.getParametersInConfiguration());
-
-            modelMap.addAttribute("configurationID", id);
-            modelMap.addAttribute("contingencyTableRows", rows);
-            Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
-            initializeFields(newConfiguration);
-            modelMap.addAttribute("configuration", newConfiguration);
-            modelMap.addAttribute("comparator", comparator);
-            modelMap.addAttribute("formAction", "/configuration?configurationID=" + id);
-            modelAndView.setViewName("assembly");
+            BindingResult errors = new BeanPropertyBindingResult(newConfiguration, newConfiguration.getClass().getName());
+            configurationValidator.validate(newConfiguration, errors);
+            if (errors.hasErrors()) {
+                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
+
+                modelMap.addAttribute(assemblyErrorName, getFullErrorMessage(errors));
+                modelMap.addAttribute(assemblyTitleName, generateTableTitleText + " " + newConfiguration.getName());
+            }
+            else {
+                List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration);
+                System.out.println("Generuj tabulku");
+                modelMap.addAttribute("configurationID", id);
+                modelMap.addAttribute("contingencyTableRows", rows);
+                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
+            }
         }
         else if (exportXls != null)
         {
@@ -220 +238 @@
             }
         }
     }
+
+    private void addConfigurationDataIntoModelAndView(Configuration newConfiguration, ModelAndView modelAndView, ModelMap modelMap) {
+        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");
+    }
 }