From 1b7982cfaaeb54f08b36f625e55115d1256e4cfd Mon Sep 17 00:00:00 2001 From: aoezyetimoglu Date: Wed, 8 Sep 2021 16:53:05 +0200 Subject: [PATCH] RED-2115: Fixed dossier status report generation --- .../service/StatusReportGenerationService.java | 14 ++++++++------ .../service/StatusReportGenerationServiceTest.java | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java index 6cb4d3b..bae93a6 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java @@ -88,13 +88,21 @@ public class StatusReportGenerationService { XSSFCell cellPages = row.createCell(4); cellPages.setCellValue(pages); + sheet.autoSizeColumn(0); + sheet.autoSizeColumn(1); + sheet.autoSizeColumn(2); + sheet.autoSizeColumn(3); + sheet.autoSizeColumn(4); + Iterator> iterator = fileAttributes.getAttributeIdToValue().entrySet().iterator(); while (iterator.hasNext()) { var nextElement = iterator.next(); if(attributesAssignment.get(nextElement.getKey()) != null) { XSSFCell cell = row.createCell(attributesAssignment.get(nextElement.getKey())); cell.setCellValue(nextElement.getValue()); + sheet.autoSizeColumn(attributesAssignment.get(nextElement.getKey())); } + } } @@ -105,12 +113,6 @@ public class StatusReportGenerationService { private void addHeader(XSSFSheet sheet, XSSFCellStyle style) { - sheet.autoSizeColumn(0); - sheet.autoSizeColumn(1); - sheet.autoSizeColumn(2); - sheet.autoSizeColumn(3); - sheet.autoSizeColumn(4); - XSSFRow row = sheet.createRow(0); XSSFCell cellName = row.createCell(0); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java index d1c3051..3863497 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java @@ -53,7 +53,7 @@ public class StatusReportGenerationServiceTest { FileAttributes fileAttributes1 = new FileAttributes(Map.of("a", "A", "config2", "B2")); FileStatus fileStatus1 = FileStatus.builder() .dossierId(dossierId) - .filename("file1") + .filename("file1desJahrhunderts") .lastUploaded(OffsetDateTime.now().minusHours(2)) .currentReviewer("me") .status(Status.APPROVED) @@ -64,7 +64,7 @@ public class StatusReportGenerationServiceTest { FileAttributes fileAttributes2 = new FileAttributes(Map.of("config1", "X1", "y", "Y")); FileStatus fileStatus2 = FileStatus.builder() .dossierId(dossierId) - .filename("file2") + .filename("file2desJahrtausendsGibtsJaNicht") .lastUploaded(OffsetDateTime.now()) .currentReviewer("you") .status(Status.APPROVED)