From ad81ba0fcc6ff3ca0576056bc494a110a6a691ea Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 23 十月 2024 17:50:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl b/_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl
index fa38c09..d816f95 100644
--- a/_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_EnginePipelineReport/Method_GenerateColumn.qbl
@@ -28,10 +28,11 @@
}
}
if( timeunit = 'All' or timeunit = Translations::MP_GlobalParameters_Week() ){
+ weekstartstr := ' KW';
for( start := startdate; start <= enddate; start := start.StartOfNextWeek() ){
- weekend := ( start.StartOfNextWeek() - Duration::Days( 1 ) ).Date();
+ weekend := ( start.StartOfNextWeek() - Duration::Days( 1 ) ).Date();//Name := weekend.Format( "M2/D2/Y" )
- this.Column( relnew, Name := weekend.Format( "M2/D2/Y" ), StartDate := start, EndDate := weekend, TimeUnit := Translations::MP_GlobalParameters_Week() );
+ this.Column( relnew, Name := weekstartstr.Concat( weekend.Week().Format( 'N(LPad0(2))' ) ), StartDate := start, EndDate := weekend, TimeUnit := Translations::MP_GlobalParameters_Week() );
}
}
}
--
Gitblit v1.9.3