Revize 7638be72

re #7886 Assembly validator completed (validating sql query, parameter name in select and parameter location) + displaying temp error message.
Added title for edit / add assembly forms.
Added toString method for all domains.

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

@@ -23 +23 @@
  * Controller for assembly.
  */
 @Controller
-public class AssemblyController {
+public class AssemblyController extends BasicController {
 
     /** Autowired sql query manager. */
     @Autowired
@@ -61 +61 @@
     @Autowired
     private AssemblyValidator assemblyValidator;
 
+    /** Name of thymeleaf parameter, which will contain text in assembly form. */
+    private String assemblyTitleName = "title";
+
+    /** Title text for assembly edit form.  */
+    private String assemblyEditTitleText = "Editace - ";
+
+    /** 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.
@@ -102 +114 @@
         return modelAndView;
     }
 
+    /**
+     * Get method for assembly edit.
+     * @param id - Id of assembly.
+     * @return ModelAndView for assembly edit.
+     */
     @GetMapping("/assembly_edit")
     public ModelAndView assemblyEditIndex(@Valid @ModelAttribute("assemblyID") String id) {
         ModelAndView modelAndView = new ModelAndView("assembly_manage");
@@ -111 +128 @@
         Assembly assembly = this.assemblyManager.getAssemblyById(Long.parseLong(id));
 
         modelMap.addAttribute("assembly", assembly);
+
+        modelMap.addAttribute(assemblyTitleName, assemblyEditTitleText + " " + assembly.getName());
+
         modelMap.addAttribute("allRoles", this.roleManager.getRoles());
         modelMap.addAttribute("allParameterTypes", this.parameterTypeManager.getParameterTypes());
         modelMap.addAttribute("allFunctions", this.functionManager.getFunctions());
@@ -120 +140 @@
         return modelAndView;
     }
 
+    /**
+     * Post method for assembly edit.
+     * @param assembly - Edited assembly values.
+     * @param result - Validator results.
+     * @param assemblyIsPublic - Attribute indicating if assembly is public or not.
+     * @return ModelAndView for assembly edit.
+     */
     @PostMapping("/assembly_edit")
-    public ModelAndView assemblyEditPostIndex(@Valid @ModelAttribute("assembly") Assembly assembly, @Valid @ModelAttribute("checkboxPublic") String assemblyIsPublic) {
+    public ModelAndView assemblyEditPostIndex(@Valid @ModelAttribute("assembly") Assembly assembly, BindingResult result,
+                                              @Valid @ModelAttribute("checkboxPublic") String assemblyIsPublic) {
 
         ModelAndView modelAndView = new ModelAndView("assembly_manage");
         ModelMap modelMap = modelAndView.getModelMap();
 
-        if (assemblyIsPublic.equals("on")) assembly.setIsPublic(1);
-        else assembly.setIsPublic(0);
+        if (result.hasErrors()) {
+            modelMap.addAttribute("assembly", assembly);
+
+            modelMap.addAttribute(assemblyErrorName, getFullErrorMessage(result));
+            modelMap.addAttribute(assemblyTitleName, assemblyEditTitleText + " " + assembly.getName());
+        }
+        else {
+            if (assemblyIsPublic.equals("on")) assembly.setIsPublic(1);
+            else assembly.setIsPublic(0);
 
-        // TODO: chybí defaultValue.
-        Long assemblyID = this.assemblyManager.updateAssembly(assembly);
-        this.parameterManager.updateParameters(assemblyID, assembly.getParameters());
-        Assembly updatedAssembly = this.assemblyManager.getAssemblyById(assembly.getId());
+            // TODO: chybí defaultValue.
+            Long assemblyID = this.assemblyManager.updateAssembly(assembly);
+            this.parameterManager.updateParameters(assemblyID, assembly.getParameters());
+            Assembly updatedAssembly = this.assemblyManager.getAssemblyById(assembly.getId());
 
-        modelMap.addAttribute("assembly", updatedAssembly);
+            modelMap.addAttribute("assembly", updatedAssembly);
+            modelMap.addAttribute(assemblyTitleName, assemblyEditTitleText + " " + updatedAssembly.getName());
+        }
 
         modelMap.addAttribute("allRoles", this.roleManager.getRoles());
         modelMap.addAttribute("allParameterTypes", this.parameterTypeManager.getParameterTypes());
@@ -145 +182 @@
         return modelAndView;
     }
 
+    /**
+     * Get method for new assembly form.
+     * @return ModelAndView for new assembly.
+     */
     @GetMapping("/assembly_new")
     public ModelAndView assemblyNewIndex() {
         ModelAndView modelAndView = new ModelAndView("assembly_manage");
@@ -152 +193 @@
         ModelMap modelMap = modelAndView.getModelMap();
 
         modelMap.addAttribute("assembly", new Assembly());
+
+        modelMap.addAttribute(assemblyTitleName, assemblyNewTitleText);
+
         modelMap.addAttribute("allRoles", this.roleManager.getRoles());
         modelMap.addAttribute("allParameterTypes", this.parameterTypeManager.getParameterTypes());
         modelMap.addAttribute("allFunctions", this.functionManager.getFunctions());
@@ -161 +205 @@
         return modelAndView;
     }
 
+    /**
+     * Post method for new assembly form.
+     * @param assembly - Assembly values.
+     * @param result - Validator results.
+     * @return
+     */
     @PostMapping("/assembly_new")
-    public ModelAndView assemblyNewIndexPost(@Valid @ModelAttribute("assembly") Assembly assembly) {
+    public ModelAndView assemblyNewIndexPost(@Valid @ModelAttribute("assembly") Assembly assembly, BindingResult result) {
         ModelAndView modelAndView = new ModelAndView();
 
+        if (result.hasErrors()) {
+            ModelMap modelMap = modelAndView.getModelMap();
+            modelAndView.setViewName("assembly_manage");
+
+            modelMap.addAttribute("assembly", assembly);
+
+            modelMap.addAttribute(assemblyTitleName, assemblyNewTitleText);
+            modelMap.addAttribute(assemblyErrorName, getFullErrorMessage(result));
+
+            modelMap.addAttribute("allRoles", this.roleManager.getRoles());
+            modelMap.addAttribute("allParameterTypes", this.parameterTypeManager.getParameterTypes());
+            modelMap.addAttribute("allFunctions", this.functionManager.getFunctions());
+            modelMap.addAttribute("allOperators", this.operatorManager.getOperators());
+            modelMap.addAttribute("allLocations", this.locationManager.getLocations());
+        }
+
         ModelMap modelMap = modelAndView.getModelMap();
 
         // TODO: chybí získání default value.
         Long assemblyId = this.assemblyManager.createAssembly(assembly);
         this.parameterManager.addParameters(assemblyId, assembly.getParameters());
 
-        modelAndView.setViewName("redirect:/assembly_edit?assemblyID=" + assembly.getId());
+        modelAndView.setViewName("redirect:/assembly_edit?assemblyID=" + assemblyId);
 
         return modelAndView;
     }