From ad92b664d0a336e605611e3f8b2cb16a8d1c01ee Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期六, 26 十月 2024 00:42:30 +0800
Subject: [PATCH] 修复周度表的表头改成KW01 + 周末日期
---
_Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl | 7 +++
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor#127.def | 32 ++++++++--------
/dev/null | 10 -----
_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl | 20 ++++++++++
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def | 4 +-
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def | 4 +-
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison#1.def | 10 +++++
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def | 4 +-
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison#1.def | 10 +++++
_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_ButtonRibbon682_OnClick.def | 2
10 files changed, 70 insertions(+), 33 deletions(-)
diff --git a/_Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl b/_Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl
new file mode 100644
index 0000000..171b31b
--- /dev/null
+++ b/_Main/BL/Type_LocalColumn/Attribute_WeekDate.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute WeekDate
+{
+ #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
new file mode 100644
index 0000000..a1302ef
--- /dev/null
+++ b/_Main/BL/Type_LocalColumn/Function_CalcWeekDate.qbl
@@ -0,0 +1,20 @@
+Quintiq file version 2.0
+#parent: #root
+Function CalcWeekDate
+{
+ TextBody:
+ [*
+ // Akari Oct-26-2024 (created)
+ value := "";
+ if( this.TimeUnit() = "Week" ){
+ date := this.CustomDate().StartOfNextWeek() - 1 ;
+ 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{
+ value := this.CustomDate().Format( "Y/M2/D2" );
+ }
+
+ this.WeekDate( value );
+ *]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510\043127.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def"
similarity index 77%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510\043127.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def"
index 9580f0a..a903d64 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor510\043127.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_MatrixEditor\043127.def"
@@ -1,24 +1,24 @@
Quintiq file version 2.0
-Component MatrixEditor510 id:MatrixEditor510_127
+Component MatrixEditor id:MatrixEditor_127
{
#keys: '[412672.1.106503696]'
BaseType: 'WebMatrixEditor'
Children:
[
- Component MatrixEditorCell294
+ Component MatrixEditorCell
{
#keys: '[412672.1.106503697]'
BaseType: 'WebMatrixEditorCell'
Children:
[
- Component DataExtractorCells611
+ Component DataExtractorCells
{
#keys: '[412672.1.106503698]'
BaseType: 'WebDataExtractor'
Properties:
[
DataType: 'LocalTable'
- Source: 'dhComparisonData854'
+ Source: 'dhComparisonData'
Taborder: 0
Transformation: 'LocalRow.LocalCell.astype(LocalCell_Default)'
]
@@ -32,13 +32,13 @@
Taborder: 0
]
}
- Component MatrixEditorRows221
+ Component MatrixEditorRows
{
#keys: '[412672.1.106503699]'
BaseType: 'WebMatrixEditorHeaderLevel'
Children:
[
- Component DataExtractorRows116
+ Component DataExtractorRows
{
#keys: '[412672.1.106503700]'
BaseType: 'WebDataExtractor'
@@ -47,7 +47,7 @@
DataType: 'LocalTable'
FilterArguments: 'checkedProduct:QMacroPlanner::FormAnnualPlanReport.dhFinelProduct;checkedEntitys:QMacroPlanner::FormAnnualPlanReport.dhFinelEntitys'
FixedFilter: 'exists( checkedProduct,Elements,entity,entity.ID() = object.ProductID()) and exists( checkedEntitys,Elements,entity,entity.DisplayName() = object.ProductionLine())'
- Source: 'dhComparisonData854'
+ Source: 'dhComparisonData'
Taborder: 0
Transformation: 'LocalRow'
]
@@ -60,13 +60,13 @@
Taborder: 1
]
}
- Component MatrixEditorColumns391
+ Component MatrixEditorColumns
{
#keys: '[412672.1.106503701]'
BaseType: 'WebMatrixEditorHeaderLevel'
Children:
[
- Component DataExtractorColumns655
+ Component DataExtractorColumns
{
#keys: '[412672.1.106503702]'
BaseType: 'WebDataExtractor'
@@ -75,7 +75,7 @@
DataType: 'LocalTable'
FilterArguments: 'startDate:QMacroPlanner::FormAnnualPlanReport.dhStartDate;endDate:QMacroPlanner::FormAnnualPlanReport.dhEndDate;timeUnit:QMacroPlanner::FormAnnualPlanReport.dhTimeUnit'
FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() and object.TimeUnit() = timeUnit'
- Source: 'dhComparisonData854'
+ Source: 'dhComparisonData'
Taborder: 0
Transformation: 'LocalColumn'
]
@@ -83,20 +83,20 @@
]
Properties:
[
- Legend: 'Date'
+ Legend: 'WeekDate'
SortCriteria: 'Index'
Taborder: 2
]
}
- #child: matrixEditorActionBarPageDemandComparison234_1
- #child: matrixeditorContextMenuDemandComparison527_1
+ #child: matrixEditorActionBarPageDemandComparison_1
+ #child: matrixeditorContextMenuDemandComparison_1
]
Properties:
[
AllowMultipleAttributes: true
- Columns: 'MatrixEditorColumns391'
- ContextMenu: 'matrixeditorContextMenuDemandComparison527'
- Rows: 'MatrixEditorRows221'
+ Columns: 'MatrixEditorColumns'
+ ContextMenu: 'matrixeditorContextMenuDemandComparison'
+ Rows: 'MatrixEditorRows'
Taborder: 0
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
index c74a165..fc6f66c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan.def
@@ -40,7 +40,7 @@
Taborder: 2
]
}
- Component dhComparisonData854
+ Component dhComparisonData
{
#keys: '[412672.1.106503705]'
BaseType: 'WebDataHolder'
@@ -50,7 +50,7 @@
Taborder: 1
]
}
- #child: MatrixEditor510_127
+ #child: MatrixEditor_127
Component dhCheckedEntitys
{
#keys: '[412672.1.107978890]'
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison\0431.def"
new file mode 100644
index 0000000..47ffbbf
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixEditorActionBarPageDemandComparison id:matrixEditorActionBarPageDemandComparison_1
+{
+ #keys: '[412672.1.106503703]'
+ BaseType: 'matrixEditorActionBarPage'
+ Properties:
+ [
+ Taborder: 3
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison234\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison234\0431.def"
deleted file mode 100644
index 76c954d..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixEditorActionBarPageDemandComparison234\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component matrixEditorActionBarPageDemandComparison234 id:matrixEditorActionBarPageDemandComparison234_1
-{
- #keys: '[412672.1.106503703]'
- BaseType: 'matrixEditorActionBarPage'
- Properties:
- [
- Taborder: 3
- ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison\0431.def"
new file mode 100644
index 0000000..42d8a01
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison\0431.def"
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component matrixeditorContextMenuDemandComparison id:matrixeditorContextMenuDemandComparison_1
+{
+ #keys: '[412672.1.106503704]'
+ BaseType: 'matrixeditorContextMenu'
+ Properties:
+ [
+ Taborder: 4
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison527\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison527\0431.def"
deleted file mode 100644
index b2e5697..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_matrixeditorContextMenuDemandComparison527\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component matrixeditorContextMenuDemandComparison527 id:matrixeditorContextMenuDemandComparison527_1
-{
- #keys: '[412672.1.106503704]'
- BaseType: 'matrixeditorContextMenu'
- Properties:
- [
- Taborder: 4
- ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData854_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData854_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def
index 3ea00c6..57635ff 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData854_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_dhComparisonData_OnDataChanged.def
@@ -1,6 +1,6 @@
Quintiq file version 2.0
-#parent: PanelAnnualPlan/dhComparisonData854
-Response OnDataChanged () id:Response_PanelAnnualPlan_dhComparisonData854_OnDataChanged
+#parent: PanelAnnualPlan/dhComparisonData
+Response OnDataChanged () id:Response_PanelAnnualPlan_dhComparisonData_OnDataChanged
{
#keys: '[412672.1.106503673]'
CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_ButtonRibbon682_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_ButtonRibbon682_OnClick.def
index c865ae0..2d443f6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_ButtonRibbon682_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelRibbon322_ButtonRibbon682_OnClick.def
@@ -10,7 +10,7 @@
Body:
[*
table := MP_Cell_AnnualPlanReport::CreateFullTable( ApplicationMacroPlanner.GetMacroPlans(),RecycleBin,MacroPlan );
- dhComparisonData854.Data( table );
+ dhComparisonData.Data( table );
WebMessageBox::Success( "Success" );
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def
index b34c6eb..21ba77d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pExport_bExport_OnClick.def
@@ -9,8 +9,8 @@
{
Body:
[*
- rows := selectset( dhComparisonData854.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,entity,entity.ID() = row.ProductID()) and exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.ProductionLine()));
- columns := selectset( dhComparisonData854.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() and column.TimeUnit() = dhTimeUnit.Data());
+ rows := selectset( dhComparisonData.Data(),LocalRow,row,exists( dhFinelProduct.Data(),Elements,entity,entity.ID() = row.ProductID()) and exists( dhFinelEntitys.Data(),Elements,entity,entity.DisplayName() = row.ProductionLine()));
+ columns := selectset( dhComparisonData.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() and column.TimeUnit() = dhTimeUnit.Data());
LocalCell_Default::AsyncExport( RecycleBin,rows,columns );
//Application.Download( "浜у嚭瀵煎叆妯℃澘.xlsx",data.AsBinaryData() );
*]
--
Gitblit v1.9.3