From f05a9841c606ebef1e41ae7b6720696c6315b53b Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 27 五月 2024 16:57:10 +0800
Subject: [PATCH] 批量维护产能占用事件列表显示
---
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def | 41 ++++++++++++++++++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent#778.def | 3 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listActionBarPage902.def | 10 +++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/_ROOT_Component_LibCal_dlgMultipleEvent.def | 11 +++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelContent.def | 2
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def | 10 +++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelList.def | 4 ++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def | 4 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_InitializeCapacity.def | 3 -
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader#144.def | 2 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_OnOK.def | 5 +-
11 files changed, 88 insertions(+), 7 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def
new file mode 100644
index 0000000..4ab4363
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_ListList.def
@@ -0,0 +1,41 @@
+Quintiq file version 2.0
+Component ListList
+{
+ #keys: '[415136.0.657740253]'
+ BaseType: 'WebList'
+ Children:
+ [
+ Component DataExtractor367
+ {
+ #keys: '[415136.0.657740254]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'LibCal_EventCategory'
+ Source: 'dhCategory'
+ Taborder: 0
+ Transformation: 'Event.Participation'
+ ]
+ }
+ #child: listActionBarPage902
+ Component DataSetLevel151
+ {
+ #keys: '[415136.0.657740259]'
+ BaseType: 'WebDataSetLevel'
+ Children:
+ [
+ #child: listContextMenu967
+ ]
+ Properties:
+ [
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Calendar.CalendarID","title":"CalendarID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Calendar.CalendarID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.Subject","title":"Subject","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.Subject"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"StartDate","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.StartTimeOfDay","title":"StartTimeOfDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.StartTimeOfDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.EndTimeOfDay","title":"EndTimeOfDay","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.EndTimeOfDay"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Event.Description","title":"Description","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Event.Description"}}]'
+ ContextMenu: 'listContextMenu967'
+ Taborder: 2
+ ]
+ }
+ ]
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelContent.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelContent.def
index 81afb9c..257129e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelContent.def
@@ -11,6 +11,6 @@
Properties:
[
Orientation: 'horizontal'
- Taborder: 4
+ Taborder: 5
]
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def" "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
index 9557079..8f68633 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelHeader\043144.def"
@@ -144,6 +144,7 @@
Sorting: 'none'
Strings: 'Available;Unavailable'
Taborder: 2
+ Visible: false
]
}
Component ckbApplyToNewResources id:ckbApplyToNewResources_667
@@ -178,6 +179,7 @@
]
Properties:
[
+ FixedSize: true
Orientation: 'horizontal'
Taborder: 0
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelList.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelList.def
index 2522bb5..f7703b3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelList.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelList.def
@@ -3,6 +3,10 @@
{
#keys: '[415136.0.654300441]'
BaseType: 'WebPanel'
+ Children:
+ [
+ #child: ListList
+ ]
Properties:
[
Taborder: 1
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listActionBarPage902.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listActionBarPage902.def
new file mode 100644
index 0000000..85d8360
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listActionBarPage902.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage902
+{
+ #keys: '[415136.0.657740256]'
+ BaseType: 'listActionBarPage'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def
new file mode 100644
index 0000000..f3a5116
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_listContextMenu967.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu967
+{
+ #keys: '[415136.0.657740261]'
+ BaseType: 'listContextMenu'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def" "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
index 74fe8b7..ac27f5c 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
@@ -30,7 +30,7 @@
{
sEvent.Type( LibCal_Event::TYPE_PARTIAL() );
}
- info( '------------------------------', category_i.Name(), sEvent.Type(), sEvent.EventCategory().Name() );
+
// Set the Event and the related controls...
// The values are explicitly assigned here 'at the beginning' to the controls,
// so that the values can be used by the rest of the logic. Databinding is executed too late for that.
@@ -50,6 +50,7 @@
dhStartDate.Data( sLeadPart.StartDate() );
//dhEndDate.Data( sLeadPart.EndDate() );
dhLeadingParticipation.Data( &sLeadPart );
+ dhCategory.Data(category_i);
//info( '-----------------------', isnull( dhLeadingParticipation.Data() ) );
// Initialize the capacity here, when done in the OnCreate() edtCapacity is not disabled correctly.
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
index b377bc6..ba11fff 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
@@ -69,7 +69,9 @@
periodType, periodStartDate, nrOfOccurrences, periodEndDate,
// Subscribers
dhSubscribers.Data() );
-
+ info( '------------2----------', isnull( sEvent ), isnull( sLeadPart.WrappedInstance() ) );
+ info( sEvent.Subject(), '---', sEvent.EventID(), '---', sEvent.Info() );
+ //info( sLeadPart.WrappedInstance().Info() );
return event;
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_InitializeCapacity.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_InitializeCapacity.def
index d64257f..4dc84ac 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_InitializeCapacity.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_InitializeCapacity.def
@@ -16,7 +16,7 @@
event := dhEvent.Data();
eventType := event.Type();
- info( '------------------------------', eventType );
+
// See if the eventType can be used as is or if it should be converted first.
if( useParticalCapacity )
{
@@ -45,6 +45,5 @@
ddslType.Text( eventType );
}
- info( '------------------------------', ddslType.Text() );
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_OnOK.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_OnOK.def
index c66fb1e..7e2c2c7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_OnOK.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_OnOK.def
@@ -27,7 +27,8 @@
//}
// Effectuate the changes and close the form.
- Form.CreateUpdateEventAndParticipation();
- Form.Close();
+ event := Form.CreateUpdateEventAndParticipation();
+ info( '-------------1----------------', isnull( event ) );
+ //Form.Close();
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/_ROOT_Component_LibCal_dlgMultipleEvent.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/_ROOT_Component_LibCal_dlgMultipleEvent.def
index a35b8a5..c3c4761 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/_ROOT_Component_LibCal_dlgMultipleEvent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/_ROOT_Component_LibCal_dlgMultipleEvent.def
@@ -50,6 +50,17 @@
Taborder: 3
]
}
+ Component dhCategory
+ {
+ #keys: '[415136.0.657911841]'
+ BaseType: 'WebDataHolder'
+ Databinding: 'LibCal_EventCategory'
+ Properties:
+ [
+ Description: 'Unavaliable绫诲埆'
+ Taborder: 4
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3