From 0f073fb4ebe2b305d6fb2733553b633147536149 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 28 五月 2024 14:06:29 +0800
Subject: [PATCH] 日历不可用事件界面产线列表显示
---
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_lstSubscribers.def | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_pnlSubscribers#549.def | 11 -----------
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def | 4 ++--
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def | 10 ----------
4 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
index 3e7a868..9db7b49 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def
@@ -174,15 +174,5 @@
Taborder: 51
]
}
- Component dhCalendarUse
- {
- #keys: '[415136.0.667561067]'
- BaseType: 'WebDataHolder'
- Databinding: 'LibCal_Calendar'
- Properties:
- [
- Taborder: 56
- ]
- }
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_lstSubscribers.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_lstSubscribers.def
index dc36b26..9c401e7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_lstSubscribers.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_lstSubscribers.def
@@ -38,7 +38,7 @@
Properties:
[
SelectionCheckboxes: true
- Taborder: 4
+ Taborder: 3
]
ResponseDefinitions:
[
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_pnlSubscribers\043549.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_pnlSubscribers\043549.def"
index 84acbc1..03eddc3 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_pnlSubscribers\043549.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_pnlSubscribers\043549.def"
@@ -16,17 +16,6 @@
]
}
#child: lstSubscribers
- Component lblInfo
- {
- #keys: '[415136.0.666211732]'
- BaseType: 'WebLabel'
- Properties:
- [
- ShowLabel: false
- Taborder: 3
- Text: 'Calendars that are subscribing to this event.'
- ]
- }
Component lblIsInitialized
{
#keys: '[415136.0.666211733]'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def
index a18726d..8d43454 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def
@@ -5,7 +5,7 @@
#keys: '[415136.0.666291565]'
Body:
[*
- owner_i := dhCalendarUse.Data();
+ owner_i := LibCal_GlobalState.dhGlobalCalendarRegistry().Data().CommonCalendar();
category_i := selectobject( owner_i,CalendarRegistry.EventCategory, category, category.Name() = 'Unavaliable' );
info( '-------------------------------', isnull( owner_i ), isnull( category_i ) );
sEvent := owner_i.Event( relshadow,
@@ -13,7 +13,7 @@
// StartTimeOfDay := start_i.TimeOfDay( timezone ),
// EndTimeOfDay := end_i .TimeOfDay( timezone ),
EventCategory := category_i,
- IsDefault := owner_i.istype( LibCal_CommonCalendar ) );
+ IsDefault := false );
sLeadPart := owner_i.Participation( relshadow, LibCal_LeadingParticipation,
ParticipationID := [String]Key::NextPersistentKey()
--
Gitblit v1.9.3