From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def
index a18726d..77ef126 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def
@@ -5,15 +5,17 @@
#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,
EventID := [String]Key::NextPersistentKey(),
// 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()
@@ -24,6 +26,9 @@
calendar := sLeadPart.Calendar();
potentialSubscribers := calendar.GetPotentialSubscribers();
+ period := MacroPlan.LibCal_SubscriberEventSearch( relnew, Start := Date::MinDate(), End := Date::MaxDate() );
+
+ dhDate.Data( period );
// Remove the calendar of the initiator (cannot subscribe to self).
initiator := sEvent.Calendar();
if( potentialSubscribers.Find( initiator ) >= 0 )
@@ -32,5 +37,8 @@
}
dhPotentialSubscribers.Data( &potentialSubscribers );
+
+ lstSubscribers.CheckAll();
+ ListCalendarEventTypes.CheckAll();
*]
}
--
Gitblit v1.9.3