From 84f7b98599d7669c31395081f73a85dde5e7e911 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Thu, 16 May 2024 20:39:56 +0800
Subject: [PATCH] update work report

---
 .../modules/report/service/ReportService.kt   |  63 ++++++++++++------
 ...08_Monthly Work Hours Analysis Report.xlsx | Bin 15817 -> 15819 bytes
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
index 72c6c38..2fe91c3 100644
--- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
+++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt
@@ -381,6 +381,10 @@ open class ReportService(
         val monthStyle = workbook.createDataFormat().getFormat("mmm, yyyy")
         val dateStyle = workbook.createDataFormat().getFormat("dd/mm/yyyy")
 
+        val boldStyle = workbook.createCellStyle()
+        val boldFont = workbook.createFont()
+        boldFont.bold = true
+        boldStyle.setFont(boldFont)
         val daysOfMonth = (1..month.lengthOfMonth()).map { day ->
             val date = month.withDayOfMonth(day)
             val formattedDate = date.format(DateTimeFormatter.ofPattern("dd/MM/yyyy"))
@@ -390,8 +394,6 @@ open class ReportService(
 
         val sheet: Sheet = workbook.getSheetAt(0)
 
-        val boldFont = sheet.workbook.createFont()
-        boldFont.bold = true
 //        sheet.forceFormulaRecalculation = true;   //Calculate formulas
 
         var rowIndex = 1 // Assuming the location is in (1,2), which is the report date field
@@ -403,22 +405,27 @@ open class ReportService(
         var dayInt = 0
         var tempCell: Cell
 
-        tempCell = sheet.getRow(rowIndex).createCell(columnIndex)
-        tempCell.setCellValue(FORMATTED_TODAY)
+        sheet.getRow(rowIndex).createCell(columnIndex).apply {
+            setCellValue(FORMATTED_TODAY)
+        }
 
         rowIndex = 2
-        tempCell = sheet.getRow(rowIndex).createCell(columnIndex)
-        tempCell.setCellValue(month)
-        tempCell.cellStyle.dataFormat = monthStyle
+        sheet.getRow(rowIndex).getCell(columnIndex).apply {
+            setCellValue(month)
+//            cellStyle.setFont(boldStyle)
+
+            cellStyle.dataFormat = monthStyle
+        }
 
         rowIndex = 3
-        tempCell. sheet.getRow(rowIndex).createCell(columnIndex)
-        tempCell.setCellValue(staff.name)
+        sheet.getRow(rowIndex).createCell(columnIndex).apply {
+            setCellValue(staff.name)
+        }
 
         rowIndex = 4
-        tempCell.sheet.getRow(rowIndex).createCell(columnIndex)
-        tempCell.setCellValue(staff.team.name)
-
+        sheet.getRow(rowIndex).createCell(columnIndex).apply {
+            setCellValue(staff.team.name)
+        }
 
         rowIndex = 5
         tempCell = sheet.getRow(rowIndex).createCell(columnIndex)
@@ -430,6 +437,7 @@ open class ReportService(
 
         val ThinBorderBottom: MutableMap<String?, Any?> = mutableMapOf()
         ThinBorderBottom["borderBottom"] = BorderStyle.THIN
+        ThinBorderBottom["wrapText"] = true
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         rowIndex = 7
         daysOfMonth.forEach { dayInfo ->
@@ -437,12 +445,12 @@ open class ReportService(
             rowSize++
             tempCell = sheet.getRow(rowIndex).createCell(0)
             tempCell.setCellValue(dayInfo.date)
+            tempCell.cellStyle = boldStyle
             tempCell.cellStyle.dataFormat = dateStyle
-            tempCell.cellStyle.setFont(boldFont)
 //                cellStyle.alignment = HorizontalAlignment.LEFT
             tempCell = sheet.getRow(rowIndex).createCell(1)
             tempCell.setCellValue(dayInfo.weekday)
-            tempCell.cellStyle.setFont(boldFont)
+            tempCell.cellStyle = boldStyle
 //                cellStyle.alignment = HorizontalAlignment.LEFT
         }
 
@@ -450,7 +458,7 @@ open class ReportService(
         tempCell = sheet.getRow(rowIndex).createCell(0)
         sheet.addMergedRegion(CellRangeAddress(rowIndex,rowIndex , 0, 1))
         tempCell.setCellValue("Sub-total")
-        tempCell.cellStyle.setFont(boldFont)
+        tempCell.cellStyle = boldStyle
         CellUtil.setAlignment(tempCell, HorizontalAlignment.CENTER)
         CellUtil.setCellStyleProperties(tempCell, DoubleBorderBottom)
         tempCell = sheet.getRow(rowIndex).createCell(1)
@@ -459,6 +467,7 @@ open class ReportService(
         rowIndex += 1
         tempCell = sheet.getRow(rowIndex).createCell(0)
         tempCell.setCellValue("Total Normal Hours [A]")
+        tempCell.cellStyle = boldStyle
         CellUtil.setAlignment(tempCell, HorizontalAlignment.CENTER)
 
         var normalConsumed = 0.0
@@ -479,8 +488,8 @@ open class ReportService(
         rowIndex += 1
         tempCell = sheet.getRow(rowIndex).createCell(0)
         tempCell.setCellValue("Total Other Hours [B]")
+        tempCell.cellStyle = boldStyle
         CellUtil.setAlignment(tempCell, HorizontalAlignment.CENTER)
-        tempCell.cellStyle.setFont(boldFont)
         tempCell = sheet.getRow(rowIndex).createCell(2)
         tempCell.setCellValue(otConsumed)
         tempCell.cellStyle.dataFormat = accountingStyle
@@ -492,6 +501,7 @@ open class ReportService(
         rowIndex += 1
         tempCell = sheet.getRow(rowIndex).createCell(0)
         tempCell.setCellValue("Total Leave Hours")
+        tempCell.cellStyle = boldStyle
         CellUtil.setAlignment(tempCell, HorizontalAlignment.CENTER)
         sheet.addMergedRegion(CellRangeAddress(rowIndex,rowIndex , 0, 1))
         if (leaves.isNotEmpty()) {
@@ -507,7 +517,7 @@ open class ReportService(
         rowIndex += 1
         tempCell = sheet.getRow(rowIndex).createCell(0)
         tempCell.setCellValue("Total Spent Manhours [A+B]")
-        tempCell.cellStyle.setFont(boldFont)
+        tempCell.cellStyle = boldStyle
         CellUtil.setAlignment(tempCell, HorizontalAlignment.CENTER)
         CellUtil.setCellStyleProperties(tempCell, DoubleBorderBottom)
         tempCell = sheet.getRow(rowIndex).createCell(1)
@@ -526,9 +536,13 @@ open class ReportService(
         projectList.forEachIndexed { index, title ->
             tempCell = sheet.getRow(7).createCell(columnIndex + index)
             tempCell.setCellValue(title)
-            CellUtil.setAlignment(tempCell, HorizontalAlignment.RIGHT)
+            tempCell.cellStyle = boldStyle
+            CellUtil.setAlignment(tempCell, HorizontalAlignment.CENTER)
+            CellUtil.setVerticalAlignment(tempCell, VerticalAlignment.CENTER)
             CellUtil.setCellStyleProperties(tempCell, ThinBorderBottom)
+            columnSize++
         }
+        println(columnSize)
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         if (timesheets.isNotEmpty()) {
             projectList.forEach { _ ->
@@ -564,11 +578,16 @@ open class ReportService(
             ///////////////////////////////////////////////////////// Leave Hours ////////////////////////////////////////////////////////////////////
             tempCell = sheet.getRow(rowIndex).createCell(columnIndex)
             tempCell.setCellValue("Leave Hours")
+            tempCell.cellStyle = boldStyle
+            CellUtil.setVerticalAlignment(tempCell, VerticalAlignment.CENTER)
+            CellUtil.setAlignment(tempCell, HorizontalAlignment.CENTER)
             CellUtil.setCellStyleProperties(tempCell, ThinBorderBottom)
 
         columnIndex += 1
             tempCell = sheet.getRow(rowIndex).createCell(columnIndex)
             tempCell.setCellValue("Daily Manhour Spent\n(Excluding Leave Hours)")
+            tempCell.cellStyle = boldStyle
+            CellUtil.setAlignment(tempCell, HorizontalAlignment.LEFT)
             CellUtil.setCellStyleProperties(tempCell, ThinBorderBottom)
 
             sheet.addMergedRegion(CellRangeAddress(6,6 , 2, columnIndex))
@@ -583,18 +602,18 @@ open class ReportService(
             }
             // cal subtotal
             println(rowIndex)
-            for (i in 0 until columnSize - 2) { // minus last col
-                tempCell = sheet.getRow(rowIndex).createCell(2 + i)
+            for (i in 0 ..columnSize ) { // minus last col
+                println(sheet.getRow(rowIndex).getCell(2 + i))
+                tempCell = sheet.getRow(rowIndex).getCell(2 + i) ?: sheet.getRow(rowIndex).createCell(2 + i)
                 tempCell.cellFormula = "SUM(${getColumnAlphabet(2 + i)}9:${getColumnAlphabet(2 + i)}${rowIndex})"
+                tempCell.cellStyle = boldStyle
                 tempCell.cellStyle.dataFormat = accountingStyle
-                tempCell.cellStyle.setFont(boldFont)
                 CellUtil.setCellStyleProperties(tempCell, DoubleBorderBottom)
             }
         }
         return workbook
     }
 
-
     @Throws(IOException::class)
     private fun createSalaryList(
         salarys: List<Salary>,
diff --git a/src/main/resources/templates/report/AR08_Monthly Work Hours Analysis Report.xlsx b/src/main/resources/templates/report/AR08_Monthly Work Hours Analysis Report.xlsx
index 4922b4afe3b535bc8358b130064fc6778118843c..001d546e5e0f9d273b547ba826e4dc62193d522f 100644
GIT binary patch
delta 2061
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

delta 2084
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
OlcGH%22VNw0002-K-ca7