Revize 830a7e2e

re #8176 nothing; re #8178 added checks for data types; added table name to the generated table

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

@@ -72 +72 @@
     /**
      * Opens an configuration page after configuration name was clicked
      * @param id ID of configuration
+     * @param errorMsg Error message text.
+     * @param successMsg Success message text.
      * @return modelAndView of page to be shown
      */
     @GetMapping("/configuration")
@@ -113 +115 @@
     /**
      * Saves or edits configuration and redirects to the page with configuration
      * @param newConfiguration contained with configuration data
-     * @param id ID of configuration, if empty new configuration is created
-     * @param bindingResult binding result
-     * @return modelAndView with redirection
+     * @param bindingResult - Error results from assembly validators.
+     * @param isNotRemoveEmptyString String that stores if switch to not remove empty rows and columns was set.
+     * @param id ID of the assembly.
+     * @param generateTable String used to check if generate table button was clicked.
+     * @param exportPdf String used to check if export to PDF button was clicked.
+     * @param exportXlsx String used to check if export to XLSX button was clicked.
+     * @param redirectAttributes Attributes.
+     * @param saveConfiguration String used to check if save configuration button was clicked.
+     * @param response HTTP servlet response.
+     * @param request HTTP servlet request.
+     * @return ModelAndView for assembly.
      */
     @PostMapping("/configuration")
     public ModelAndView configurationPost(@Valid Configuration newConfiguration,
@@ -155 +165 @@
             }
             else {
                 List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly(),
-                        newConfiguration.getParametersInConfiguration(), isNotRemoveEmpty);
-
-                modelMap.addAttribute("configurationID", id);
-                modelMap.addAttribute("contingencyTableRows", rows);
-                addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
+                        newConfiguration.getParametersInConfiguration(), isNotRemoveEmpty, newConfiguration.getTableName());
+
+                if (rows != null) {
+                    if (rows.isEmpty()) {
+                        modelMap.addAttribute(assemblyErrorName, "Výsledná tabulka neobsahuje žádné hodnoty (" +
+                                "SQL dotaz nevrátil žádné řádky)!");
+                        modelMap.addAttribute(assemblyTitleName, generateTableTitleText + " " + newConfiguration.getName());
+                    }
+                    else {
+                        modelMap.addAttribute("configurationID", id);
+                        modelMap.addAttribute("contingencyTableRows", rows);
+                        modelMap.addAttribute("isNotRemoveEmpty", isNotRemoveEmpty);
+                        addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
+                    }
+                }
+                else {
+                    modelMap.addAttribute(assemblyErrorName, "Vyskytla se chyba v SQL dotazu! Prosím " +
+                            "zkontrolujte zadané hodnoty filtrů nebo kontaktujte administrátora!");
+                    modelMap.addAttribute(assemblyTitleName, generateTableTitleText + " " + newConfiguration.getName());
+                }
             }
         }
         else if (exportXlsx != null)
@@ -195 +220 @@
     /**
      * Get method for configuration delete.
      * @param id - ID of configuration.
+     * @param redirectAttributes Attributes.
      * @return ModelAndView for index.
      */
     @GetMapping("/configuration_delete")