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/AssemblyController.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.GetMapping;
@@ -22 +23 @@
 import vldc.aswi.utils.AuthControl;
 import vldc.aswi.validators.AssemblyValidator;
 import vldc.aswi.utils.Utils;
+import vldc.aswi.validators.ConfigurationValidator;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
@@ -76 +78 @@
     @Autowired
     private AssemblyValidator assemblyValidator;
 
+    /** Autowired configuration validator */
+    @Autowired
+    private ConfigurationValidator configurationValidator;
+
     /** Name of thymeleaf parameter, which will contain text in assembly form. */
     private String assemblyTitleName = "title";
 
@@ -85 +91 @@
     /** Title text for new assembly form. */
     private String assemblyNewTitleText = "Vytvoření nové sestavy";
 
+    /** Title text for table generation form.  */
+    private String generateTableTitleText = "Generování tabulky - ";
+
     /**
      * Bind assembly validator.
      * @param binder Binder.
@@ -167 +176 @@
     {
 
         ModelAndView modelAndView = new ModelAndView();
+        ModelMap modelMap = modelAndView.getModelMap();
 
         if (bindingResult.hasErrors()) {
             // TODO: 04.05.2020 Error message
@@ -188 +198 @@
 
             System.out.println("Generuj tabulku");
             prepareForTable(newConfiguration);
+            BindingResult errors = new BeanPropertyBindingResult(newConfiguration, newConfiguration.getClass().getName());
+            configurationValidator.validate(newConfiguration, errors);
+            if (errors.hasErrors()) {
+                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
 
-            List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly().getSQLQuery(),
-                    newConfiguration.getParametersInConfiguration());
+                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 modelMap = modelAndView.getModelMap();
-            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", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
-            modelAndView.setViewName("assembly");
+                System.out.println("Generuj tabulku");
+                modelMap.addAttribute("configurationID", id);
+                modelMap.addAttribute("contingencyTableRows", rows);
+                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
+            }
         }
         else if (exportXls != null)
         {
@@ -243 +254 @@
  */
     }
 
+    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");
+    }
+
     /**
      * Get method for assembly delete.
      * @param id - ID of assembly.