From ade938e05074696b641e23178b17a7f129325d5a Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 01 十一月 2024 16:24:25 +0800
Subject: [PATCH] 修复一些bug，添加锁定期功能，添加实际生产数据展示报表
---
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
index 0a7dd6c..a3aacd2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def
@@ -18,17 +18,17 @@
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