insert & update changes

entity/Appointment_entity/Appointment_entity.aod

@@ -22,6 +22,7 @@
     <element>ICON</element>
     <element>CLASSIFICATION</element>
     <element>TRANSPARENCY</element>
+    <element>CATEGORIES</element>
   </fields>
   <contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
   <onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
@@ -88,6 +89,7 @@
     </entityField>
     <entityField>
       <name>CATEGORIES</name>
+      <fieldName>CATEGORIES</fieldName>
       <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/possibleItemsProcess.js</possibleItemsProcess>
       <newItemsAllowed v="true" />
       <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/valueProcess.js</valueProcess>
@@ -101,9 +103,5 @@
       <name>TRANSPARENCY</name>
       <fieldName>TRANSPARENCY</fieldName>
     </entityField>
-    <entityField>
-      <name>ALLDAY</name>
-      <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/allday/valueProcess.js</valueProcess>
-    </entityField>
   </entityFields>
 </entity>

entity/Appointment_entity/contentProcess.js

@@ -24,11 +24,12 @@ if(vars.exists("$param.entry"))
     var remindercheck = entry[calendars.HASREMINDER]
     var classification = entry[calendars.CLASSIFICATION];
     var transparency = entry[calendars.TRANSPARENCY];
+    var categories = entry[calendars.CATEGORIES];
     
     //@TODO Icon 
   
     result.object([
-        [uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, transparency] //reminder, remindercheck
+        [uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, transparency, categories] //reminder, remindercheck
         ]);
 }
 else

entity/Appointment_entity/entityfields/allday/valueProcess.js

-import("system.vars");
-import("system.datetime");
-import("system.result");
-
-var start = vars.get("$field.BEGIN");
-var end = vars.get("$fild.END")
-
-var startNumber = number(start);
-var endNumber = number(end);
-
-// überprüft ob beide uhrzeiten start und end auf 0 Uhr stehen und
-// ob es 0 Uhr des selben tages ist
-var isAllday = datetime.toDate(start, "HH:mm") == "00:00" && 
-    datetime.toDate(end, "HH:mm") == "23:59" && 
-    startNumber < endNumber;
-
-result.string(allday);
\ No newline at end of file

entity/Appointment_entity/onInsert.js

@@ -10,12 +10,8 @@ import("system.db");
 import("system.result");
 import("system.tools");
 
-logging.log("on insert");
 
-// Dieser Prozess speichert die im Frame angezeigten Daten
-// Je nach Modus (INSERT, EDIT) wird ein neuer Datensatz angelegt oder der alte editiert
 var event = JSON.parse(vars.getString("param.entry"));
-
 var ok = false;
 
 event[calendars.TYPE] = calendars.VEVENT;
@@ -51,9 +47,9 @@ if (hasReminder == "true")
 //        }
 }
 event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
-//    event[calendars.TRANSPARENCY] = vars.get("$field.transparency");
+event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY");
 //event[calendars.AFFECTEDUSERS] = getAffectedUsers( event );   
-//    event[calendars.CATEGORIES] = vars.get("$field.categories");
+event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
 //calcrecurrence(event);
 //if (event[calendars.RRULE] != undefined)     recurrencend(event);
 // Links updaten
@@ -63,15 +59,6 @@ event[calendars.ID] = calendars.insert([event])[0];
 vars.set("$image.editmode", calendars.MODE_UPDATE);
 ok = true;
 
-////Zwischenspeichern
-//if(vars.exists("$image.dontClose") && vars.get("$image.dontClose") )    ok = false; //Maske offen lassen
-//vars.set("$image.dontClose",  false); // zurücksetzen, damit Klick auf Speichern noch funktioniert
-
-if(vars.exists("$sys.ancestorimageuid") && vars.get("$sys.ancestorimageuid") != null)
-{
-    neon.closeImage(vars.getString("$sys.currentimage"), true);
-    neon.refresh(vars.get("$sys.ancestorimageuid"));
-}
 
 
 // Liefert die AffectedUsers

entity/Appointment_entity/onUpdate.js

@@ -27,7 +27,7 @@ if(vars.exists("param.entry"))
         ok = true;
     }
     else
-        {
+    {
         
         event[calendars.TYPE] = calendars.VEVENT;
         event[calendars.STATUS] = vars.getString("$field.STATUS");