From 42e52dd7a48775cd83be92cc46ea42aa124cb15c Mon Sep 17 00:00:00 2001 From: lazhen <17772815105@139.com> Date: 星期五, 14 六月 2024 13:06:19 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg --- _Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def index cdc74a7..77ef126 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Method_InitializeSubscribers.def @@ -5,9 +5,10 @@ #keys: '[415136.0.666291565]' Body: [* + owner_i := LibCal_GlobalState.dhGlobalCalendarRegistry().Data().CommonCalendar(); + category_i := selectobject( owner_i,CalendarRegistry.EventCategory, category, category.Name() = 'Unavaliable' ); - dhCategory.Data(category_i); sEvent := owner_i.Event( relshadow, EventID := [String]Key::NextPersistentKey(), @@ -25,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 ) @@ -35,5 +39,6 @@ dhPotentialSubscribers.Data( &potentialSubscribers ); lstSubscribers.CheckAll(); + ListCalendarEventTypes.CheckAll(); *] } -- Gitblit v1.9.3