Revize d90fc9de

re #8133 #8132 Export contingency table to XLSX + PDF (not fully complete).

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

@@ -5 +5 @@
 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.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@@ -14 +13 @@
 import vldc.aswi.domain.Location;
 import vldc.aswi.domain.Operator;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
+import vldc.aswi.model.ExportType;
 import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
-import vldc.aswi.service.AssemblyManager;
-import vldc.aswi.service.ConfigurationManager;
-import vldc.aswi.service.LocationManager;
-import vldc.aswi.service.SqlQueryManager;
+import vldc.aswi.service.*;
 import vldc.aswi.service.parameter.ParameterManager;
 import vldc.aswi.utils.AuthControl;
 import vldc.aswi.utils.Utils;
-import vldc.aswi.validators.AssemblyValidator;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import vldc.aswi.validators.ConfigurationValidator;
 
 import javax.validation.Valid;
@@ -48 +47 @@
     @Autowired
     private SqlQueryManager sqlQueryManager;
 
+    /** Autowired export manager. */
+    @Autowired
+    private ExportManager exportManager;
+
     /** Autowired parameter manager. */
     @Autowired
     private ParameterManager parameterManager;
@@ -122 +125 @@
                                            @RequestParam("isNotRemoveEmpty") String isNotRemoveEmptyString,
                                            @RequestParam("configurationID") String id,
                                            @RequestParam(required=false, value="generateTable") String generateTable,
-                                           @RequestParam(required=false, value="exportXls") String exportXls,
+                                           @RequestParam(required=false, value="exportXlsx") String exportXlsx,
                                            @RequestParam(required=false, value="exportPdf") String exportPdf,
                                            @RequestParam(required=false, value="saveConfiguration") String saveConfiguration,
-                                            RedirectAttributes redirectAttributes
+                                            RedirectAttributes redirectAttributes,
+                                            HttpServletRequest request,
+                                            HttpServletResponse response
                                           )
     {
         ModelAndView modelAndView = new ModelAndView();
         ModelMap modelMap = modelAndView.getModelMap();
+        boolean isNotRemoveEmpty = isNotRemoveEmptyString == null || !isNotRemoveEmptyString.equals("");
 
         if (bindingResult.hasErrors()) {
             // TODO: 04.05.2020 Error message
@@ -150 +156 @@
                 modelMap.addAttribute(assemblyTitleName, generateTableTitleText + " " + newConfiguration.getName());
             }
             else {
-                boolean isNotRemoveEmpty = isNotRemoveEmptyString == null || !isNotRemoveEmptyString.equals("");
                 List<ContingencyTableRow> rows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly(),
                         newConfiguration.getParametersInConfiguration(), isNotRemoveEmpty);
-                System.out.println("Generuj tabulku");
+
                 modelMap.addAttribute("configurationID", id);
                 modelMap.addAttribute("contingencyTableRows", rows);
                 addConfigurationDataIntoModelAndView(newConfiguration, modelAndView, modelMap);
             }
         }
-        else if (exportXls != null)
+        else if (exportXlsx != null)
         {
-            System.out.println("Generuj XLS");
+            prepareForTable(newConfiguration);
+            this.exportManager.exportContingencyTable(newConfiguration, isNotRemoveEmpty, response, ExportType.XLSX);
+
+            // Return null, because we want to continue on our page with selected parameters / attributes.
+            return null;
         }
         else if (exportPdf != null)
         {
-            System.out.println("Generuj PDF");
+            prepareForTable(newConfiguration);
+            this.exportManager.exportContingencyTable(newConfiguration, isNotRemoveEmpty, response, ExportType.PDF);
+
+            // Return null, because we want to continue on our page with selected parameters / attributes.
+            return null;
         }
         else if (saveConfiguration != null)
         {
-            System.out.println("ulož konfiguraci");
             Configuration configuration = configurationManager.saveConfiguration(newConfiguration, id);
 
             initializeFields(configuration);
@@ -265 +277 @@
         initializeFields(newConfiguration);
         modelMap.addAttribute("configuration", newConfiguration);
         modelMap.addAttribute("comparator", comparator);
-        modelMap.addAttribute("formAction", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
+        modelMap.addAttribute("formAction", "/configuration?configurationID=" + newConfiguration.getAssembly().getId());
         modelAndView.setViewName("assembly");
     }
 }