Häufigkeit: Anpassungen nach Merge

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>

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];

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>

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>

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>