Revize 1d00b6ee

re #8102 - indication submit button in post

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

@@ -142 +142 @@
 
         modelMap.addAttribute("configuration", configuration);
         modelMap.addAttribute("comparator", comparator);
+        modelMap.addAttribute("formAction", "/assembly?assemblyID=" + assembly.getId());
 
         return modelAndView;
     }
@@ -155 +156 @@
      * @return ModelAndView for assembly.
      */
     @PostMapping("/assembly")
-    public ModelAndView assemblyPost(@Valid Assembly assembly, BindingResult bindingResult, RedirectAttributes atts) {
-        ModelAndView modelAndView = new ModelAndView();
+    public ModelAndView assemblyPost(Assembly assembly,
+                                     BindingResult bindingResult,
+                                     RedirectAttributes atts,
+                                     @RequestParam("assemblyID") String id,
+                                     @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)
+    {
+        if (generateTable != null)
+        {
+            System.out.println("Generuj tabulku");
+        }
+        else if (exportXls != null)
+        {
+            System.out.println("Generuj XLS");
+        }
+        else if (exportPdf != null)
+        {
+            System.out.println("Generuj PDF");
+        }
+        else if (saveConfiguration != null)
+        {
+            System.out.println("ulož konfiguraci");
+        }
+
 
+
+        ModelAndView modelAndView = new ModelAndView("redirect:/assembly?assemblyID=" + id);
+
+        return modelAndView;
+/*
         ModelMap modelMap = modelAndView.getModelMap();
 
         long assemblyID = assembly.getId();
@@ -170 +200 @@
         modelMap.addAttribute("contingencyTableRows", this.sqlQueryManager.getContingencyTableRow(assembly2.getSQLQuery()));
 
         return modelAndView;
+
+ */
     }
 
     /**

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

@@ -68 +68 @@
 
         modelMap.addAttribute("configuration", configuration);
         modelMap.addAttribute("comparator", comparator);
+        modelMap.addAttribute("formAction", "/configuration?configurationID=" + configuration.getId());
 
         return modelAndView;
     }
@@ -80 +81 @@
      * @return modelAndView with redirection
      */
     @PostMapping("/configuration")
-    public ModelAndView configurationPost(@Valid Configuration newConfiguration, BindingResult bindingResult,
-                                          @RequestParam("configurationID") String id) {
+    public ModelAndView configurationPost( Configuration newConfiguration,
+                                           BindingResult bindingResult,
+                                           @RequestParam("configurationID") String id,
+                                           @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)
+    {
+        if (generateTable != null)
+        {
+            System.out.println("Generuj tabulku");
+        }
+        else if (exportXls != null)
+        {
+            System.out.println("Generuj XLS");
+        }
+        else if (exportPdf != null)
+        {
+            System.out.println("Generuj PDF");
+        }
+        else if (saveConfiguration != null)
+        {
+            System.out.println("ulož konfiguraci");
+        }
+
+
         ModelAndView modelAndView = new ModelAndView();
 
         if (bindingResult.hasErrors()) {

src/main/webapp/WEB-INF/templates/assembly.html

@@ -17 +17 @@
             <a href="/" class="btn btn-success mb-2">Zpět</a>
         </div>
 
-        <form th:object="${configuration}" method="post" th:action="@{/configuration(configurationID=${configuration.id})}">
+        <form th:object="${configuration}" method="post" th:action="@{${formAction}}">
             <input type="hidden" th:field="*{assembly.id}" th:value="${configuration.assembly?.getId()}"/>
             <div class="container box">
                 <div class="col-md-12">
@@ -190 +190 @@
                     <div class="col-md-12 form-group row template-input">
                         <label for="exampleFormControlSelect1" class="template-input-label">Vlastní název šablony:</label>
                         <div class="">
-                            <input type="text" required="required" class="form-control select-filter-input" id="name"
+                            <input type="text" class="form-control select-filter-input" id="name"
                                    th:field="${configuration.name}">
                         </div>
 
-                        <button type="submit" class="btn btn-success mb-2 template-input-submit">Uložit šablonu</button>
+                        <button type="submit" class="btn btn-success mb-2 template-input-submit" name="saveConfiguration">Uložit šablonu</button>
                     </div>
 
 
                     <div class="buttons-wrap">
-                        <button type="submit" class="btn btn-secondary mb-2 " name="generate-table">Vygenerovat tabulku
-                        </button>
-                        <button type="submit" class="btn btn-secondary mb-2 " name="export-xls">Export do XLS</button>
-                        <button type="submit" class="btn btn-secondary mb-2 " name="export-pdf">Export do PDF</button>
+                        <button type="submit" class="btn btn-secondary mb-2 " name="generateTable">Vygenerovat tabulku</button>
+                        <button type="submit" class="btn btn-secondary mb-2 " name="exportXls">Export do XLS</button>
+                        <button type="submit" class="btn btn-secondary mb-2 " name="exportPdf">Export do PDF</button>
                     </div>
                 </div>
             </div>