Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Pull request #70: RED-2115: Fixed dossier status report generation

Browse Source 
Merge in RED/redaction-report-service from RED-2115-rrs4 to master

* commit '1b7982cfaaeb54f08b36f625e55115d1256e4cfd':
  RED-2115: Fixed dossier status report generation
This commit is contained in:
Ali Oezyetimoglu 2021-09-08 16:54:56 +02:00
commit ed23d3a3c4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java
View File

@ -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<Map.Entry<String, String>> 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);

4
redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java
View File

@ -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)