From 2c65fbdef9bf1b320f6f0965da5b597b40c5913b Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 29 十月 2024 17:30:39 +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 | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
index 0587aa7..a3aacd2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
@@ -13,22 +13,22 @@
// Event and LeadingParticipation
subject := edtName.Text();
description := edtDescription.Text();
- eventTypeList := edtEventType.Text();
+ eventTypeList := ddlEventType.Data();
category := sEvent.EventCategory();
isDefault := ckbApplyToNewResources.Checked();
startDate := dsStartDate.Date();
startTimeOfDay := durStartTimeOfDay.Duration();
- endDate := dsStartDate.Date();
+ endDate := dsEndDate.Date();
endTimeOfDay := durEndTimeOfDay.Duration();
- isAllDay := false;
+ isAllDay := ckbIsAllDay.Checked();
eventType := ddslType.Text();
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;
@@ -51,10 +51,10 @@
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(),
@@ -69,7 +69,7 @@
// RecurrencePeriod
periodType, periodStartDate, nrOfOccurrences, periodEndDate,
// Subscribers
- dhSubscribers.Data() );
+ dhSubscribers.Data(), true );
return event;
*]
--
Gitblit v1.9.3