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_LibCal_dlgMultipleEvent/Method_CreateEvent#778.def | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
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 4a70117..a3ed57b 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
@@ -44,21 +44,26 @@
ParticipationID := [String]Key::NextPersistentKey(),
StartDate := start_i.Date( timezone ),
EndDate := end_i .Date( timezone ) );
- info( '----------------------', isnull( sLeadPart ) );
+ //info( '----------------------', isnull( sLeadPart ) );
// Set the Participation and the related controls
// (only the DataHolders, the Date-controls are set later on, after the recurrence has been initialized)
dhStartDate.Data( sLeadPart.StartDate() );
//dhEndDate.Data( sLeadPart.EndDate() );
dhLeadingParticipation.Data( &sLeadPart );
- info( '-----------------------', isnull( dhLeadingParticipation.Data() ) );
+ dhCategory.Data(category_i);
+ //info( '-----------------------', isnull( dhLeadingParticipation.Data() ) );
// Initialize the capacity here, when done in the OnCreate() edtCapacity is not disabled correctly.
this.InitializeCapacity();
+ this.InitializeEventTypes();
+
+ ddlEventType.Data( owner_i.CalendarRegistry().GetDefaultEventType() );
+
// Initialize the category here, when done in the OnCreate() there is no selection in the DropDownList.
// Select the general category for new events.
- this.InitializeCategories();
- ddlCategory.Data( owner_i.CalendarRegistry().GetGeneralEventCategory() );
+ //this.InitializeCategories();
+ //ddlCategory.Data( owner_i.CalendarRegistry().GetGeneralEventCategory() );
// Must be done here, when done in the OnCreate() the checkmarks are not always set when the dialog is opened for editing an event.
// Pre-select all resources as subscriber when creating a common event.
--
Gitblit v1.9.3