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_CreateUpdateEventAndParticipation.def | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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..1b3e681 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();
@@ -25,9 +26,9 @@
capacity := Real::MinReal(); // Always fill the capacity.
// RecurrencePattern
- isRecurring := false;
+ isRecurring := true;
recurrenceInterval := 1;
- patternType := LibCal_RecurrencePeriod::TYPE_WITHOUTEND();
+ patternType := LibCal_RecurrencePattern::TYPE_DAILY();
// Daily
daily_IsEveryWeekday := false;
@@ -50,14 +51,14 @@
yearly_DayOfWeek := '';
// RecurrencePeriod
- periodType := LibCal_RecurrencePeriod::TYPE_WITHOUTEND();
- periodStartDate := Date::MinDate();
- periodEndDate := Date::MinDate();
- nrOfOccurrences := 0;
+ periodType := LibCal_RecurrencePeriod::TYPE_NROFOCCURRENCES();
+ periodStartDate := dsStartDate.Date();
+ periodEndDate := startDate + 1;
+ nrOfOccurrences := 1;
// 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,
@@ -68,10 +69,8 @@
// RecurrencePeriod
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() );
+ dhSubscribers.Data(), true );
+
return event;
*]
}
--
Gitblit v1.9.3