From 4534d2c0921049d9d150ba0c31f76cb445bdd365 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 21 十一月 2024 17:41:25 +0800
Subject: [PATCH] 存档报表界面去掉日期区分列
---
_Main/BL/Type_OfflinePlanArchiveVersion/Method_GenerateColumn.qbl | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GenerateColumn.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GenerateColumn.qbl
index 593691d..5c3bc84 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GenerateColumn.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_GenerateColumn.qbl
@@ -9,40 +9,40 @@
TextBody:
[*
// 鐢勫叞楦� Jun-25-2024 (created)
- timeunit := guard( this.InterfaceDataset().OfflinePlanArchiveSearch().TimeUnit(), Translations::MP_GlobalParameters_Day() ) ;
- weekstart := periods.Element( 0 );
-
- monthstart := periods.Element( 0 );
+ //timeunit := guard( this.InterfaceDataset().OfflinePlanArchiveSearch().TimeUnit(), Translations::MP_GlobalParameters_Day() ) ;
+ //weekstart := periods.Element( 0 );
+ //
+ //monthstart := periods.Element( 0 );
traverse( periods, Elements, periodtime ){
- if( not isshow or timeunit = Translations::MP_GlobalParameters_Day() ){
+ // if( not isshow or timeunit = Translations::MP_GlobalParameters_Day() ){
periodname := periodtime.Format( "M2/D2/Y" );
- this.Column( relnew, ColumnName := periodname, StartDate := periodtime, EndDate := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
- }
- if( not isshow or timeunit = Translations::MP_GlobalParameters_Week() ){
- weekend := ( weekstart + Duration::Days( 6 ) ).Date();
- if( ( weekend.Year() <> periodtime.Year() and weekend.Month() > 1 ) or ( abs( weekstart.Week() - periodtime.Week() ) > 1 and weekend.Year() = periodtime.Year() ) ){
- weekstart := periodtime;
- }
- if( periodtime = weekstart ){
- weekperiodname := weekstart.Format( "M2/D2/Y" );
- this.Column( relnew, ColumnName := weekperiodname, StartDate := weekstart, EndDate := ( weekstart.StartOfNextWeek() - Duration::Days( 1 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
-
- }
- weekstart := periodtime.StartOfNextWeek();
- }
- if( not isshow or timeunit = Translations::MP_GlobalParameters_Month() ){
- if( ( monthstart.Year() <> periodtime.Year() and abs( monthstart.Month() - periodtime.Month() ) <> 11 ) or ( abs( monthstart.Month() - periodtime.Month() ) > 1 and monthstart.Year() = periodtime.Year() ) ){
- monthstart := periodtime;
- }
- if( periodtime = monthstart ){
- monthperiodname := monthstart.Format( "M2/D2/Y" );
- enddate := ( monthstart.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
- this.Column( relnew, ColumnName := monthperiodname, StartDate := monthstart, EndDate := enddate, TimeUnit := Translations::MP_GlobalParameters_Month() );
-
- }
- monthstart := periodtime.StartOfNextMonth();
- }
+ this.Column( relnew, ColumnName := periodname, StartDate := periodtime, EndDate := periodtime );//, TimeUnit := Translations::MP_GlobalParameters_Day()
+ // }
+ // if( not isshow or timeunit = Translations::MP_GlobalParameters_Week() ){
+ // weekend := ( weekstart + Duration::Days( 6 ) ).Date();
+ // if( ( weekend.Year() <> periodtime.Year() and weekend.Month() > 1 ) or ( abs( weekstart.Week() - periodtime.Week() ) > 1 and weekend.Year() = periodtime.Year() ) ){
+ // weekstart := periodtime;
+ // }
+ // if( periodtime = weekstart ){
+ // weekperiodname := weekstart.Format( "M2/D2/Y" );
+ // this.Column( relnew, ColumnName := weekperiodname, StartDate := weekstart, EndDate := ( weekstart.StartOfNextWeek() - Duration::Days( 1 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
+ //
+ // }
+ // weekstart := periodtime.StartOfNextWeek();
+ // }
+ // if( not isshow or timeunit = Translations::MP_GlobalParameters_Month() ){
+ // if( ( monthstart.Year() <> periodtime.Year() and abs( monthstart.Month() - periodtime.Month() ) <> 11 ) or ( abs( monthstart.Month() - periodtime.Month() ) > 1 and monthstart.Year() = periodtime.Year() ) ){
+ // monthstart := periodtime;
+ // }
+ // if( periodtime = monthstart ){
+ // monthperiodname := monthstart.Format( "M2/D2/Y" );
+ // enddate := ( monthstart.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
+ // this.Column( relnew, ColumnName := monthperiodname, StartDate := monthstart, EndDate := enddate, TimeUnit := Translations::MP_GlobalParameters_Month() );
+ //
+ // }
+ // monthstart := periodtime.StartOfNextMonth();
+ // }
}
*]
}
--
Gitblit v1.9.3