Revize e9236d13

re #8150 - added success/error messages

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

@@ -87 +87 @@
     /** Title text for new assembly form. */
     private String assemblyNewTitleText = "Vytvoření nové sestavy";
 
-    /** Name of thymeleaf parameter, which will contain error text from validator. */
-    private String assemblyErrorName = "errorText";
-
     /**
      * Bind assembly validator.
      * @param binder Binder.
@@ -167 +164 @@
                                      @RequestParam(required=false, value="generateTable") String generateTable,
                                      @RequestParam(required=false, value="exportXls") String exportXls,
                                      @RequestParam(required=false, value="exportPdf") String exportPdf,
-                                     @RequestParam(required=false, value="saveConfiguration") String saveConfiguration)
+                                     @RequestParam(required=false, value="saveConfiguration") String saveConfiguration,
+                                     RedirectAttributes redirectAttributes)
     {
 
         ModelAndView modelAndView = new ModelAndView();
@@ -210 +208 @@
 
             initializeFields(configuration);
 
+            redirectAttributes.addFlashAttribute(assemblySuccessName, "Šablona byla úspěšně uložena");
+
             modelAndView.setViewName("redirect:/configuration?configurationID=" + configuration.getId());
         }
 
@@ -237 +237 @@
      * @return ModelAndView for index.
      */
     @GetMapping("/assembly_delete")
-    public ModelAndView assemblyDeleteGet(@RequestParam("assemblyID") String id) {
+    public ModelAndView assemblyDeleteGet(@RequestParam("assemblyID") String id, RedirectAttributes redirectAttributes) {
         ModelAndView modelAndView = new ModelAndView("redirect:/");
 
         Long assemblyId = Utils.tryParseLong(id);
 
         if (assemblyId == null) {
-            // TODO: print error in index.
+            redirectAttributes.addFlashAttribute(assemblyErrorName, "Sestavu se nepodařilo odstranit.");
         }
         boolean success = this.assemblyManager.deleteAssembly(assemblyId);
-        // TODO: check success.
+
+        if (success)
+        {
+            redirectAttributes.addFlashAttribute(assemblySuccessName, "Sestava byla úspěšně odstraněna");
+        }
+        else
+        {
+            redirectAttributes.addFlashAttribute(assemblyErrorName, "Sestavu se nepodařilo odstranit");
+        }
 
         return modelAndView;
     }
@@ -311 +319 @@
 
             modelMap.addAttribute("assembly", updatedAssembly);
             modelMap.addAttribute(assemblyTitleName, assemblyEditTitleText + " " + updatedAssembly.getName());
+            modelMap.addAttribute(assemblySuccessName, "Úspěšně uloženo");
         }
 
         modelMap.addAttribute("allRoles", this.roleManager.getRoles());
@@ -371 +380 @@
             this.parameterManager.addParameters(assemblyId, assembly.getParameters());
 
             modelAndView.setViewName("redirect:/assembly_edit?assemblyID=" + assemblyId);
+            modelMap.addAttribute(assemblySuccessName, "Sestava byla úspěšně vytvořena");
         }
 
         modelMap.addAttribute("allRoles", this.roleManager.getRoles());

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

@@ -8 +8 @@
 @Controller
 public class BasicController {
 
+    /** Name of thymeleaf parameter, which will contain error text from validator. */
+    protected String assemblyErrorName = "errorText";
+
+    /** Name of thymeleaf parameter, which will contain success text from validator. */
+    protected String assemblySuccessName = "successText";
+
     /**
      * Return message containings all errors from validator.
      * @param result Validator results.

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

@@ -9 +9 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import vldc.aswi.domain.Assembly;
 import vldc.aswi.domain.Configuration;
 import vldc.aswi.domain.Location;
@@ -55 +56 @@
      * @return modelAndView of page to be shown
      */
     @GetMapping("/configuration")
-    public ModelAndView configurationGet(@RequestParam("configurationID") String id) {
+    public ModelAndView configurationGet(@RequestParam("configurationID") String id,
+                                         @ModelAttribute("successText") String successMsg,
+                                         @ModelAttribute("errorText") String errorMsg) {
         ModelAndView modelAndView = new ModelAndView("assembly");
 
         ModelMap modelMap = modelAndView.getModelMap();
@@ -84 +87 @@
         modelMap.addAttribute("comparator", comparator);
         modelMap.addAttribute("formAction", "/configuration?configurationID=" + configuration.getId());
 
+        modelMap.addAttribute(assemblySuccessName, successMsg);
+        modelMap.addAttribute(assemblyErrorName, errorMsg);
+
         return modelAndView;
     }
 
@@ -101 +107 @@
                                            @RequestParam(required=false, value="generateTable") String generateTable,
                                            @RequestParam(required=false, value="exportXls") String exportXls,
                                            @RequestParam(required=false, value="exportPdf") String exportPdf,
-                                           @RequestParam(required=false, value="saveConfiguration") String saveConfiguration)
+                                           @RequestParam(required=false, value="saveConfiguration") String saveConfiguration,
+                                            RedirectAttributes redirectAttributes
+                                          )
     {
         ModelAndView modelAndView = new ModelAndView();
+        ModelMap modelMap = modelAndView.getModelMap();
 
         if (bindingResult.hasErrors()) {
             // TODO: 04.05.2020 Error message
@@ -116 +125 @@
         {
             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());
@@ -141 +149 @@
 
             initializeFields(configuration);
 
+            redirectAttributes.addFlashAttribute(assemblySuccessName, "Šablona byla úspěšně uložena");
             modelAndView.setViewName("redirect:/configuration?configurationID=" + configuration.getId());
+
         }
 
         return modelAndView;
@@ -153 +163 @@
      * @return ModelAndView for index.
      */
     @GetMapping("/configuration_delete")
-    public ModelAndView configurationDeleteGet(@RequestParam("configurationID") String id) {
+    public ModelAndView configurationDeleteGet(@RequestParam("configurationID") String id, RedirectAttributes redirectAttributes) {
         ModelAndView modelAndView = new ModelAndView("redirect:/");
 
         Long configurationId = Utils.tryParseLong(id);
 
         if (configurationId == null) {
-            // TODO: print error in index.
+            redirectAttributes.addFlashAttribute(assemblyErrorName, "Sestavu se nepodařilo odstranit");
         }
 
         boolean success = this.configurationManager.deleteConfiguration(configurationId);
-        // TODO: check success.
+
+        if (success)
+        {
+            redirectAttributes.addFlashAttribute(assemblySuccessName, "Sestava byla úspěšně odstraněna");
+        }
+        else
+        {
+            redirectAttributes.addFlashAttribute(assemblyErrorName, "Sestavu se nepodařilo odstranit");
+        }
 
         return modelAndView;
     }

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

@@ -58 +58 @@
 	 * @return modelAndView with index page
 	 */
 	@GetMapping("/")
-	public ModelAndView index() {
+	public ModelAndView index(@ModelAttribute("successText") String successMsg, @ModelAttribute("errorText") String errorMsg) {
 		ModelAndView modelAndView = new ModelAndView("index");
 
 		ModelMap modelMap = modelAndView.getModelMap();
@@ -83 +83 @@
 		modelMap.addAttribute("attributes", createAttributesString(assemblies));
 		modelMap.addAttribute("configurations", configurationManager.getConfigurations());
 
+		modelMap.addAttribute(assemblySuccessName, successMsg);
+		modelMap.addAttribute(assemblyErrorName, errorMsg);
+
+
 		return modelAndView;
 	}
 

src/main/webapp/WEB-INF/templates/layouts/layout.html

@@ -28 +28 @@
 
     </head>
     <body>
-        <div th:if="${errorText}" >
+        <div th:if="${!#strings.isEmpty(errorText)}" >
             <div class="alert alert-danger">
                 <span th:text="${errorText}"></span>
             </div>
         </div>
-        <div th:if="${successText}" >
+        <div th:if="${!#strings.isEmpty(successText)}" >
             <div class="alert alert-success">
                 <span th:text="${successText}"></span>
             </div>