From 3bac4995fc679a3237585ed2ca40fd71b336774e Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 27 五月 2024 17:51:51 +0800
Subject: [PATCH] 日历不可用事件界面布局
---
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlCategory.def | 8 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_lstSubscribers_537_mnDelete_OnClick.def | 26 +++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlTimezone.def | 8 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Method_CreateUpdateEventAndParticipation.def | 7
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEvent.def | 16 ++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlRecurrence.def | 8 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Method_CreateUpdateEventAndParticipation.def | 80 ++++++++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEvent.def | 8 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlStartAndEnd.def | 8 +
_Main/BL/Type_LibCal_Event/StaticMethod_CreateUpdateFromUI.qbl | 54 ++++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/_ROOT_Component_LibCal_dlgEvent.def | 10 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_cmSubscribers#1.def | 14 +
_Main/BL/Type_LibCal_Event/Attribute_EventType.qbl | 8 +
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/_ROOT_Component_FormCalendarUnavailableEvent.def | 16 ++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventData.def | 8 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlTextualInfo.def | 8 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def | 35 ++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlControls.def | 21 ++
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarEventTypes.def | 10 +
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelHeader.def | 11 +
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarLineList.def | 10 +
_Main/BL/Type_LibCal_Event/_ROOT_Type_LibCal_Event.qbl | 6
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarSearchList.def | 16 ++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlContent.def | 8 +
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEventSearchList.def | 15 +
_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelList.def | 10 +
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlApplyToNewResources.def | 8 +
27 files changed, 433 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_LibCal_Event/Attribute_EventType.qbl b/_Main/BL/Type_LibCal_Event/Attribute_EventType.qbl
new file mode 100644
index 0000000..a55e723
--- /dev/null
+++ b/_Main/BL/Type_LibCal_Event/Attribute_EventType.qbl
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute EventType
+{
+ #keys: '3[415136.0.658372336][415136.0.658372335][415136.0.658372337]'
+ Description: '浜嬩欢绫诲瀷'
+ ValueType: String
+}
diff --git a/_Main/BL/Type_LibCal_Event/StaticMethod_CreateUpdateFromUI.qbl b/_Main/BL/Type_LibCal_Event/StaticMethod_CreateUpdateFromUI.qbl
new file mode 100644
index 0000000..14da6c2
--- /dev/null
+++ b/_Main/BL/Type_LibCal_Event/StaticMethod_CreateUpdateFromUI.qbl
@@ -0,0 +1,54 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod CreateUpdateFromUI (
+ LibCal_Calendar owner_i,
+ LibCal_LeadingParticipation participation_i,
+ String subject_i,
+ String description_i,
+ String type_i,
+ String eventtype_i,
+ Real capacity_i,
+ LibCal_EventCategory category_i,
+ Boolean isDefault_i,
+ Date startDate_i,
+ Duration startTimeOfDay_i,
+ Date endDate_i,
+ Duration endTimeOfDay_i,
+ Boolean isAllDay_i,
+ Boolean isRecurring_i,
+ Number recurrenceInterval_i,
+ String patternType_i,
+ Boolean patternDaily_IsEveryWeekday_i,
+ String patternWeekly_Weekdays_i,
+ Boolean patternMonthly_IsDay_i,
+ Number patternMonthly_Day_i,
+ String patternMonthly_WeekOfMonth_i,
+ String patternMonthly_DayOfWeek_i,
+ Boolean patternYearly_IsDate_i,
+ Number patternYearly_Month_i,
+ Number patternYearly_Day_i,
+ String patternYearly_WeekOfMonth_i,
+ String patternYearly_DayOfWeek_i,
+ String periodType_i,
+ Date periodStartDate_i,
+ Number nrOfOccurrences_i,
+ Date periodEndDate_i,
+ LibCal_Calendars subscribers_i
+) as LibCal_Event
+{
+ Description: 'Create and/or update an Event and its LeadingParticipation, based on information from the UI.'
+ TextBody:
+ [*
+ event := LibCal_Event::CreateUpdateFromUI( owner_i, participation_i, subject_i, description_i, type_i, capacity_i, category_i, isDefault_i,
+ startDate_i, startTimeOfDay_i, endDate_i, endTimeOfDay_i, isAllDay_i,
+ isRecurring_i, recurrenceInterval_i,
+ patternType_i, patternDaily_IsEveryWeekday_i, patternWeekly_Weekdays_i,
+ patternMonthly_IsDay_i, patternMonthly_Day_i, patternMonthly_WeekOfMonth_i, patternMonthly_DayOfWeek_i,
+ patternYearly_IsDate_i, patternYearly_Month_i, patternYearly_Day_i, patternYearly_WeekOfMonth_i, patternYearly_DayOfWeek_i,
+ periodType_i, periodStartDate_i, nrOfOccurrences_i, periodEndDate_i, subscribers_i );
+
+ event.EventType( eventtype_i );
+
+ return event;
+ *]
+}
diff --git a/_Main/BL/Type_LibCal_Event/_ROOT_Type_LibCal_Event.qbl b/_Main/BL/Type_LibCal_Event/_ROOT_Type_LibCal_Event.qbl
new file mode 100644
index 0000000..31bda92
--- /dev/null
+++ b/_Main/BL/Type_LibCal_Event/_ROOT_Type_LibCal_Event.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type LibCal_Event #extension
+{
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarEventTypes.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarEventTypes.def
new file mode 100644
index 0000000..506d63d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarEventTypes.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component PanelCalendarEventTypes
+{
+ #keys: '[415136.0.658772868]'
+ BaseType: 'WebPanel'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarLineList.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarLineList.def
new file mode 100644
index 0000000..c7e0337
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarLineList.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component PanelCalendarLineList
+{
+ #keys: '[415136.0.658772834]'
+ BaseType: 'WebPanel'
+ Properties:
+ [
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarSearchList.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarSearchList.def
new file mode 100644
index 0000000..bdaa56e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarSearchList.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component PanelCalendarSearchList
+{
+ #keys: '[415136.0.658772708]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelCalendarLineList
+ #child: PanelCalendarEventTypes
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEvent.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEvent.def
new file mode 100644
index 0000000..bf94026
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEvent.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component PanelCalendarUnavailableEvent
+{
+ #keys: '[415136.0.658772631]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelCalendarSearchList
+ #child: PanelCalendarUnavailableEventSearchList
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEventSearchList.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEventSearchList.def
new file mode 100644
index 0000000..d2d3188
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelCalendarUnavailableEventSearchList.def
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component PanelCalendarUnavailableEventSearchList
+{
+ #keys: '[415136.0.658772725]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ #child: PanelHeader
+ #child: PanelList
+ ]
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelHeader.def
new file mode 100644
index 0000000..862e4b3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelHeader.def
@@ -0,0 +1,11 @@
+Quintiq file version 2.0
+Component PanelHeader
+{
+ #keys: '[415136.0.658772785]'
+ BaseType: 'WebPanel'
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 0
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelList.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelList.def
new file mode 100644
index 0000000..45c2dd3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/Component_PanelList.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component PanelList
+{
+ #keys: '[415136.0.658772810]'
+ BaseType: 'WebPanel'
+ Properties:
+ [
+ Taborder: 1
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/_ROOT_Component_FormCalendarUnavailableEvent.def b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/_ROOT_Component_FormCalendarUnavailableEvent.def
new file mode 100644
index 0000000..e9723b0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCalendarUnavailableEvent/_ROOT_Component_FormCalendarUnavailableEvent.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent FormCalendarUnavailableEvent
+{
+ #keys: '[415136.0.657952289]'
+ BaseType: 'WebForm'
+ Children:
+ [
+ #child: PanelCalendarUnavailableEvent
+ ]
+ Properties:
+ [
+ Title: 'Calendar unavailable event'
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlApplyToNewResources.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlApplyToNewResources.def
new file mode 100644
index 0000000..1689396
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlApplyToNewResources.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlApplyToNewResources #extension
+{
+ Properties:
+ [
+ Taborder: 6
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlCategory.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlCategory.def
new file mode 100644
index 0000000..d48085c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlCategory.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlCategory #extension
+{
+ Properties:
+ [
+ Taborder: 5
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlContent.def
new file mode 100644
index 0000000..9068ab1
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlContent.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlContent #extension
+{
+ Children:
+ [
+ #child: pnlEvent
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlControls.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlControls.def
new file mode 100644
index 0000000..3f11eb0
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlControls.def
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+Component pnlControls #extension
+{
+ Children:
+ [
+ Component lblMarginBottom_1 #extension
+ {
+ Properties:
+ [
+ Taborder: 11
+ ]
+ }
+ #child: pnlEventType
+ #child: pnlTextualInfo
+ #child: pnlTimezone
+ #child: pnlCategory
+ #child: pnlApplyToNewResources
+ #child: pnlStartAndEnd
+ #child: pnlRecurrence
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEvent.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEvent.def
new file mode 100644
index 0000000..adf2b14
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEvent.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlEvent #extension
+{
+ Children:
+ [
+ #child: pnlEventData
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventData.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventData.def
new file mode 100644
index 0000000..0b96a1d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventData.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlEventData #extension
+{
+ Children:
+ [
+ #child: pnlControls
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def
new file mode 100644
index 0000000..76366d7
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def
@@ -0,0 +1,35 @@
+Quintiq file version 2.0
+Component pnlEventType
+{
+ #keys: '[415136.0.657951967]'
+ BaseType: 'WebPanel'
+ Children:
+ [
+ Component lblEventType
+ {
+ #keys: '[415136.0.657922045]'
+ BaseType: 'WebLabel'
+ Properties:
+ [
+ Label: 'Event type'
+ NumberOfColumns: 0
+ Taborder: 0
+ ]
+ }
+ Component edtEventType
+ {
+ #keys: '[415136.0.657922077]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ DataBinding: 'dhEvent.Data.EventType'
+ Taborder: 1
+ ]
+ }
+ ]
+ Properties:
+ [
+ Orientation: 'horizontal'
+ Taborder: 4
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlRecurrence.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlRecurrence.def
new file mode 100644
index 0000000..e8feedc
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlRecurrence.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlRecurrence #extension
+{
+ Properties:
+ [
+ Taborder: 9
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlStartAndEnd.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlStartAndEnd.def
new file mode 100644
index 0000000..1266a50
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlStartAndEnd.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlStartAndEnd #extension
+{
+ Properties:
+ [
+ Taborder: 8
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlTextualInfo.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlTextualInfo.def
new file mode 100644
index 0000000..5379336
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlTextualInfo.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlTextualInfo #extension
+{
+ Properties:
+ [
+ Taborder: 10
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlTimezone.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlTimezone.def
new file mode 100644
index 0000000..d29f1bb
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlTimezone.def
@@ -0,0 +1,8 @@
+Quintiq file version 2.0
+Component pnlTimezone #extension
+{
+ Properties:
+ [
+ Taborder: 7
+ ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Method_CreateUpdateEventAndParticipation.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Method_CreateUpdateEventAndParticipation.def
new file mode 100644
index 0000000..ea28715
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Method_CreateUpdateEventAndParticipation.def
@@ -0,0 +1,80 @@
+Quintiq file version 2.0
+#parent: #root
+Method CreateUpdateEventAndParticipation () as LibCal_Event id:Method_LibCal_dlgEvent_CreateUpdateEventAndParticipation #extension
+{
+ Body:
+ [*
+ sEvent := dhEvent.Data();
+ sLeadPart := dhLeadingParticipation.Data();
+
+ // Get the values from the controls.
+
+ // Event and LeadingParticipation
+ subject := edtName.Text();
+ description := edtDescription.Text();
+ category := ddlCategory.Data();
+ eventTypeList := edtEventType.Text();
+ isDefault := ckbApplyToNewResources.Checked();
+ startDate := dsStartDate.Date();
+ startTimeOfDay := durStartTimeOfDay.Duration();
+ endDate := dsEndDate.Date();
+ endTimeOfDay := durEndTimeOfDay.Duration();
+ isAllDay := ckbIsAllDay.Checked();
+
+ eventType := ddslType.Text();
+ capacity := this.StringToReal( edtCapacity.Text() ); // Always fill the capacity.
+
+ // RecurrencePattern
+ isRecurring := not btnOnce.IsPressed();
+ recurrenceInterval := this.GetRecurrenceInterval();
+ patternType := this.GetPatternType();
+
+ // Daily
+ daily_IsEveryWeekday := ckbEveryWeekday.Checked();
+
+ // Weekly
+ weekly_Weekdays := ifexpr( btnMonday .IsPressed(), "Mon;", "" )
+ + ifexpr( btnTuesday .IsPressed(), "Tue;", "" )
+ + ifexpr( btnWednesday.IsPressed(), "Wed;", "" )
+ + ifexpr( btnThursday .IsPressed(), "Thu;", "" )
+ + ifexpr( btnFriday .IsPressed(), "Fri;", "" )
+ + ifexpr( btnSaturday .IsPressed(), "Sat;", "" )
+ + ifexpr( btnSunday .IsPressed(), "Sun;", "" );
+
+ // Monthly
+ monthly_IsDay := ckbMonthlyDay.Checked();
+ monthly_Day := [Number]edtMonthlyDay.Text();
+ monthly_WeekOfMonth := ssMonthlyPatternWeekOfMonth.Text();
+ monthly_DayOfWeek := ssMonthlyPatternDayOfWeek.Text();
+
+ // Yearly
+ yearly_IsDate := ckbYearlyDay.Checked();
+ month := ifexpr( yearly_IsDate, ssYearlyMonth.Text(), ssYearlyPatternMonth.Text() );
+ yearly_Month := this.GetNrOfMonth( month );
+ yearly_Day := [Number]ssYearlyDayOfMonth.Text();
+ yearly_WeekOfMonth := ssYearlyPatternWeekOfMonth.Text();
+ yearly_DayOfWeek := ssYearlyPatternDayOfWeek.Text();
+
+ // RecurrencePeriod
+ periodType := this.GetPeriodType();
+ periodStartDate := dsStartOfPeriod.Date();
+ periodEndDate := dsEndOfPeriod.Date();
+ nrOfOccurrences := [Number]edtNrOfOccurrences.Text();
+
+ // 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, eventTypeList, capacity, category, isDefault,
+ startDate, startTimeOfDay, endDate, endTimeOfDay, isAllDay,
+ // RecurrencePattern
+ isRecurring, recurrenceInterval, patternType,
+ daily_IsEveryWeekday,
+ weekly_Weekdays,
+ monthly_IsDay, monthly_Day, monthly_WeekOfMonth, monthly_DayOfWeek,
+ yearly_IsDate, yearly_Month, yearly_Day, yearly_WeekOfMonth, yearly_DayOfWeek,
+ // RecurrencePeriod
+ periodType, periodStartDate, nrOfOccurrences, periodEndDate,
+ // Subscribers
+ dhSubscribers.Data() );
+ return event;
+ *]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/_ROOT_Component_LibCal_dlgEvent.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/_ROOT_Component_LibCal_dlgEvent.def
new file mode 100644
index 0000000..14b7eb6
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/_ROOT_Component_LibCal_dlgEvent.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+#root
+#parent: CalendarsWebUI
+OrphanComponent LibCal_dlgEvent #extension
+{
+ Children:
+ [
+ #child: pnlContent
+ ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_cmSubscribers\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_cmSubscribers\0431.def"
index 3e6937f..880cfed 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_cmSubscribers\0431.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_cmSubscribers\0431.def"
@@ -3,6 +3,20 @@
{
#keys: '[415136.0.647401567]'
BaseType: 'listContextMenu'
+ Children:
+ [
+ Component mnDelete
+ {
+ #keys: '[415136.0.655381025]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'DELETE'
+ Taborder: 3
+ Title: 'Delete'
+ ]
+ }
+ ]
Properties:
[
Taborder: 0
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;
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_lstSubscribers_537_mnDelete_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_lstSubscribers_537_mnDelete_OnClick.def
new file mode 100644
index 0000000..01d56c3
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Response_lstSubscribers_537_mnDelete_OnClick.def
@@ -0,0 +1,26 @@
+Quintiq file version 2.0
+#parent: lstSubscribers_537
+Response OnClick (
+ structured[LibCal_Subscription] selection
+) id:Response_lstSubscribers_537_mnDelete_OnClick
+{
+ #keys: '[415136.0.655381139]'
+ CanBindMultiple: false
+ DefinitionID => /lstSubscribers_537/Responsedef_lstSubscribers_537_WebMenu_OnClick
+ Initiator: 'mnDelete'
+ QuillAction
+ {
+ Body:
+ [*
+ traverse( selection, Elements, e ){
+ leadingP := e.LeadingParticipation();
+ if( leadingP.Subscription( relsize ) > 0 ){
+ leadingP.Event().Delete();
+ leadingP.Delete();
+ }
+ e.Delete();
+ }
+ *]
+ GroupServerCalls: false
+ }
+}
--
Gitblit v1.9.3