From b7d0b62b441213c5a4243f4191535a95fad6775c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Mon, 29 Oct 2018 16:02:00 +0100
Subject: [PATCH] =?UTF-8?q?H=C3=A4ufigkeit:=20Anpassungen=20nach=20Merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Appointment_entity/Appointment_entity.aod | 38 ++++++++++++++++++-
entity/Appointment_entity/contentProcess.js | 2 +-
.../AppointmentEdit_view.aod | 6 +++
.../AppointmentPreview_view.aod | 2 +-
.../_____PREFERENCES_PROJECT.aod | 2 +-
5 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 2a647e86736..d18c57457b9 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -3,8 +3,6 @@
<name>Appointment_entity</name>
<title>Termin</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainerType>JDITO</recordContainerType>
- <caption>Termin</caption>
<alias>Data_alias</alias>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<fields>
@@ -25,11 +23,18 @@
<element>CLASSIFICATION</element>
<element>TRANSPARENCY</element>
<element>CATEGORIES</element>
+ <element>RRULE</element>
+ <element>RECURRENCEID</element>
+ <element>SAFESCOPEFIELD</element>
+ <element>MASTERBEGIN</element>
+ <element>MASTEREND</element>
</fields>
<contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/Appointment_entity/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/Appointment_entity/onDelete.js</onDelete>
+ <recordContainerType>JDITO</recordContainerType>
+ <caption>Termin</caption>
<entityFields>
<entityField>
<name>SUMMARY</name>
@@ -137,5 +142,34 @@
<entityIncomingField>
<name>#INCOMING</name>
</entityIncomingField>
+ <entityParameter>
+ <name>masterEntry</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>ORGANIZER</name>
+ <fieldName>ORGANIZER</fieldName>
+ </entityField>
+ <entityField>
+ <name>RRULE</name>
+ <fieldName>RRULE</fieldName>
+ </entityField>
+ <entityField>
+ <name>RECURRENCEID</name>
+ <fieldName>RECURRENCEID</fieldName>
+ </entityField>
+ <entityField>
+ <name>SAFESCOPEFIELD</name>
+ <fieldName>SAFESCOPEFIELD</fieldName>
+ </entityField>
+ <entityField>
+ <name>MASTERBEGIN</name>
+ <fieldName>MASTERBEGIN</fieldName>
+ </entityField>
+ <entityField>
+ <name>MASTEREND</name>
+ <fieldName>MASTEREND</fieldName>
+ </entityField>
</entityFields>
</entity>
diff --git a/entity/Appointment_entity/contentProcess.js b/entity/Appointment_entity/contentProcess.js
index 633c2abfe2c..4554846ac42 100644
--- a/entity/Appointment_entity/contentProcess.js
+++ b/entity/Appointment_entity/contentProcess.js
@@ -24,7 +24,7 @@ if(vars.exists("$param.entry"))
var enddate = entry[calendars.DTEND];
var links = entry[calendars.LINKS];
var description = entry[calendars.DESCRIPTION];
- var organizer = entry[calendars.ORGANIZER2];
+ var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
var status = entry[calendars.STATUS];
var location = entry[calendars.LOCATION];
var reminder = entry[calendars.REMINDER];
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index a80f04ceffa..c945aba0b43 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -21,7 +21,13 @@
<categoriesField>CATEGORIES</categoriesField>
<alldayField>ALLDAY</alldayField>
<transparencyField>TRANSPARENCY</transparencyField>
+ <organizerField>ORGANIZER</organizerField>
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
+ <rruleField>RRULE</rruleField>
+ <recurrenceIdField>RECURRENCEID</recurrenceIdField>
+ <saveScopeField>SAFESCOPEFIELD</saveScopeField>
+ <masterBeginField>MASTERBEGIN</masterBeginField>
+ <masterEndField>MASTEREND</masterEndField>
<entityField>#ENTITY</entityField>
</appointmentEditViewTemplate>
</children>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index 1a532790b8f..d8ed98ea586 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -20,8 +20,8 @@
<transparencyField>TRANSPARENCY</transparencyField>
<statusField>STATUS</statusField>
<locationField>LOCATION</locationField>
+ <organizerField>ORGANIZER</organizerField>
<categoriesField>CATEGORIES</categoriesField>
- <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
</appointmentPreviewViewTemplate>
</children>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 473ef689d83..1ea4864f5a7 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic5</projectName>
+ <projectName>xRM-Basic-5-1</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
--
GitLab