Merge pull request #48 from aquality-automation/Bug51-export-creation

Bug\51 export creation

Author: VladislavKostyukevich

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.3.6 (unreleased)
+
+Features:
+ 
+Bugfixes:
+ - Fixed for downloading audits results from Audits Dashboard -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/51)
+
+
 ## 0.3.5 (2020-02-15)
 
 Features:

src/main/java/main/controllers/AuditController.java

@@ -134,11 +134,10 @@ public String create(boolean all, boolean xls) throws AqualityException {
         JSONArray resArray = new JSONArray();
         List<Pair<String, String>> fields = processExportArrayCreation(resArray, audits);
         try {
-
             if (xls) {
-                return excelUtils.writeXLSFile(resArray, fields, MessageFormat.format("Reporting_Portal_{0}_Submitted_Audits_{1}", all ? "All" : "Last", formatter.format(new Date())), MessageFormat.format("{0} Submitted Audits", all ? "All" : "Last"));
+                return excelUtils.writeXLSFile(resArray, fields, MessageFormat.format("Aquality_Tracking_{0}_Submitted_Audits_{1}", all ? "All" : "Last", formatter.format(new Date())), MessageFormat.format("{0} Submitted Audits", all ? "All" : "Last"));
             } else {
-                return excelUtils.writeXLSXFile(resArray, fields, MessageFormat.format("Reporting_Portal_{0}_Submitted_Audits_{1}", all ? "All" : "Last", formatter.format(new Date())), MessageFormat.format("{0} Submitted Audits", all ? "All" : "Last"));
+                return excelUtils.writeXLSXFile(resArray, fields, MessageFormat.format("Aquality_Tracking_{0}_Submitted_Audits_{1}", all ? "All" : "Last", formatter.format(new Date())), MessageFormat.format("{0} Submitted Audits", all ? "All" : "Last"));
             }
         } catch (Exception e) {
             throw new AqualityException("Cannot create Export");
@@ -381,7 +380,7 @@ private List<Pair<String, String>> processExportArrayCreation(JSONArray resArray
 
             return fields;
         } catch (Exception e) {
-            throw new AqualityException("Cannot create Export");
+            throw new AqualityException("Cannot process export creation");
         }
     }
 }

src/main/java/main/utils/ExcelUtils.java

@@ -30,42 +30,35 @@ public class ExcelUtils {
     private XSSFCell lastCell;
 
     public String writeXLSFile(JSONArray objects, List<Pair<String, String>> fields, String fileName, String sheetName) throws IOException, JSONException {
-
         final String path = PathUtils.createPathToBin("temp", "Exports");
         new File(path).mkdirs();
-
         HSSFWorkbook wb = new HSSFWorkbook();
         HSSFSheet sheet = wb.createSheet(sheetName);
-
         CreateHeadRow(sheet, fields);
         CreateRows(objects, sheet, fields);
         ColumnsAutoHeight(sheet, fields);
-
         String fPath = PathUtils.createPath(path, fileName + ".xlsx");
         FileOutputStream fileOut = new FileOutputStream(fPath);
-
         wb.write(fileOut);
         fileOut.flush();
         fileOut.close();
-
         return fPath;
     }
 
     public String writeXLSXFile(JSONArray objects, List<Pair<String, String>> fields, String fileName, String sheetName) throws IOException, JSONException {
-
         final String path = PathUtils.createPathToBin("temp", "Exports");
         new File(path).mkdirs();
-
         XSSFWorkbook wb = new XSSFWorkbook();
         XSSFSheet sheet = wb.createSheet(sheetName);
         CreateRows(objects, sheet, fields);
         ColumnsAutoHeight(sheet, fields);
+        if(lastCell == null){
+            lastCell = firstCell;
+        }
 
         sheet.setAutoFilter(new CellRangeAddress(firstCell.getRowIndex(), lastCell.getRowIndex(), firstCell.getColumnIndex(), lastCell.getColumnIndex()));
-
         String fPath = PathUtils.createPath(path, fileName + ".xlsx");
         FileOutputStream fileOut = new FileOutputStream(fPath);
-
         wb.write(fileOut);
         fileOut.flush();
         fileOut.close();