From 6fa6f627b1706561e0d11b44be45dbc35bba5d41 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 29 五月 2024 19:44:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_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..0587aa7 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 := edtEventType.Text();
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