From 880f3c0257eeb8c37761d484258fdd102a369a19 Mon Sep 17 00:00:00 2001
From: 陈清红 <420599804@qq.com>
Date: 星期一, 14 四月 2025 16:46:36 +0800
Subject: [PATCH] BUG&优化项
---
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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..a3aacd2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
@@ -13,21 +13,22 @@
// Event and LeadingParticipation
subject := edtName.Text();
description := edtDescription.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;
@@ -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