From 3cf4ce0c94be1a8928ffe280429d6297583b3b8d Mon Sep 17 00:00:00 2001
From: rislai <risheng.lai@capgemini.com>
Date: 星期三, 07 八月 2024 17:23:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl b/_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl
index 1eba4c1..525a923 100644
--- a/_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl
@@ -11,13 +11,22 @@
[*
// 鐢勫叞楦� Jun-25-2024 (created)
//鏌ヨ鏃ユ湡杩斿洖闇�瑕佸湪璁″垝鏃ユ湡涔嬪唴
- traverse( owner, Period_MP, period, not period.IsHistorical() and period.StartDate() >= startdate and period.EndDate() <= enddate
- and ( ( timeunit = 'All' and ( period.TimeUnit() = Translations::MP_GlobalParameters_Day() or period.TimeUnit() = Translations::MP_GlobalParameters_Week() ) )
- or period.TimeUnit() = timeunit ) ){
- periodtime := period.StartDate();
- periodname := periodtime.Format( "M2/D2/Y" );
+ weekstart := owner.StartOfPlanning().Date();
+ traverse( owner, Period_MP, period, not period.IsHistorical() and period.TimeUnit() = Translations::MP_GlobalParameters_Day() ){
+ if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Day() ){
+ periodtime := period.StartDate();
+ periodname := periodtime.Format( "M2/D2/Y" );
+
+ this.Column( relnew, Name := periodname, Period := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
+ }
- this.Column( relnew, Name := periodname, Period := periodtime, TimeUnit := period.TimeUnit() );
+ if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Week() ){
+ if( period.StartDate() = weekstart ){
+ weekperiodname := weekstart.Format( "M2/D2/Y" );
+ this.Column( relnew, Name := weekperiodname, Period := weekstart, TimeUnit := Translations::MP_GlobalParameters_Week() );
+ weekstart := ( weekstart + Duration::Days( 7 ) ).Date();
+ }
+ }
}
*]
}
--
Gitblit v1.9.3