Revize d90fc9de

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

pom.xml

@@ -113 +113 @@
 			<artifactId>openpdf</artifactId>
 			<version>1.3.14</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.github.dhorions</groupId>
+			<artifactId>boxable</artifactId>
+			<version>1.5</version>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/vldc/aswi/model/ExportType.java

@@ +1 @@
+package vldc.aswi.model;
+
+/**
+ * Export types.
+ */
+public enum ExportType {
+    PDF,
+    XLSX
+}

src/main/java/vldc/aswi/service/ExportManager.java

@@ +1 @@
+package vldc.aswi.service;
+
+import vldc.aswi.domain.Configuration;
+import vldc.aswi.model.ExportType;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Interface for Export manager.
+ */
+public interface ExportManager {
+
+    /**
+     * Export contingency table to specific export type.
+     * @param newConfiguration - Exported configuration.
+     * @param isNotRemoveEmpty - If blank rows / columns must be inherit or not.
+     * @param response - Http response.
+     * @param type - Export type.
+     */
+    void exportContingencyTable(Configuration newConfiguration, boolean isNotRemoveEmpty, HttpServletResponse response, ExportType type);
+}

src/main/java/vldc/aswi/service/ExportManagerImpl.java

@@ +1 @@
+package vldc.aswi.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import vldc.aswi.domain.Configuration;
+import vldc.aswi.model.ExportType;
+import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
+import vldc.aswi.utils.ExporterPDF;
+import vldc.aswi.utils.ExporterXLSX;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * Manager for Export.
+ */
+@Service
+@Slf4j
+public class ExportManagerImpl implements ExportManager {
+
+    /** Autowired sql query manager. */
+    @Autowired
+    private SqlQueryManager sqlQueryManager;
+
+    /**
+     * Export contingency table to specific export type.
+     * @param newConfiguration - Exported configuration.
+     * @param isNotRemoveEmpty - If blank rows / columns must be inherit or not.
+     * @param response - Http response.
+     * @param type - Export type.
+     */
+    @Override
+    public void exportContingencyTable(Configuration newConfiguration, boolean isNotRemoveEmpty, HttpServletResponse response, ExportType type) {
+
+        // Get contingency table rows.
+        List<ContingencyTableRow> contingencyTableRows = this.sqlQueryManager.getContingencyTableRow(newConfiguration.getAssembly(),
+                newConfiguration.getParametersInConfiguration(), isNotRemoveEmpty);
+
+        try {
+            File tmpFile = null;
+
+            switch(type) {
+
+                case PDF:
+
+                    // Create temporary file.
+                    tmpFile = File.createTempFile("outPDF", ".pdf");
+
+                    // Export contingency table rows to pdf format.
+                    ExporterPDF.export(tmpFile, contingencyTableRows);
+
+                    // Set content type to pdf.
+                    response.setContentType("application/pdf");
+                    break;
+                case XLSX:
+
+                    // Create temporary file.
+                    tmpFile = File.createTempFile("outXLSX", ".xlsx");
+
+                    // Export contingency table rows to xlsx format.
+                    ExporterXLSX.export(tmpFile, newConfiguration.getTableName(), contingencyTableRows);
+
+                    // Set content type to xlsx.
+                    response.setContentType("application/xlsx");
+                    break;
+            }
+
+            // Force "Save As..." dialog.
+            response.setHeader("Content-Disposition", "attachment; filename=" + tmpFile + "");
+            response.setContentLength((int)tmpFile.length());
+
+            // Copy temporary file content to response.
+            InputStream in = new BufferedInputStream(new FileInputStream(tmpFile));
+            ServletOutputStream out = response.getOutputStream();
+
+            IOUtils.copy(in, out);
+            in.close();
+
+            out.flush();
+            out.close();
+
+            // Delete temporary file.
+            tmpFile.delete();
+
+            System.out.println("pdf successfully exported");
+            // TODO: print success message - file created.
+
+        } catch (Exception e) {
+            System.out.println("pdf export FAILED 1");
+            // TODO: print error message - file not created.
+        }
+    }
+}

src/main/java/vldc/aswi/utils/ExporterPDF.java

@@ -1 +1 @@
 package vldc.aswi.utils;
 
-import com.lowagie.text.Cell;
-import com.lowagie.text.Document;
+import be.quodlibet.boxable.BaseTable;
+import com.lowagie.text.*;
 import com.lowagie.text.Font;
-import com.lowagie.text.Phrase;
+import com.lowagie.text.alignment.HorizontalAlignment;
+import com.lowagie.text.alignment.VerticalAlignment;
 import com.lowagie.text.pdf.PdfWriter;
+import com.sun.media.jfxmedia.logging.Logger;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
+import vldc.aswi.model.table.contingencyTable.ContingencyTableRowCell;
 
-import java.io.FileNotFoundException;
+import java.awt.*;
+import java.io.File;
 import java.io.FileOutputStream;
+import java.util.List;
 
 /**
- * Class used for exporting data to PDF files
+ * Class used for exporting data to PDF files.
  */
 public class ExporterPDF {
 
     /**
-     * !!!DUMMY!!!
      * Exports data to .pdf file
-     * @param tableName name of the table
+     * @param tmpFile - Temporary file.
+     * @param contingencyTableRows - Contingency table rows.
      */
-    public static void export(String tableName) throws FileNotFoundException {
-        Document doc = new Document();
+    public static void export(File tmpFile, List<ContingencyTableRow> contingencyTableRows) {
 
-        PdfWriter.getInstance(doc, new FileOutputStream("out.pdf"));
+        try {
+            if (contingencyTableRows.size() == 0) {
 
-        Font font = new Font(com.lowagie.text.Font.COURIER, 14);
-        com.lowagie.text.Table table = new com.lowagie.text.Table(3);
+                return;
+            }
 
-        Cell cell = new Cell(new Phrase(tableName, font));
-        cell.setColspan(2);
-        cell.setHeader(true);
+            // Create new document.
+            Document doc = new Document();
 
-        Cell cell2 = new Cell(new Phrase("SUM", font));
-        cell2.setColspan(1);
-        cell2.setHeader(true);
+            // Get instance of PdfWriter.
+            PdfWriter.getInstance(doc, new FileOutputStream(tmpFile));
 
-        table.addCell(cell);
-        table.addCell(cell2);
+            // Create fonts.
+            Font colRowFont = new Font(Font.HELVETICA, 14, Font.BOLD);
+            Font dataFont = new Font(Font.HELVETICA, 12);
 
-        table.addCell(new Phrase("Val1", font));
-        table.addCell(new Phrase("Val2", font));
-        table.addCell(new Phrase("", font));
+            // Calculate column and row count.
+            int columnsCount = getColumnCount(contingencyTableRows.get(0));
+            int rowsCount = contingencyTableRows.size();
 
-        table.addCell("1");
-        table.addCell("2");
-        table.addCell("3");
+            // Create table.
+            Table table = new Table(columnsCount, rowsCount);
 
-        table.addCell("4");
-        table.addCell("5");
-        table.addCell("9");
+            for (ContingencyTableRow row : contingencyTableRows) {
 
-        doc.open();
-        doc.add(table);
+                if (row.isHeader()) {
+                    // Row is header.
+                    setColRow(table, row.getCells(), colRowFont);
+                } else {
+                    // Row contains data.
+                    setDataRow(table, row.getCells(), colRowFont, dataFont);
+                }
+            }
 
-        doc.close();
+            // Open document and write created table into it.
+            doc.open();
+            doc.add(table);
+
+            doc.close();
+        } catch (Exception e) {
+
+            Logger.logMsg(Logger.WARNING, "Error while exporting contingency table to PDF.");
+            Logger.logMsg(Logger.WARNING, e.getStackTrace().toString());
+        }
+    }
+
+    /**
+     * Set column header row.
+     * @param table - Table.
+     * @param cells - List of contingency table cells.
+     * @param colRowFont - Column row styles.
+     * @throws BadElementException If cell is not created successfully.
+     */
+    private static void setColRow(Table table, List<ContingencyTableRowCell> cells, Font colRowFont) throws BadElementException {
+
+        for (ContingencyTableRowCell cell : cells) {
+
+            // Create and prepare pdf cell.
+            Cell pdfCell = prepareCell(cell.getValue(), colRowFont, cell.getColSpan());
+            pdfCell.setHeader(true);
+            table.addCell(pdfCell);
+        }
+    }
+
+    /**
+     * Set data row.
+     * @param table - Table.
+     * @param cells - List of contingency table cells.
+     * @param colRowFont - Column row styles.
+     * @param dataFont - Data row styles.
+     * @throws BadElementException If cell is not created successfully.
+     */
+    private static void setDataRow(Table table, List<ContingencyTableRowCell> cells, Font colRowFont, Font dataFont) throws BadElementException {
+
+        boolean headerWrited = false;
+
+        for (ContingencyTableRowCell cell : cells) {
+
+            // Create pdf cell.
+            Cell pdfCell;
+
+            // First cell is always header, so apply different style.
+            if (!headerWrited) {
+
+                headerWrited = true;
+
+                // Prepare pdf cell.
+                pdfCell = prepareCell(cell.getValue(), colRowFont, cell.getColSpan());
+                pdfCell.setHeader(true);
+
+            } else {
+
+                // Prepare pdf cell.
+                pdfCell = prepareCell(cell.getValue(), dataFont, cell.getColSpan());
+            }
+
+            table.addCell(pdfCell);
+        }
+    }
+
+    /**
+     * Prepare pdf cell.
+     * @param value - Cell value.
+     * @param font - Cell font.
+     * @param colSpan - Cell colspan.
+     * @return Prepared pdf cell.
+     */
+    private static Cell prepareCell(String value, Font font, int colSpan) {
+
+        Cell cell = new Cell(new Phrase(value, font));
+        cell.setColspan(colSpan);
+        cell.setHorizontalAlignment(HorizontalAlignment.CENTER);
+        cell.setVerticalAlignment(VerticalAlignment.CENTER);
+
+        return cell;
+    }
+
+    /**
+     * Calculate column count in contingency table row.
+     * @param firstRow - First row of contingency table.
+     * @return Column count in contingency table.
+     */
+    private static int getColumnCount(ContingencyTableRow firstRow) {
+
+        int columnCount = 0;
+
+        for (ContingencyTableRowCell cell : firstRow.getCells()) {
+
+            columnCount += cell.getColSpan();
+        }
+
+        return columnCount;
+    }
+
+
+    public static void exportt(File tmpFile, List<ContingencyTableRow> contingencyTableRows) {
+        /*
+        //Dummy Table
+        float margin = 50;
+
+        // starting y position is whole page height subtracted by top and bottom margin
+        float yStartNewPage = myPage.getMediaBox().getHeight() - (2 * margin);
+
+        // we want table across whole page width (subtracted by left and right margin ofcourse)
+        float tableWidth = myPage.getMediaBox().getWidth() - (2 * margin);
+
+        boolean drawContent = true;
+        float yStart = yStartNewPage;
+        float bottomMargin = 70;
+        // y position is your coordinate of top left corner of the table
+        float yPosition = 550;
+
+        BaseTable table = new BaseTable(yPosition, yStartNewPage, bottomMargin, tableWidth, margin, mainDocument, myPage, true, drawContent);
+
+
+        Row<PDPage> headerRow = table.createRow(15f);
+        Cell<PDPage> cell = headerRow.createCell(100, "Header");
+        table.addHeaderRow(headerRow);
+
+
+        Row<PDPage> row = table.createRow(12);
+        cell = row.createCell(30, "Data 1");
+        cell = row.createCell(70, "Some value");
+
+        table.draw();
+
+
+        contentStream.close();
+        mainDocument.addPage(myPage);
+        mainDocument.save("testfile.pdf");
+        mainDocument.close();
+         */
     }
 }

src/main/java/vldc/aswi/utils/ExporterXLSX.java

@@ -1 +1 @@
 package vldc.aswi.utils;
 
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import vldc.aswi.model.table.contingencyTable.ContingencyTableRow;
+import vldc.aswi.model.table.contingencyTable.ContingencyTableRowCell;
 
-import java.io.FileNotFoundException;
+import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
+import java.util.List;
 
 /**
- * Class used for exporting data to XLSX
+ * Class used for exporting data to XLSX.
  */
 public class ExporterXLSX {
 
     /**
-     * !!!DUMMY!!!
      * Exports data to .xlsx file
-     * @param tableName name of the table
+     * @param tableName - name of the table.
+     * @param contingencyTableRows - List of contingency table rows.
      */
-    public static void export(String tableName) {
-
-        //temporary dummy implementation, used for testing
-        String[] columns = new String[] {"studuje", "nestuduje"};
-        String[] rows = new String[] {"fav", "fst"};
-        String[] data = new String[] {"1", "2", "3", "4"};
+    public static void export(File tmpFile, String tableName, List<ContingencyTableRow> contingencyTableRows) {
 
+        // Create workbook.
         Workbook workbook = new XSSFWorkbook();
 
+        // Create sheet.
         Sheet sheet = workbook.createSheet(tableName);
 
+        // Create font for row names.
         Font colRowNameFont = workbook.createFont();
         colRowNameFont.setBold(true);
         colRowNameFont.setFontHeightInPoints((short) 16);
+        colRowNameFont.setFontName("HELVETICA");
         colRowNameFont.setColor(IndexedColors.BLACK.getIndex());
 
+        // Create font for data.
         Font dataFont = workbook.createFont();
+        dataFont.setFontName("HELVETICA");
         dataFont.setBold(false);
         dataFont.setFontHeightInPoints((short) 12);
         dataFont.setColor(IndexedColors.BLACK.getIndex());
 
+        // Set row cell style.
         CellStyle colRowStyle = workbook.createCellStyle();
         colRowStyle.setFont(colRowNameFont);
+        colRowStyle.setAlignment(HorizontalAlignment.CENTER);
 
+        // Set data cell style.
         CellStyle dataStyle = workbook.createCellStyle();
         dataStyle.setFont(dataFont);
+        dataStyle.setAlignment(HorizontalAlignment.CENTER);
 
-        Row descRow = sheet.createRow(0);
+        int rowCounter = 0;
 
-        for (int i = 0; i < 2; i++) {
-            Cell cell = descRow.createCell(i + 1);
-            cell.setCellValue(columns[i]);
-            cell.setCellStyle(colRowStyle);
-        }
+        for (ContingencyTableRow row : contingencyTableRows) {
 
-        for (int i = 0; i < 2; i++) {
-            Row row = sheet.createRow(i + 1);
-            Cell nameCell = row.createCell(0);
-            nameCell.setCellValue(rows[i]);
-            nameCell.setCellStyle(colRowStyle);
+            Row xlsxRow = sheet.createRow(rowCounter);
 
-            Cell cell1 = row.createCell(1);
-            cell1.setCellValue(data[i + i + 1]);
-            cell1.setCellStyle(dataStyle);
+            if (row.isHeader()) {
+                // Row is header.
+                setColRow(sheet, xlsxRow, row.getCells(), colRowStyle);
+            }
+            else {
+                // Row contains data.
+                setDataRow(sheet, xlsxRow, row.getCells(), colRowStyle, dataStyle);
+            }
 
-            Cell cell2 = row.createCell(2);
-            cell2.setCellValue(data[i + i + 1]);
-            cell2.setCellStyle(dataStyle);
+            rowCounter++;
         }
 
-        for (int i = 0; i < 3; i++) {
-            sheet.autoSizeColumn(i);
-        }
+        try {
 
-        //merge of columns, will be used for column headers
-        //sheet.addMergedRegion(new CellRangeAddress(0,0,1,2));
+            FileOutputStream out = new FileOutputStream(tmpFile);
+            workbook.write(out);
+            out.close();
 
-        FileOutputStream streamOut = null;
+        } catch (Exception e) {
 
-        try {
-            streamOut = new FileOutputStream("out.xlsx");
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
         }
+    }
 
-        try {
-            workbook.write(streamOut);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    /**
+     * Set column row.
+     * @param sheet - Sheet.
+     * @param row - Row.
+     * @param cells - List of contingency table cells.
+     * @param colRowStyle - Column row styles.
+     */
+    private static void setColRow(Sheet sheet, Row row, List<ContingencyTableRowCell> cells, CellStyle colRowStyle) {
 
-        try {
-            if (streamOut != null) {
-                streamOut.close();
+        int cellCounter = 0;
+
+        for (ContingencyTableRowCell cell : cells) {
+
+            // Create new xlsx cell.
+            Cell xlsxCell = row.createCell(cellCounter);
+            xlsxCell.setCellValue(cell.getValue());
+            xlsxCell.setCellStyle(colRowStyle);
+
+            // Calculate last cell to be merged with current.
+            int colSpan = cell.getColSpan();
+            int newCellPosition = cellCounter + (colSpan - 1);
+
+            // If colSpan is higher than 1, then merge cells.
+            if (colSpan > 1) {
+                sheet.addMergedRegion(new CellRangeAddress(row.getRowNum(), row.getRowNum(), cellCounter, newCellPosition));
+            }
+
+            // If cell has some value, then autosize current column.
+            if (!cell.getValue().equals("")) {
+
+                for (int i = cellCounter; i < (newCellPosition + 1); i++) {
+                    sheet.autoSizeColumn(cellCounter);
+                }
             }
-        } catch (IOException e) {
-            e.printStackTrace();
+
+            cellCounter = newCellPosition + 1;
         }
+    }
 
-        try {
-            workbook.close();
-        } catch (IOException e) {
-            e.printStackTrace();
+    /**
+     * Set data row.
+     * @param sheet - Sheet.
+     * @param row - Row.
+     * @param cells - List of contingency table cells.
+     * @param colRowStyle - Column row styles.
+     * @param dataStyle - Data row styles.
+     */
+    private static void setDataRow(Sheet sheet, Row row, List<ContingencyTableRowCell> cells, CellStyle colRowStyle, CellStyle dataStyle) {
+
+        int cellCounter = 0;
+
+        for (ContingencyTableRowCell cell : cells) {
+
+            // Create new xlsx cell.
+            Cell xlsxCell = row.createCell(cellCounter);
+            xlsxCell.setCellValue(cell.getValue());
+
+            // First cell is always header, so apply different style.
+            if (cellCounter == 0) {
+                xlsxCell.setCellStyle(colRowStyle);
+            } else {
+                xlsxCell.setCellStyle(dataStyle);
+            }
+
+            sheet.autoSizeColumn(cellCounter);
+            cellCounter++;
         }
     }
 }

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;
-
- */
     }
 
     /**

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");
     }
 }

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

@@ -208 +208 @@
 
                     <div class="buttons-wrap">
                         <button type="submit" class="btn btn-primary mb-2 show-spinner" name="generateTable">Vygenerovat tabulku</button>
-                        <button type="submit" class="btn btn-primary mb-2 show-spinner" name="exportXls">Export do XLS</button>
+                        <button type="submit" class="btn btn-primary mb-2 show-spinner" name="exportXlsx">Export do XLSX</button>
                         <button type="submit" class="btn btn-primary mb-2 show-spinner" name="exportPdf">Export do PDF</button>
                     </div>
                 </div>