#1039171 Verknüpfte Termine in Person und Organisation unter Aufgaben anzeigen

entity/Activity_entity/Activity_entity.aod

@@ -439,6 +439,20 @@
       <outputFormat>dd.MM.yyyy</outputFormat>
       <inputFormat>dd.MM.yyyy</inputFormat>
     </entityField>
+    <entityConsumer>
+      <name>LinkedAppointments</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Appointment_entity</entityName>
+        <fieldName>LinkedAppointments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>LinkedObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/appointments/children/linkedobjectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/AppointmentLink_entity/AppointmentLink_entity.aod

@@ -87,6 +87,13 @@
       <name>opencontext</name>
       <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
     </entityActionField>
+    <entityParameter>
+      <name>LinkedObjectId_param</name>
+      <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/linkedobjectid_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+      <description>PARAMETER
+</description>
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Appointment_entity/Appointment_entity.aod

@@ -4,6 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
   <title>Termin</title>
+  <siblings />
   <afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
   <recordContainer>jdito</recordContainer>
   <entityFields>
@@ -28,11 +29,15 @@
     </entityField>
     <entityField>
       <name>BEGIN</name>
+      <contentType>DATE</contentType>
+      <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
       <selectionMode>SINGLE</selectionMode>
       <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>END</name>
+      <contentType>DATE</contentType>
+      <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
       <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
     </entityField>
     <entityFieldGroup>
@@ -176,11 +181,40 @@
       <stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js</stateProcess>
       <tooltip>series delete action</tooltip>
     </entityActionField>
+    <entityParameter>
+      <name>LinkedObjectId_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityProvider>
+      <name>LinkedAppointments</name>
+      <recordContainer>jdito</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>Appointments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>12b2a8cd-1b66-4123-b0a6-f1ca164bdfec</name>
+          <entityName>Person_entity</entityName>
+          <fieldName>Appointments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>17129bd7-1b1b-4090-9185-d6b3b83ffb40</name>
+          <entityName>Organisation_entity</entityName>
+          <fieldName>LinkedAppointments</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
       <name>jdito</name>
-      <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+      <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
       <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>

entity/Appointment_entity/recordcontainers/jdito/contentProcess.js

+import("system.logging");
+import("system.db");
+import("Sql_lib");
 import("system.result");
 import("system.vars");
 import("system.calendars");
@@ -5,10 +8,39 @@ import("system.datetime");
 import("system.eMath");
 import("system.util");
 import("system.neon");
+import("system.entities")
 
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+if(vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
 {
+    var selectedids = vars.get("$local.idvalues");
+    result.object([buildEntry(calendars.getEntry(selectedids, null, null), null)]);
+}
 
+/**
+ * Will be triggert if a module needs AppointmentFilter_view
+ */
+else if(vars.getString("$param.LinkedObjectId_param") != undefined)
+{
+    var cond = SqlCondition
+                        .begin()
+                        .andPrepareVars("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
+    var idscond = db.translateCondition(cond.build("1 = 1"));
+   
+    var appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
+    
+    var entryArray = new Array(appointmentUids.length);
+    
+    for(var i = 0; i < appointmentUids.length; i++)
+    {
+        entryArray[i] = buildEntry(calendars.getEntry(appointmentUids[i], null, null), null);
+    }
+    result.object(entryArray);
+}
+/**
+ * Will be used, if the user is operating the calendar.
+ */
+else if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
     var entry = JSON.parse(vars.getString("$param.Entry_param"));
 
     var masterEntry = null;
@@ -16,38 +48,45 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
         masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
     }
 
-    var uid = entry[calendars.ID];    
-    var summary = entry[calendars.SUMMARY];
-    var attendees = entry[calendars.AFFECTEDUSERS];
-    var startdate = entry[calendars.DTSTART];
-    var enddate = entry[calendars.DTEND];
-    var links = entry[calendars.LINKS];
-    var description = entry[calendars.DESCRIPTION];
-    if(entry[calendars.ORGANIZER2] != undefined)
-        var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
-    var status = entry[calendars.STATUS];
-    var location = entry[calendars.LOCATION];
-    var reminder = entry[calendars.REMINDER_DURATION];
-    var remindercheck = entry[calendars.HASREMINDER]
-    var classification = entry[calendars.CLASSIFICATION];
-    var transparency = entry[calendars.TRANSPARENCY];
-    var categories = entry[calendars.CATEGORIES];
+    //@TODO Icon 
+    result.object([
+        buildEntry(entry, masterEntry)
+    ]);
+}
+
+
+function buildEntry(pEntry, pMasterentry)
+{
+    var uid = pEntry[calendars.ID];    
+    var summary = pEntry[calendars.SUMMARY];
+    var attendees = pEntry[calendars.AFFECTEDUSERS];
+    var startdate = pEntry[calendars.DTSTART];
+    var enddate = pEntry[calendars.DTEND];
+    var links = pEntry[calendars.LINKS];
+    var description = pEntry[calendars.DESCRIPTION];
+    if(pEntry[calendars.ORGANIZER2] != undefined)
+        var organizer = pEntry[calendars.ORGANIZER2]["paramvalue"];
+    var status = pEntry[calendars.STATUS];
+    var location = pEntry[calendars.LOCATION];
+    var reminder = pEntry[calendars.REMINDER_DURATION];
+    var remindercheck = pEntry[calendars.HASREMINDER]
+    var classification = pEntry[calendars.CLASSIFICATION];
+    var transparency = pEntry[calendars.TRANSPARENCY];
+    var categories = pEntry[calendars.CATEGORIES];
     
-    var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
-    var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
+    var masterBegin = pMasterentry != null ? pMasterentry[calendars.DTSTART] : null
+    var masterEnd = pMasterentry != null ? pMasterentry[calendars.DTEND] : null
     
     // Recurrence
-    var recurrenceID = entry[calendars.RECURRENCEID];
+    var recurrenceID = pEntry[calendars.RECURRENCEID];
     var rrule = null;
-    if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
-        rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
+    if (pMasterentry != null) { // Entry is a recurrence exception, therefore get rrule from master
+        rrule = pMasterentry[calendars.RRULE] != null ? pMasterentry[calendars.RRULE][0] : null;
     } else {
-        rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
+        rrule = pEntry[calendars.RRULE] != null ? pEntry[calendars.RRULE][0] : null;
     }
-
-    //@TODO Icon 
-    result.object([
-        [
+    
+    return [
             uid, 
             attendees.length, 
             startdate, 
@@ -70,6 +109,5 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
             null, 
             masterBegin, 
             masterEnd
-        ]
-    ]);
+        ];
 }

entity/Organisation_entity/Organisation_entity.aod

@@ -512,7 +512,6 @@
     </entityConsumer>
     <entityConsumer>
       <name>Tasks</name>
-      <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>Task_entity</entityName>
@@ -831,6 +830,20 @@
       <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
     </entityActionField>
+    <entityConsumer>
+      <name>LinkedAppointments</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Appointment_entity</entityName>
+        <fieldName>LinkedAppointments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>LinkedObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/linkedappointments/children/linkedobjectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Organisation_entity/entityfields/linkedappointments/children/linkedobjectid_param/valueProcess.js

+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file

entity/Organisation_entity/entityfields/tasks/stateProcess.js

-import("system.result");
-import("system.neon");
-import("system.vars");
-import("ActivityTask_lib");
-import("Context_lib");
-
-if(TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()))//TODO: CONTACTID/ORGANISATIONID: review if this should be the CONTACTID or the ORGANISATIONID
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file

entity/Person_entity/Person_entity.aod

@@ -558,7 +558,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
     </entityActionField>
     <entityConsumer>
       <name>Tasks</name>
-      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/stateProcess.js</stateProcess>
+      <state>EDITABLE</state>
       <dependency>
         <name>dependency</name>
         <entityName>Task_entity</entityName>
@@ -884,6 +884,20 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <iconId>VAADIN:CURLY_BRACKETS</iconId>
       <stateProcess>%aditoprj%/entity/Person_entity/entityfields/openadmininfo/stateProcess.js</stateProcess>
     </entityActionField>
+    <entityConsumer>
+      <name>Appointments</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Appointment_entity</entityName>
+        <fieldName>LinkedAppointments</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>LinkedObjectId_param</name>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/appointments/children/linkedobjectid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Person_entity/entityfields/appointments/children/linkedobjectid_param/valueProcess.js

+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.PERSONID"));
\ No newline at end of file

entity/Person_entity/entityfields/tasks/stateProcess.js

-import("system.result");
-import("system.neon");
-import("system.vars");
-import("ActivityTask_lib");
-import("Context_lib");
-
-if(TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()))
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-else
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -4229,6 +4229,10 @@
     <entry>
       <key>Parent context</key>
     </entry>
+    <entry>
+      <key>Linked Appointments</key>
+      <value>Verknüpfte Termine</value>
+    </entry>
     <entry>
       <key>Organisation Id</key>
     </entry>

neonContext/Appointment/Appointment.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
-  <name>Appointment</name>
-  <title>Termin</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <documentation>%aditoprj%/neonContext/Appointment/documentation.adoc</documentation>
-  <icon>VAADIN:CALENDAR</icon>
-  <mainview>AppointmentEdit_view</mainview>
-  <filterview>AppointmentPreview_view</filterview>
-  <editview>AppointmentEdit_view</editview>
-  <preview>AppointmentPreview_view</preview>
-  <entity>Appointment_entity</entity>
-  <references>
-    <neonViewReference>
-      <name>90fe74fe-9bc6-4f63-9c06-52e1b0ccfcb3</name>
-      <view>AppointmentEdit_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>9cf48e57-ca02-4cee-911c-20b09e36637d</name>
-      <view>AppointmentPreview_view</view>
-    </neonViewReference>
-  </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+  <name>Appointment</name>
+  <title>Termin</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <documentation>%aditoprj%/neonContext/Appointment/documentation.adoc</documentation>
+  <icon>VAADIN:CALENDAR</icon>
+  <mainview>AppointmentEdit_view</mainview>
+  <filterview>AppointmentPreview_view</filterview>
+  <editview>AppointmentEdit_view</editview>
+  <preview>AppointmentPreview_view</preview>
+  <entity>Appointment_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>90fe74fe-9bc6-4f63-9c06-52e1b0ccfcb3</name>
+      <view>AppointmentEdit_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>9cf48e57-ca02-4cee-911c-20b09e36637d</name>
+      <view>AppointmentPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>2a5e05b2-3f12-43b4-a3f4-3c31dbe0dace</name>
+      <view>AppointmentFilter_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>

neonContext/Organisation/Organisation.aod

@@ -51,5 +51,9 @@
       <name>512e3b17-d91d-4ed3-8fc8-f1e2607d3b44</name>
       <view>OrganisationAdmin_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>51a18051-fcb8-4d90-9075-802fdce12f9c</name>
+      <view>OrganisationTaskAppointment_view</view>
+    </neonViewReference>
   </references>
 </neonContext>

neonContext/Person/Person.aod

@@ -50,5 +50,9 @@
       <name>b0105010-457a-4866-a9cd-277d183ea130</name>
       <view>PersonAdmin_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>fc7e2546-b42a-48c0-8670-2d4033ad0598</name>
+      <view>PersonTaskAppointment_view</view>
+    </neonViewReference>
   </references>
 </neonContext>

neonView/AppointmentFilter_view/AppointmentFilter_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>AppointmentFilter_view</name>
+  <title>Linked Appointments</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Linked Appointments</layoutCaption>
+    </drawerLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>dfc5cdb0-6ff6-4089-b0e7-6ebcab5061e6</name>
+          <entityField>SUMMARY</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>65d462d0-e685-4493-bb73-c32c7ffe393b</name>
+          <entityField>BEGIN</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ba6f5f7a-7ae4-41cb-940b-c115561c0a71</name>
+          <entityField>END</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>0a591a05-1efe-4e33-9a59-363a5e423802</name>
+          <entityField>LOCATION</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>

neonView/NotificationFilter_view/NotificationFilter_view.aod

@@ -12,6 +12,7 @@
     <tableViewTemplate>
       <name>Table</name>
       <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
+      <inlineEdit v="true" />
       <entryAction>rowClickAction</entryAction>
       <entityField>#ENTITY</entityField>
       <isEditable v="false" />

neonView/OrganisationMain_view/OrganisationMain_view.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>OrganisationMain_view</name>
-  <title>Attribute</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <masterSlaveLayout>
-      <name>layout</name>
-      <master>b29471bb-a6d0-4730-90ef-191f76756fcb</master>
-    </masterSlaveLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>b29471bb-a6d0-4730-90ef-191f76756fcb</name>
-      <entityField>#ENTITY</entityField>
-      <view>OrganisationPreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name>
-      <entityField>Activities</entityField>
-      <view>ActivityFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>c10533a6-d185-4b13-84ee-53a468544c03</name>
-      <entityField>Contact</entityField>
-      <view>PersonSimpleList_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>ae34787c-dcaf-4fe2-a4e2-35219f138b03</name>
-      <entityField>360DegreeObjects</entityField>
-      <view>360DegreeFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>0728e9d5-3b38-4b53-9f13-ebf3f4a9518e</name>
-      <entityField>#ENTITY</entityField>
-      <view>OrganisationConditionPricelist_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>55e04574-bc55-4c9a-a4c4-9ebd287f8ae6</name>
-      <entityField>Tasks</entityField>
-      <view>TaskFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
-      <entityField>Documents</entityField>
-      <view>DocumentFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
-      <entityField>ObjectTrees</entityField>
-      <view>ObjectTreeFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>ba50e069-06da-440e-b04a-5a686fcf5303</name>
-      <entityField>AttributeTree</entityField>
-      <view>AttributeRelationTree_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
-      <entityField>LogHistoryConsumer</entityField>
-      <view>LogHistoryFilter_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>OrganisationMain_view</name>
+  <title>Attribute</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>b29471bb-a6d0-4730-90ef-191f76756fcb</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>b29471bb-a6d0-4730-90ef-191f76756fcb</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>c10533a6-d185-4b13-84ee-53a468544c03</name>
+      <entityField>Contact</entityField>
+      <view>PersonSimpleList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>ae34787c-dcaf-4fe2-a4e2-35219f138b03</name>
+      <entityField>360DegreeObjects</entityField>
+      <view>360DegreeFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>0728e9d5-3b38-4b53-9f13-ebf3f4a9518e</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationConditionPricelist_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>45c0f486-e7df-48ac-a201-661ac07f5fed</name>
+      <entityField>#ENTITY</entityField>
+      <view>OrganisationTaskAppointment_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
+      <entityField>Documents</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
+      <entityField>ObjectTrees</entityField>
+      <view>ObjectTreeFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>ba50e069-06da-440e-b04a-5a686fcf5303</name>
+      <entityField>AttributeTree</entityField>
+      <view>AttributeRelationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
+      <entityField>LogHistoryConsumer</entityField>
+      <view>LogHistoryFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>

neonView/OrganisationTaskAppointment_view/OrganisationTaskAppointment_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>OrganisationTaskAppointment_view</name>
+  <title>Tasks</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>b3dc5170-7215-453a-8902-4a17c518de27</name>
+      <entityField>Tasks</entityField>
+      <view>TaskFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>f452533f-d5ce-45f1-9bbd-583afd1857a3</name>
+      <entityField>LinkedAppointments</entityField>
+      <view>AppointmentFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>

neonView/PersonMain_view/PersonMain_view.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
-  <name>PersonMain_view</name>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <masterSlaveLayout>
-      <name>layout</name>
-      <master>12865531-5e68-4760-a846-8af7b97f9561</master>
-    </masterSlaveLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>12865531-5e68-4760-a846-8af7b97f9561</name>
-      <entityField>#ENTITY</entityField>
-      <view>PersonPreview_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>d674b32c-0493-47ea-a51f-dff5d13d237d</name>
-      <entityField>Activities</entityField>
-      <view>ActivityFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>e7b8c90f-dc8d-40f1-b4db-1493f845026f</name>
-      <entityField>360DegreeObjects</entityField>
-      <view>360DegreeFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>573d2b77-f948-47bc-bac1-621dd824c697</name>
-      <entityField>Tasks</entityField>
-      <view>TaskFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
-      <entityField>Documents</entityField>
-      <view>DocumentFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
-      <entityField>ObjectTrees</entityField>
-      <view>ObjectTreeFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
-      <entityField>AttributeTree</entityField>
-      <view>AttributeRelationTree_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
-      <entityField>OtherContacts</entityField>
-      <view>ContactList_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>265efe97-d759-476c-9546-0f339d56474d</name>
-      <entityField>CommRestrictions</entityField>
-      <view>CommRestrictionFilter_view</view>
-    </neonViewReference>
-    <neonViewReference>
-      <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
-      <entityField>LogHistoryConsumer</entityField>
-      <view>LogHistoryFilter_view</view>
-    </neonViewReference>
-  </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>PersonMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>12865531-5e68-4760-a846-8af7b97f9561</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>12865531-5e68-4760-a846-8af7b97f9561</name>
+      <entityField>#ENTITY</entityField>
+      <view>PersonPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e7b8c90f-dc8d-40f1-b4db-1493f845026f</name>
+      <entityField>360DegreeObjects</entityField>
+      <view>360DegreeFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>b531300d-eb3c-4a87-bd46-486e77d12e6c</name>
+      <entityField>#ENTITY</entityField>
+      <view>PersonTaskAppointment_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e2f4e721-0a3e-49d6-8873-6ac34ae30002</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>573d2b77-f948-47bc-bac1-621dd824c697</name>
+      <entityField>Tasks</entityField>
+      <view>TaskFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
+      <entityField>Documents</entityField>
+      <view>DocumentFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
+      <entityField>ObjectTrees</entityField>
+      <view>ObjectTreeFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
+      <entityField>AttributeTree</entityField>
+      <view>AttributeRelationTree_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
+      <entityField>OtherContacts</entityField>
+      <view>ContactList_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>265efe97-d759-476c-9546-0f339d56474d</name>
+      <entityField>CommRestrictions</entityField>
+      <view>CommRestrictionFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
+      <entityField>LogHistoryConsumer</entityField>
+      <view>LogHistoryFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>

neonView/PersonTaskAppointment_view/PersonTaskAppointment_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>PersonTaskAppointment_view</name>
+  <title>Tasks</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>1687572b-b1cc-443e-bcce-89da55281767</name>
+      <entityField>Tasks</entityField>
+      <view>TaskFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>07a80d30-8ff8-4645-a882-081c351e9b41</name>
+      <entityField>Appointments</entityField>
+      <view>AppointmentFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>