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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 74fe8b7..a3ed57b 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateEvent\043778.def"
@@ -30,7 +30,7 @@
{
sEvent.Type( LibCal_Event::TYPE_PARTIAL() );
}
- info( '------------------------------', category_i.Name(), sEvent.Type(), sEvent.EventCategory().Name() );
+
// Set the Event and the related controls...
// The values are explicitly assigned here 'at the beginning' to the controls,
// so that the values can be used by the rest of the logic. Databinding is executed too late for that.
@@ -50,11 +50,16 @@
dhStartDate.Data( sLeadPart.StartDate() );
//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();
--
Gitblit v1.9.3