Merge origin/master

entity/Appointment_entity/Appointment_entity.aod

@@ -4,7 +4,7 @@
   <title>Termin</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
-  <recordContainer>jDitoRC</recordContainer>
+  <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityField>
       <name>SUMMARY</name>
@@ -90,7 +90,7 @@
       <name>#PROVIDER</name>
     </entityProvider>
     <entityParameter>
-      <name>masterEntry</name>
+      <name>MasterEntry_param</name>
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
@@ -125,21 +125,21 @@
       <name>ICON</name>
     </entityField>
     <entityParameter>
-      <name>entry</name>
+      <name>Entry_param</name>
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
-      <name>jDitoRC</name>
-      <title>jDitoRC</title>
+      <name>jdito</name>
+      <title>jdito</title>
       <description></description>
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jditorc/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jditorc/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jditorc/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jditorc/onDelete.js</onDelete>
+      <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>
+      <onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
       <recordFields>
         <element>UID.value</element>
         <element>ATTENDEESLENGTH.value</element>
@@ -167,4 +167,3 @@
     </jDitoRecordContainer>
   </recordContainers>
 </entity>
-

entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js

@@ -3,7 +3,7 @@ import("system.logging");
 import("system.result");
 import("system.calendars");
 
-var entry = JSON.parse(vars.getString("param.entry"));
+var entry = JSON.parse(vars.getString("$param.Entry_param"));
 var allUsers = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE);
 var results = [];
 

entity/Appointment_entity/recordcontainers/jdito/contentProcess.js

@@ -42,8 +42,7 @@ if(vars.exists("$param.Entry_param"))
     } else {
         rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
     }
-    
-//    logging.log("contentProcess summary: " + summary);
+   
     
     //@TODO Icon 
     result.object([

entity/Appointment_entity/recordcontainers/jdito/onDelete.js

@@ -3,7 +3,7 @@ import("system.neon");
 import("system.calendars");
 import("system.vars");
 
-//logging.log("onDelete has var: " + vars.exists("$param.Entry_param"))
+
 if (vars.exists("$param.Entry_param"))
 {
     var entry = JSON.parse(vars.getString("$param.Entry_param"));

entity/Appointment_entity/recordcontainers/jdito/onInsert.js

@@ -10,10 +10,7 @@ import("system.db");
 import("system.result");
 import("system.tools");
 
-//logging.log("on Insert has var: " + vars.exists("$param.Entry_param"));
-
 var event = JSON.parse(vars.getString("$param.Entry_param"));
-var ok = false;
 
 event[calendars.TYPE] = calendars.VEVENT;
 event[calendars.ID] = ""; //wenn hier neue id erstellt und mitgegeben wird, wird versucht einen termin mit dieser id zu finden, den es nicht gibt. also leer.

entity/Appointment_entity/recordcontainers/jdito/onUpdate.js

@@ -14,7 +14,7 @@ import("system.tools");
 
 // Dieser Prozess speichert die im Frame angezeigten Daten
 // Je nach Modus (INSERT, EDIT) wird ein neuer Datensatz angelegt oder der alte editiert
-//logging.log("onUpdate has var: "+ vars.exists("$param.Entry_param"));
+
 if(vars.exists("$param.Entry_param") && vars.getString("$param.Entry_param") != "")
 {
     var event = JSON.parse(vars.getString("$param.Entry_param"));