From 174d2790d88fa5aaaa728eb0bc7e98d9ec79c1a8 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 29 八月 2024 15:54:44 +0800
Subject: [PATCH] 默认添加空eventtype
---
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelEvent.def | 1 -
_Main/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventTypes.qbl | 14 ++++++++++++++
_Main/BL/InfoMessages.qbl | 4 ++++
_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def | 1 -
Calendars/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventCategories.qbl | 1 -
_Main/BL/Type_LibCal_CalendarRegistry/Method_OnCreate.qbl | 14 ++++++++++++++
Calendars/BL/Type_LibCal_CommonCalendar/StaticMethod_Create.qbl | 1 -
_Main/BL/Type_LibCal_EventEvent/StaticMethod_DEFAULT_TYPE.qbl | 2 +-
8 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/Calendars/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventCategories.qbl b/Calendars/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventCategories.qbl
index b80a79c..a9e0223 100644
--- a/Calendars/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventCategories.qbl
+++ b/Calendars/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventCategories.qbl
@@ -10,5 +10,4 @@
// Create additional EventCategories.
LibCal_EventCategory::InitializeEventCategories( this );
*]
- InterfaceProperties { Accessibility: 'Module' }
}
diff --git a/Calendars/BL/Type_LibCal_CommonCalendar/StaticMethod_Create.qbl b/Calendars/BL/Type_LibCal_CommonCalendar/StaticMethod_Create.qbl
index 756354e..48f4ddb 100644
--- a/Calendars/BL/Type_LibCal_CommonCalendar/StaticMethod_Create.qbl
+++ b/Calendars/BL/Type_LibCal_CommonCalendar/StaticMethod_Create.qbl
@@ -5,5 +5,4 @@
) as LibCal_CommonCalendar
{
TextBody: 'return owner_i.CommonCalendar( relnew );'
- InterfaceProperties { Accessibility: 'Module' }
}
diff --git a/_Main/BL/InfoMessages.qbl b/_Main/BL/InfoMessages.qbl
index 8ea9b48..75a3a55 100644
--- a/_Main/BL/InfoMessages.qbl
+++ b/_Main/BL/InfoMessages.qbl
@@ -234,6 +234,10 @@
{
DefaultText: 'This date is not within the planned cycle!'
}
+ InfoMessage MP_LibCal_Event_ValidDateInterval
+ {
+ DefaultText: 'The start date is more than one day away from the end date!'
+ }
InfoMessage MP_LibCal_Event_ValidDatePeriod
{
DefaultText: 'The start date must be less than the end date!'
diff --git a/_Main/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventTypes.qbl b/_Main/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventTypes.qbl
new file mode 100644
index 0000000..09529ad
--- /dev/null
+++ b/_Main/BL/Type_LibCal_CalendarRegistry/Method_InitializeEventTypes.qbl
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+#parent: #root
+Method InitializeEventTypes
+{
+ TextBody:
+ [*
+ // Always create a general EventCategory.
+ //LibCal_EventCategory::Create( this, LibCal_EventType::DEFAULT_TYPE() );
+ this.EventType( relnew,ID := "blank", Name := LibCal_EventType::DEFAULT_TYPE() );
+
+ // Create additional EventCategories.
+ //LibCal_EventCategory::InitializeEventCategories( this );
+ *]
+}
diff --git a/_Main/BL/Type_LibCal_CalendarRegistry/Method_OnCreate.qbl b/_Main/BL/Type_LibCal_CalendarRegistry/Method_OnCreate.qbl
new file mode 100644
index 0000000..03114d0
--- /dev/null
+++ b/_Main/BL/Type_LibCal_CalendarRegistry/Method_OnCreate.qbl
@@ -0,0 +1,14 @@
+Quintiq file version 2.0
+#parent: #root
+Method OnCreate #extension
+{
+ TextBody:
+ [*
+ this.SetTimeZoneID();
+ this.InitializeEventCategories();
+ this.InitializeEventTypes();
+
+ // Create the CommonCalendar.
+ LibCal_CommonCalendar::Create( this );
+ *]
+}
diff --git a/_Main/BL/Type_LibCal_EventEvent/StaticMethod_DEFAULT_TYPE.qbl b/_Main/BL/Type_LibCal_EventEvent/StaticMethod_DEFAULT_TYPE.qbl
index 0135391..b832a4a 100644
--- a/_Main/BL/Type_LibCal_EventEvent/StaticMethod_DEFAULT_TYPE.qbl
+++ b/_Main/BL/Type_LibCal_EventEvent/StaticMethod_DEFAULT_TYPE.qbl
@@ -3,5 +3,5 @@
StaticMethod DEFAULT_TYPE () const declarative remote as String
{
Description: 'Can be extended to define the name of the general EventCategory, which will always be created.'
- TextBody: 'return "绔崍鑺�";'
+ TextBody: 'return " ";'
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def
index 6568406..f484174 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgEvent/Component_pnlEventType.def
@@ -48,7 +48,6 @@
]
Properties:
[
- AllowEmpty: true
Description: 'dhEvent.Data.EventType'
DisplayField: 'Name'
NumberOfColumns: 15
diff --git a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelEvent.def b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelEvent.def
index 985bf6b..7e80a64 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelEvent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_LibCal_dlgMultipleEvent/Component_PanelEvent.def
@@ -54,7 +54,6 @@
]
Properties:
[
- AllowEmpty: true
DisplayField: 'Name'
Label: '浜嬩欢绫诲瀷'
NumberOfColumns: 15
--
Gitblit v1.9.3