From 91413a3e42e7df36207ece0c7908a7dbb9b8727a Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 30 五月 2024 17:07:29 +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_CreateUpdateEventAndParticipation.def | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
index ba11fff..0a7dd6c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
@@ -13,6 +13,7 @@
// Event and LeadingParticipation
subject := edtName.Text();
description := edtDescription.Text();
+ eventTypeList := ddlEventType.Data();
category := sEvent.EventCategory();
isDefault := ckbApplyToNewResources.Checked();
startDate := dsStartDate.Date();
@@ -57,7 +58,7 @@
// All values are passed to the Server, only the relevant values are used there.
event := LibCal_Event::CreateUpdateFromUI( sEvent.Calendar(), sLeadPart.WrappedInstance(),
- subject, description, eventType, capacity, category, isDefault,
+ subject, description, eventType, eventTypeList, capacity, category, isDefault,
startDate, startTimeOfDay, endDate, endTimeOfDay, isAllDay,
// RecurrencePattern
isRecurring, recurrenceInterval, patternType,
@@ -69,9 +70,7 @@
periodType, periodStartDate, nrOfOccurrences, periodEndDate,
// Subscribers
dhSubscribers.Data() );
- info( '------------2----------', isnull( sEvent ), isnull( sLeadPart.WrappedInstance() ) );
- info( sEvent.Subject(), '---', sEvent.EventID(), '---', sEvent.Info() );
- //info( sLeadPart.WrappedInstance().Info() );
+
return event;
*]
}
--
Gitblit v1.9.3