Revize d90fc9de

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

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

@@ -12 +12 @@
 import vldc.aswi.domain.*;
 import vldc.aswi.domain.parameter.Parameter;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
-import vldc.aswi.model.table.BooleanWrapper;
+import vldc.aswi.model.ExportType;
 import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
 import vldc.aswi.service.*;
 import vldc.aswi.service.parameter.ParameterManager;
@@ -21 +21 @@
 import vldc.aswi.validators.AssemblyValidator;
 import vldc.aswi.utils.Utils;
 import vldc.aswi.validators.ConfigurationValidator;
-
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * Controller for assemblies and configurations
@@ -44 +45 @@
     @Autowired
     private ParameterManager parameterManager;
 
+    /** Autowired export manager. */
+    @Autowired
+    private ExportManager exportManager;
+
     /** Autowired configuration manager */
     @Autowired
     private ConfigurationManager configurationManager;
@@ -151 +156 @@
         return modelAndView;
     }
 
-
     /**
      * Post method for form, where configuration is created from assembly.
      * @param newConfiguration - Configuration values.
      * @param bindingResult - Error results from assembly validators.
-     * @param atts - Redirect attributes.
      * @return ModelAndView for assembly.
      */
     @PostMapping("/assembly")
@@ -166 +169 @@
                                      @RequestParam("isNotRemoveEmpty") String isNotRemoveEmptyString,
                                      @RequestParam("assemblyID") 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,
+                                     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
@@ -193 +199 @@
                 newConfiguration.setName(assembly.getName());
             }
 
-            System.out.println("Generuj tabulku");
             prepareForTable(newConfiguration);
             BindingResult errors = new BeanPropertyBindingResult(newConfiguration, newConfiguration.getClass().getName());
             configurationValidator.validate(newConfiguration, errors);
@@ -204 +209 @@
                 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);
                 modelMap.addAttribute("isNotRemoveEmpty", isNotRemoveEmpty);
                 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, "");
 
             initializeFields(configuration);
@@ -237 +247 @@
         }
 
         return modelAndView;
-/*
-        ModelMap modelMap = modelAndView.getModelMap();
-
-        long assemblyID = assembly.getId();
-        System.out.println(assemblyID);
-
-        Assembly assembly2 = this.assemblyManager.getAssemblyById(assemblyID);
-
-        modelMap.addAttribute("assemblies", this.assemblyManager.getAssemblies());
-        modelMap.addAttribute("assembly", assembly2);
-        modelMap.addAttribute("contingencyTableRows", this.sqlQueryManager.getContingencyTableRow(assembly2.getSQLQuery()));
-
-        return modelAndView;
-
- */
     }
 
     /**