Merge origin/master

Conflicts:
	entity/Pers_entity/Pers_entity.aod
	preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

entity/Appointment_entity/Appointment_entity.aod

@@ -12,7 +12,7 @@
     <element>ATTENDEESLENGTH</element>
     <element>STARTDATE</element>
     <element>ENDDATE</element>
-    <element>SUBJECT</element>
+    <element>SUMMARY</element>
     <element>ORGANIZER</element>
     <element>ATTENDEES</element>
     <element>STATUS</element>
@@ -31,7 +31,7 @@
   <entityFields>
     <entityField>
       <name>SUMMARY</name>
-      <fieldName>SUBJECT</fieldName>
+      <fieldName>SUMMARY</fieldName>
       <caption>Betreff</caption>
       <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/summary/valueProcess.js</valueProcess>
     </entityField>
@@ -91,5 +91,10 @@
       <newItemsAllowed v="true" />
       <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/valueProcess.js</valueProcess>
     </entityField>
+    <entityField>
+      <name>ATTENDEES</name>
+      <fieldName>ATTENDEES</fieldName>
+      <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
+    </entityField>
   </entityFields>
 </entity>

entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js

+import("system.vars");
+import("system.logging");
+import("system.result");
+import("system.calendars");
+
+logging.log("attendees poss-items")
+
+var entry = vars.get("$image.entry");
+var allUsers = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE);
+var results = [];
+
+for (var i = 0; i < allUsers.length; i++)
+{
+    results[i] = [allUsers[i][0], allUsers[i][2].paramvalue];
+}
+logging.log(results);
+
+result.object(results);
\ No newline at end of file

entity/Appointment_entity/onInsert.js

@@ -19,8 +19,9 @@ var event = vars.get("$image.entry");
 var ok = false;
 
 event[calendars.TYPE] = calendars.VEVENT;
+event[calendars.ATTENDEES] = vars.get("$field.ATTENDEES");
 event[calendars.STATUS] = vars.getString("$field.STATUS");
-event[calendars.SUMMARY] = vars.getString("$field.SUBJECT");
+event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
 event[calendars.LOCATION] = vars.get("$field.LOCATION");
 event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
 event[calendars.DTSTART] = vars.get("$field.STARTDATE");
@@ -51,7 +52,7 @@ if (hasReminder == "true")
 }
 event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
 //    event[calendars.TRANSPARENCY] = vars.get("$field.transparency");
-event[calendars.AFFECTEDUSERS] = getAffectedUsers( event );   
+//event[calendars.AFFECTEDUSERS] = getAffectedUsers( event );   
 //    event[calendars.CATEGORIES] = vars.get("$field.categories");
 //calcrecurrence(event);
 //if (event[calendars.RRULE] != undefined)     recurrencend(event);

neonView/AppointmentEdit_view/AppointmentEdit_view.aod

@@ -15,7 +15,7 @@
       <beginField>BEGIN</beginField>
       <endField>END</endField>
       <affectedUsersField>SUMMARY</affectedUsersField>
-      <attendeesField>SUMMARY</attendeesField>
+      <attendeesField>ATTENDEES</attendeesField>
       <privateField>CLASSIFICATION</privateField>
       <statusField>STATUS</statusField>
       <locationField>LOCATION</locationField>

neonView/AppointmentPreview_view/AppointmentPreview_view.aod

@@ -18,6 +18,7 @@
       <privateField>CLASSIFICATION</privateField>
       <statusField>STATUS</statusField>
       <locationField>LOCATION</locationField>
+      <categoriesField>CATEGORIES</categoriesField>
       <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-Basic-5</projectName>
+  <projectName>xRM-Basic 5</projectName>
   <jditoMaxContentSize v="57671680" />
   <calendarCategoriesEvent>
     <entry>
@@ -22,6 +22,7 @@
   <clientSearchExcludeForIgnorecase v="true" />
   <blobHandlingMethod>DATABASE</blobHandlingMethod>
   <databaseAuditGetOldValueLobs v="false" />
+  <indexsearchGlobalEnabled v="true" />
   <indexsearchFullIndexerEnabled v="true" />
   <indexsearchFullIndexerInterval v="0" />
   <indexsearchIncrementingIndexerEnabled v="true" />