From 8d9b30e830e5338613feed1c46bf66a9f5967d1a Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 11 九月 2024 16:01:01 +0800
Subject: [PATCH] 添加Origin的下拉框选项，修复时间颗粒度不同可以对比的问题
---
_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def | 2 +-
_Main/BL/Type_ArchivePP/Method_Filter.qbl | 2 +-
_Main/BL/Type_Test/StaticMethod_Test.qbl | 12 ++++++------
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditForecast/Component_PanelOrigin.def | 2 +-
_Main/BL/Type_ArchiveBudget/Method_Filter.qbl | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/Type_ArchiveBudget/Method_Filter.qbl b/_Main/BL/Type_ArchiveBudget/Method_Filter.qbl
index f82533d..1041fcb 100644
--- a/_Main/BL/Type_ArchiveBudget/Method_Filter.qbl
+++ b/_Main/BL/Type_ArchiveBudget/Method_Filter.qbl
@@ -8,6 +8,6 @@
TextBody:
[*
// Akari Sep-4-2024 (created)
- return this <> baseVersion and this.Name().LikeUserLocale( dateUnit );
+ return this <> baseVersion and this.Name().ReplaceAll( "VWED","").ReplaceAll( "vwed","").LikeUserLocale( dateUnit );
*]
}
diff --git a/_Main/BL/Type_ArchivePP/Method_Filter.qbl b/_Main/BL/Type_ArchivePP/Method_Filter.qbl
index f1f9552..ee1205e 100644
--- a/_Main/BL/Type_ArchivePP/Method_Filter.qbl
+++ b/_Main/BL/Type_ArchivePP/Method_Filter.qbl
@@ -8,6 +8,6 @@
TextBody:
[*
// Akari Sep-4-2024 (created)
- return this <> baseVersion and this.Name().LikeUserLocale( dateUnit );
+ return this <> baseVersion and this.Name().ReplaceAll( "VWED","").ReplaceAll( "vwed","").LikeUserLocale( dateUnit );
*]
}
diff --git a/_Main/BL/Type_Test/StaticMethod_Test.qbl b/_Main/BL/Type_Test/StaticMethod_Test.qbl
index a037ae7..238e016 100644
--- a/_Main/BL/Type_Test/StaticMethod_Test.qbl
+++ b/_Main/BL/Type_Test/StaticMethod_Test.qbl
@@ -21,11 +21,11 @@
archive.ArchivePP( relnew,Name := "2027 M" )
archive.ArchivePP( relnew,Name := "2027 W" )
- archive.ArchiveBudget( relnew,Name := "2025 M" )
- archive.ArchiveBudget( relnew,Name := "2025 W" )
- archive.ArchiveBudget( relnew,Name := "2026 M" )
- archive.ArchiveBudget( relnew,Name := "2026 W" )
- archive.ArchiveBudget( relnew,Name := "2027 M" )
- archive.ArchiveBudget( relnew,Name := "2027 W" )
+ archive.ArchiveBudget( relnew,Name := "VWED-2025 M" )
+ archive.ArchiveBudget( relnew,Name := "VWED-2025 W" )
+ archive.ArchiveBudget( relnew,Name := "VWED-2026 M" )
+ archive.ArchiveBudget( relnew,Name := "VWED-2026 W" )
+ archive.ArchiveBudget( relnew,Name := "2VWED-027 M" )
+ archive.ArchiveBudget( relnew,Name := "VWED-2027 W" )
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditForecast/Component_PanelOrigin.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditForecast/Component_PanelOrigin.def
index 03dc8d2..796aea5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditForecast/Component_PanelOrigin.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditForecast/Component_PanelOrigin.def
@@ -14,7 +14,7 @@
AllowEmpty: true
DataBinding: 'DataHolderDialogData.Data.Origin'
Label: 'Origin'
- Strings: ';TRX;PPA;IDS'
+ Strings: ';CC-TRC;DL-TRC;PPA;IDS'
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def
index 31a0f50..0090826 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def
@@ -11,7 +11,7 @@
Body:
[*
if( not isnull( this.Data())){
- name := this.Data().Name().ReplaceAll( "VWED","vwed" );
+ name := this.Data().Name().ReplaceAll( "VWED","" ).ReplaceAll( "vwed","");
if( name.LikeUserLocale( "W" )){
dhDateUnitBudget.Data( "W" );
}else{
--
Gitblit v1.9.3