From 75bb5939f4bbecf676de1e8ef0a147892c3da844 Mon Sep 17 00:00:00 2001
From: "MSI\\2Fi" <jason.tom@2fi-solutions.com.hk>
Date: Thu, 9 Jan 2025 16:26:23 +0800
Subject: [PATCH] Update Dashboard Update Financial Status Report

---
 .../modules/data/service/DashboardService.kt  |  24 +++++++++++++++---
 .../web/models/ExportDashboardExcelRequest.kt |   4 ++-
 .../modules/report/service/ReportService.kt   |  10 +++++---
 ...hboard] Financial Summary for project.xlsx | Bin 13436 -> 13601 bytes
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
index ba2c720..394d060 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
@@ -3867,7 +3867,7 @@ open class DashboardService(
                 }
 
                 createCell(10).apply {
-                    setCellValue(financialSummaryByProject.cumulativeExpenditure)
+                    setCellValue(financialSummaryByProject.totalExpenditure)
                     cellStyle.apply {
                         setFont(normalFont)
                         dataFormat = accountingStyle
@@ -3876,7 +3876,7 @@ open class DashboardService(
                 }
 
                 createCell(11).apply {
-                    setCellValue(financialSummaryByProject.totalInvoiced)
+                    setCellValue(financialSummaryByProject.manhoursExpenditure)
                     cellStyle.apply {
                         setFont(normalFont)
                         dataFormat = accountingStyle
@@ -3885,7 +3885,7 @@ open class DashboardService(
                 }
 
                 createCell(12).apply {
-                    cellFormula = "IF(I${rowIndex}-L${rowIndex}<0,0,I${rowIndex}-L${rowIndex})"
+                    setCellValue(financialSummaryByProject.projectExpense)
                     cellStyle.apply {
                         setFont(normalFont)
                         dataFormat = accountingStyle
@@ -3894,6 +3894,24 @@ open class DashboardService(
                 }
 
                 createCell(13).apply {
+                    setCellValue(financialSummaryByProject.totalInvoiced)
+                    cellStyle.apply {
+                        setFont(normalFont)
+                        dataFormat = accountingStyle
+                    }
+                    CellUtil.setAlignment(this, HorizontalAlignment.RIGHT)
+                }
+
+                createCell(14).apply {
+                    cellFormula = "IF(I${rowIndex}-L${rowIndex}<0,0,I${rowIndex}-N${rowIndex})"
+                    cellStyle.apply {
+                        setFont(normalFont)
+                        dataFormat = accountingStyle
+                    }
+                    CellUtil.setAlignment(this, HorizontalAlignment.RIGHT)
+                }
+
+                createCell(15).apply {
                     setCellValue(financialSummaryByProject.totalReceived)
                     cellStyle.apply {
                         setFont(normalFont)
diff --git a/src/main/java/com/ffii/tsms/modules/data/web/models/ExportDashboardExcelRequest.kt b/src/main/java/com/ffii/tsms/modules/data/web/models/ExportDashboardExcelRequest.kt
index 6236ac3..9b87a43 100644
--- a/src/main/java/com/ffii/tsms/modules/data/web/models/ExportDashboardExcelRequest.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/web/models/ExportDashboardExcelRequest.kt
@@ -30,7 +30,9 @@ data class FinancialSummaryByProject (
     val subsidiaryName: String?,
     val totalFee: Double,
     val totalBudget: Double,
-    val cumulativeExpenditure: Double,
+    val totalExpenditure: Double,
+    val manhoursExpenditure: Double,
+    val projectExpense: Double,
     val totalInvoiced: Double,
     val totalReceived: Double,
 )
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 0059f45..5649623 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
@@ -506,7 +506,7 @@ open class ReportService(
 
             val descriptionCell = row.createCell(1)
             descriptionCell.setCellValue(
-                if (item["description"] != null) item.getValue("description").toString() else "N/A"
+                if (item["name"] != null) item.getValue("name").toString() else "N/A"
             )
 
             val clientCell = row.createCell(2)
@@ -587,7 +587,8 @@ open class ReportService(
             val uninvoiceCell = row.createCell(14)
             uninvoiceCell.apply {
                 cellFormula =
-                    " IF(H${rowNum}-N${rowNum}<0, 0, H${rowNum}-N${rowNum})"
+                        " H${rowNum}-N${rowNum} "
+//                    " IF(H${rowNum}-N${rowNum}<0, 0, H${rowNum}-N${rowNum})"
 //                    " IF(I${rowNum}<=J${rowNum}, I${rowNum}-L${rowNum}, IF(AND(I${rowNum}>J${rowNum}, J${rowNum}<L${rowNum}), 0, IF(AND(I${rowNum}>J${rowNum}, J${rowNum}>=L${rowNum}), J${rowNum}-L${rowNum}, 0))) "
                 cellStyle.dataFormat = accountingStyle
             }
@@ -695,7 +696,8 @@ open class ReportService(
 
         val sumUInvoiceCell = row.createCell(14)
         sumUInvoiceCell.apply {
-            cellFormula = "IF(H${rowNum+1}-N${rowNum+1}<0,0,H${rowNum+1}-N${rowNum+1})"
+//            cellFormula = "IF(H${rowNum+1}-N${rowNum+1}<0,0,H${rowNum+1}-N${rowNum+1})"
+            cellFormula = " H${rowNum+1}-N${rowNum+1} "
             cellStyle = boldFontCellStyle
             cellStyle.dataFormat = accountingStyle
         }
@@ -2195,7 +2197,7 @@ open class ReportService(
                     + " where pe.deleted = false "
                     + " group by projectId "
                     + " ) "
-                    + " select p.code, p.description, c.name as client, IFNULL(s2.name, \"N/A\") as subsidiary, concat(t.code, \' - \', t.name) as teamLead, p.planStart , p.planEnd , p.expectedTotalFee, ifnull(p.subContractFee, 0) as subContractFee, "
+                    + " select p.code, p.name, p.description, c.name as client, IFNULL(s2.name, \"N/A\") as subsidiary, concat(t.code, \' - \', t.name) as teamLead, p.planStart , p.planEnd , p.expectedTotalFee, ifnull(p.subContractFee, 0) as subContractFee, "
                     + " IFNULL(cte_i.sumIssuedAmount, 0) as sumIssuedAmount, IFNULL(cte_i.sumPaidAmount, 0) as sumPaidAmount"
                     + " ,0 as totalCumulativeExpenditure, IFNULL(cte_e.amount,0) as projectExpense "
                     + " from project p"
diff --git a/src/main/resources/templates/report/[Dashboard] Financial Summary for project.xlsx b/src/main/resources/templates/report/[Dashboard] Financial Summary for project.xlsx
index bb7e7f97629c7dfa66db29d9b23d459f2a5a3c52..4c31e489751fdffe7b650069971a096a916f1985 100644
GIT binary patch
delta 5123
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

delta 4993
zcmZ8lXIK-;whg_Bgx&>0lO~YR6{*q%>0qRH2-15bw1Biw5;z9~(m{F`rS}ffds8VY
zQl*D-J?Gr_?t6EB?3r)&nqRZ_TC*qD^~$+=i<oRhe0al_005{*?-Mg2+&%JTfH$F&
zHzYj)aZfo3jhe_knzVKWha8vWOAI!{4B>bq%u@x=cM)si8-**Gx*zxQ>=SlBf6mD0
z@80ZpH+KDGRG%;xjuK6-oRIq}Tb7M~Jq(iMYns(E*e=+Rq&#L^{J~N6_{!_!XWP~d
zcm<x~3UM%(!&j^$mcAZ@*d_9CrhF*$KoDdj_;%zyHD<$Isia(MO4%7^5;b!fwjS>z
zcJA5>X8BcK<}5-2RMG~8heE51R`QJ(WIgGrcPhofmXd%PdtS7t{JToy48*mOk5W2s
zRBJElJ^cY|HwU-a?9J0^zoXJPhloZvuP9)VO(VM}DJAw0O9w;f`FP$-btk_ZF`}d@
z?>WyZ?;|Ncq`s4HrPj?^VJY;OXFtn%EF4>CWl?FSxljDvwZP?Zik5NdbVF)Acrc?N
zD5qI$lQsB7*gMs^D0U&6Id2QMa;zzd>?cB<oYN@-1ASUeZcFXtMbu^0P-#Dk{4QvA
z>o^-lM(#wyL--jH#+#v+zMC+hyrateE#>y05J}1*S4}1EK9?#@RfSR4b+}QeR|nHK
zk$t|4iN<BCkT`a&?YQwFiO=Q^DL2j`LD2~+7Qa@)TcR;vChW4vI21xDvU;@h2PFA&
zA>y!rsP((y89Y-1SWZmfL;$H;!gT^#m!a8K@S9>|t~Y`o+GyXr);X|m7Fuvfx%)sR
zQ6b}cHGsa_6&jH6a?x&K#%O7^PHr2kC|w@wq+})<LsVXb4aL3PtOaZa4m>Wu)?6^e
z%dGh-s1E$_h2firOfNw(-2;^j>C6$+f=dRnjZ6Kq5cA@4KEFPV5)rHVjCI76j<S=<
zs1YxFQwri>hPBrZh0EJh0vk9&a!YcnP%$Z+0#r?D(iK0|fvg0z^J<2SLGQy;Q|#uG
z3G8f>gt=?&guIq{bd}X-v?bxU0rjnxziw`{^UN4j2auc#ENu!tP2`#s_^kN&ZB>I2
z1<DfmasF|J-F^4KU7j#j-Aoi4W552F0`*$KE327@*s-3U*+r`Up3i5LcDLJVzrQ@G
z{=mZEZye&oa2-^B)E08t&ZeMp%qu@7+xl=y{L;7igZ$JPpZTNJ;%zxSkM6+Wwp-uF
z**6UuZF^QWH*U(KZR<m)V97J^$4m4CF?}6|TooTt3Z%%DBL)B-(EtEU001BmCK}-3
z?dId`;Na^c`u8OMAkZC_iE;B-6r+o7*IPuqzRKbmON=Kqo=dMVFwUKPnVsm>;Y#C#
z5~!cL!J)EPS?Pxa@%VX8eO7&r?&*o%HFs?lGxtvECtZ3_Yo^=#W*f^SFF!`YZJ&mS
z+i**b%k2G@miEo|^kT|abi?PPgO0i4z%Y}0njjy_a8hJg!zDgq^MHpM%uRkXlxWD1
zn$oa<DMW2IrJ$+b=EsSpykY`r$~eqL?19tE$U){>bl*f9Tkf+ySHrD?LD>PlVR7Yv
zp19%{tt|Iz!Ezs0Hk4D1$^AGy72hHJk`E5occfiLuF*Qo#ReFVzEpCS)-RU}JExz(
z#Z=v$ePm}i_X5S7XthcZ2Rf=debZ0uHnRF1^1J`wAgaplc$iAPErkAKB&pRGB{8Z>
z5-T<7Ku_BBbw1B)PSQgU2`o#t@CNL8G9?szVkBIU=6Q0T!IPjRE^}ep#S~E?%cLyb
znJOGR!TWYuJs4?zkX838$k$z<_IWKvzgLk)Z59h$NKM78xV0B~enM)F-?Jh+EN@)v
zQf9QL=W&{~F%L7eC46d-_rWf<$yVTJ6ER(GTzfT<a6I)R_&T-%3@KPw1NE{FCq6)1
z?#%RjEu_!E5AEg5zjD!<oI|(|J~uGD@$&P5c#M}wY7aaxHU(XG&bhMY*CY~1A1O~i
z3I^glbjl)KRYI6tW#|Qt$wDg<c76f+!q{|{P3b<>#muwgs@cYnrt&P~giS(e13y%^
zdh1C8U4cNis5OBSvgEBhcq4YCK-LIZjLy+7Xk@TZkJ|0{-4;)oE<_V`>twea`kw7*
zhsr~?rci{c5jUsQ>qD<odZC#YxbJYuZWe-?61C?1V2bTV<!&8nAS)4KX3Y@qofOk+
zO2_HNQrby$QLDv*_NV8&qF0t4IDBY(S8ub(4+_^8@eh}RZ(@IaI%AXWn_;wQzG3GG
zJ2sw~XATJMOW93SW<$K`yt$Pg|C3ey=3QhPB<FHnJf@rDcOBf`{v8t14qxUe0{g6x
zFz=@!hxSUQE)+b)Vb4mw3jtLs22WZ@Pb_a8k;tqCcb^-ZgRlLKzeex6&9}_>VU67B
zW45QPw%Np!WJj}q1Q3`~t!B!4xc9&xpAf}&w-SbGfou_wt&S|>Y3-jExgoJC0c+es
z$Pca6Mas%Z3^_Bsl+i%RGv^2juV|geV+9c!vbM=ycfj0Aa;nax{XNgA1znYqMzqh2
z$CX;AN(BYfVV#)IrL;Yq<t53_xMm3JdF-EHDJWJTPPY^F#b-Z#L#uLV$5lUWQ#`g%
z-rKXZ<e)+r97l5{>rz91v|`b#ei}L45fYywtU)!vGbYWaQ3-aAH1^rjd`goWd`ew(
zd^H_uk288`XrX9M7i~0Yb$?x<gS~SALl5hV@tzLS`Dmjd&j;T^w7V+h2#Z|c%^Hgh
zL|isBw1=91)~g3L8iYhMze<e%DMc$Cb1Hts_j405&9?Nl(2@3i8P&|m(F0$r&4oh3
z<sO*W?x+^^Az3!2YlZyees)};^jYK~D;D;+O!&5H$Y^F>qCagg_>yOpZsrS#y*l}f
zHZ#=og6o$o{<z|y{Q6q(&PU|x5C6I{j`u=-9gQ-N@=t1)l&|jhj#i!O`(IwF_ys!#
z1)m`i@+_Z`eo=-3-LZW!K9UejV(v!MWW^WMZSFq=_=g3lE4p2ZK%|vJ9hD-KuCr*D
z-CC4KEigPycPUZ3ctqD29vq`VL<!t?<je4ByU?7Sr%M-+>Kjd#ie8XPJAy`lXM*TN
z^A7yMENkC|&Hwn6MbO*KV9-j8*!He6KGffOQX2ET!9GQJ-+<i(DUxhcVD#`H)EKKq
zs3ra_bFho&TQ|?S$taJEI;e6EP^|w*9#9%Y_vw~I2(E6%rO?&&9<mo@q>%f^ZcF&%
z7`Qvv=aT+W<0K-Zt-SuihWerib(J*t7Vl@?rQMyL1@sH0H=0aKuU-kCI5XP!J<Xo6
zCQtqvMW7@^{ZTJMctJ=syxF8dt@1;Cw)b90#nqxrET7%?>Xt4N8M8r8`&=7le5_HU
zhE88?b&rW<<Pm5x&#jD@EKYzr^)~DDR*H7K+v#V!#+wKQi_V9WWmR}GIDB*%IbB^U
zZ4WWRtfF{hj1T|_`0Y59|2U41ZxGDE=P#QXF<XjTQe$cpJ!U5s!4w#kp*I`YmY~^$
z;Sy1M48hc9eMbZL1YI&G0_}<k$&snp7EO*E=~r07OQvflwc2`;{lyTC9SZ2LkSzuH
zt^Sm(Wg(dy|D$5z9hR|Nch1x&Foaf}`P}(;2?;3i5YbqXj1BX57PnN^{?@AY9~-t=
z$!J+Fe7tz!eHI@s2KV8id|6Ge&;bUXNQ7;lp|JI!lS$h;p`K6B{inin@3AIvE{@K3
zcO@2)nsFDR!${^D-*BR=@u;|lFAg~pt_s->312nwODi*pQR71{-i#H20ti+8ssT-x
z9`i9<FH*P&L%#&bbcV9Lqf5V+OlB<+{T2E?r1O-%ox3=?cThHM4-%XO%ZM%+(C<ml
z00g|$(762tUzB8d8(wc14I>xJlD}YJhX;6Cb1a@NOgVX9Txx0tR*<c=n1c^TrWN}8
zU6;<B^eD^bYREHMbw_Ho5cO1fyt#9OYq>s|VPMqqy_zU59!^!o`aF9X-r#;9zi(H`
zGQ(F4pW9P^UZp3-HKK*<cDzvS4?OC-?PZzHsGz&z6~?D;s6=p>A|7?oLFh5JwwM2c
z3G%hEv>PZ<l&fW?9#>;JyBf88?`ImdY+x$iARng%Gri(BKh6Lm#AkC-3ZqBam5e}I
zW(@N#v|&Ge1%jGG?abXZ)3UCD*ucphD&CU6ncm^yVF(i}uKRdJ55rrd<s&Qzt%4K=
z_JK18<{#+MQCaJ%rf#UFw`G5&^q?w#-rGPI2@<rpU-$HJ1XpkVRxx7-Vu{OXC)bk1
z+djRJClbi}VqBvLVM3^#2eGBMvMrmk5UR@(?TUX=dsoS&u+}nsb;dR4pnUe)ASv!R
z4x$9gm5Z%-VW6&UXBtUK-euvbQg$8;*hz1KQVXL9=!ORV81_{TeD?+;tl`I55Q^)v
z@VOq7bDq~;khB&R6m!aKBcReu8U{-FCxpGxO0=*MFm7T*0BR>*aNz#PJQx7TO#TFM
z+}3rx6RLrTNvjv5W^g?e!NZ4NFy+(boD{2RNBR_R`+c4CJ1f<WcUfkqZiWePig60h
z%vNcrP38JRzlAdM?l`;@YH}!lUfZpxS0cGZ;T|*<mdple?kjE&#cg+Ii*+)}6FyCs
zpq5zj#q3ZaIK?bD!UbEu?D8UKZ`{Uxp(6apBl(W)4pJ?jJ7AP89c)Q4`8mw<ud3+V
zOjSH&CFq{RZ_aVsR0#Mb&aT&#{Qku$d-G=CY6lyo{2J_By=}o2#SUSLB=wm0kX5oe
zG@dPUAq4zcSsF_imk7c@KD_;Y4x5xzKA%4*8U2J{U|VThc~A1b9d|1KQDN^?-j6C8
zkiZfVPkrTRe`Bh+=knt#sE$a3j9;}hd4F3DHhjpoID+X3%y>ODnr)FEd=swo9gO4=
z@NdoA*16B{dnc5OKUiHB7`zzIw)*%pqlhdL#!iKbn2_-uO_xtz(1Jq_NVumw?vUi`
zGrgRzl!se2^M2@O4{w?dTbOmJ|3&zcCeQ|!d!_kghou2&V#Uk%&SFm96YIYg0D~OE
z`e71Y6oUBE(c=Nj`gP(=xLm8LmG-X|5$>|6wzT9SoI9Rq8QG|oRocB$!%ofWmQK>L
z<0#`5rjr|@zjP1bT~WLpiw6LN{O)h*{w;aVHr@{QhQ8h|FP;8Yz68UGmn`Byc-1t*
z?4s~Ed_Jc@b7JMm_rm+{o<@;h0M1&7Ot&Q)<_K@v__*|Yp42CuCImP-&Gl~fHB|Qj
zD~b*7=wbi`eXQE?2FsuNuPN|SB$-!&y9{9Bh`8Y&*Uccc=&N*Ff%K8G6ikhI-qc}F
zRWkT!n50;iqg%PpSke6pO^St3jMl4ET`0}?x$29!&x(p59KX%Aw?6%Z36ZIa<fF77
zFG@d+V?**AIY2Mm`jU_vrO6K`X=`4J&~#_{&xiZI==yL%C1y7&;P08;oM9VytV7uq
zg}C!F$5fA>J;UXoy~al3*=_z0p)FtU`?6={P$q8W{jDWG^-Z#y)Dip(COc&}4=ikJ
zXgBqtS_N9W!m(NHylD^uPB)YhMCiT3-JT$<BR`&d3E64CVZlPPdAEJ%mB-jlHQ608
z?w1`&Q}@_yas1ChrkKwlr?Y~~r)dUGf>|!s8!bnl)YePuxYo8`NiubY4o<Hpi)kz5
zOZv}EKx+ezj5RY9^iCN6wka(x2ssf+1mbQbIzmVs5%KUkEE(m_nUqSFhwxx{ANL^>
z67$e!_|k^5*^YBJE6gFCK&2R7X2HK6?83lmO;_kvczBoSQA$qbR-J)nzJKd9s*q3}
z|B@+2WV;}^J{7Exqm9K<ne<6Sqo#n*-cNI@xdo<dyS+377!}$oDc0c^5z%$%ToRtM
z?(=8TqTmN!J^2CW`&o$ADaLif_#c0>icAL$r+N09Rn~QO!XP{ZRIi(pDSH3u6&2-~
zNWBmLq<`$2m2Wh(ZjY9!&)-WjXoY>;UDIBw@Sg}I+aK=kW}NI*GU;Swg3b!6c&R=E
z#LeXyVehok4SPo8@BB$qUP^EOjg&#;Xr~P0HsnU2S2Sz=f=udw$3b9@c~P!dpfBA+
z3CwyCee}6WDpj@}A;DVCd~46zLB>TZ+$rA4)=eokEl-`59C4=63NfYtvZ)Z!VCrO0
zwpUYr)&<wU6tQ>S)cUILuK7-~*Ane_wY{o#uv*?fn+TnD4ZLM)ueg`JR2*IC>e!37
zS+b5{wXT%97>m$6w9aR?>@A00$X00s8~d;DF!+s>s|yb_d)w`j+;$)Gz3#w`kKJUp
zp!W9Sd536el2pKCgCAZyNxYqmf=e`7WqMpSQ3iRR|MBN?ls!vokW!z-+wlpw;v<5i
zS=^D{#u{3Qg}!e2fic1V`IC|Z>*6_~W5FV<|J^YEF6V!bGV}!a2|g<=I)|1XEdl|u
z{r5}fe}DkM8Z+7)!ol|6y6_*s{5>=VqKJ>?M4NH(qHz#G{4_4~bC3Y~nFNsSZ)*O=
vlK;MZ;D65iUiAs0;SwOW|78X~06_i!0C_^_CJA{w0ra^9H!;5WU%7t)Aw@v>