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_LibCal_dlgMultipleEvent/Method_CreateEvent#778.def | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 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 83d259b..ddcfc95 100644 --- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def" +++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def" @@ -48,17 +48,22 @@ // 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() ); + 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. 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