From 332b8d3da45f20ffa4470e6b07109ec3babd862d Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 06 十一月 2024 12:28:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor#127.def | 2 +-
_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl | 8 +++++++-
_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor#988.def | 2 +-
_Main/BL/Type_LocalColumn/Attribute_DisplayDate.qbl | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl b/_Main/BL/Type_LocalColumn/Attribute_DisplayDate.qbl
similarity index 85%
rename from _Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl
rename to _Main/BL/Type_LocalColumn/Attribute_DisplayDate.qbl
index 171b31b..868f776 100644
--- a/_Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl
+++ b/_Main/BL/Type_LocalColumn/Attribute_DisplayDate.qbl
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-Attribute WeekDate
+Attribute DisplayDate
{
#keys: '3[414996.1.170054736][414996.1.170054735][414996.1.170054737]'
ValueType: String
diff --git a/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl b/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
index a1302ef..81bbd7f 100644
--- a/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
+++ b/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
@@ -11,10 +11,16 @@
stringDate := date.Format( "Y/M2/D2");
perSuffx := ifexpr( this.CustomDate().Week() < 10,"0"+[String]this.CustomDate().Week(),[String]this.CustomDate().Week() );
value := "KW" + perSuffx + " - " + stringDate;
+ }else if( this.TimeUnit() = "Month" ){
+ us_locale := Locale::Construct( 'en_us' );
+
+ date := this.CustomDate();
+ stringDate := date.Format( "Y: MM / M" + "鏈�" ,us_locale )
+ value := stringDate;
}else{
value := this.CustomDate().Format( "Y/M2/D2" );
}
- this.WeekDate( value );
+ this.DisplayDate( value );
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
index c93ea2a..87f6de9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
@@ -83,7 +83,7 @@
]
Properties:
[
- Legend: 'Date'
+ Legend: 'DisplayDate'
SortCriteria: 'Index'
Taborder: 2
]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def"
index a903d64..e9ed340 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def"
@@ -83,7 +83,7 @@
]
Properties:
[
- Legend: 'WeekDate'
+ Legend: 'DisplayDate'
SortCriteria: 'Index'
Taborder: 2
]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def"
index 44ce451..4dbbb3e 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def"
@@ -83,7 +83,7 @@
]
Properties:
[
- Legend: 'Date'
+ Legend: 'DisplayDate'
SortCriteria: 'Index'
Taborder: 2
]
--
Gitblit v1.9.3