#1032168 ALLDAY changes

entity/Appointment_entity/entityfields/summary/valueProcess.js

@@ -6,10 +6,12 @@ import("system.result");
 /**
  * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
  */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param") && !vars.get("$field.SUMMARY"))
 {
     var event = JSON.parse(vars.getString("$param.Entry_param"));
 
     if(event[calendars.SUMMARY])
         result.string(event[calendars.SUMMARY]);
-}
\ No newline at end of file
+}
+else
+    result.string(vars.get("$field.SUMMARY"));
\ No newline at end of file

entity/Appointment_entity/recordcontainers/jdito/onInsert.js

+import("system.logging");
 import("system.neon");
 import("system.calendars");
 import("system.vars");
@@ -11,25 +12,41 @@ import("system.tools");
 
 var event = JSON.parse(vars.getString("$param.Entry_param"));
 
+var fields = vars.get("$local.rowdata");
+logging.log(JSON.stringify(fields));
+
 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.
-event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
-event[calendars.STATUS] = vars.getString("$field.STATUS");
-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.BEGIN");
-event[calendars.DTEND] = vars.get("$field.END");
-event["X-ADITO-ISALLDAYEVENT"] = vars.get("$field.ALLDAY");
-event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
-event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY"); 
-event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
-if(vars.get("$field.RRULE"))
-    event[calendars.RRULE] = [vars.get("$field.RRULE")];
-if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
+//event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
+//event[calendars.STATUS] = vars.getString("$field.STATUS");
+//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.BEGIN");
+//event[calendars.DTEND] = vars.get("$field.END");
+//event["X-ADITO-ISALLDAYEVENT"] = vars.get("$field.ALLDAY");
+//event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
+//event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY"); 
+//event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
+
+event[calendars.AFFECTEDUSERS] = fields["ATTENDEES.value"];
+event[calendars.STATUS] = fields["STATUS.value"];
+event[calendars.SUMMARY] = fields["SUMMARY.value"];
+event[calendars.LOCATION] = fields["LOCATION.value"];
+event[calendars.DESCRIPTION] = fields["DESCRIPTION.value"];
+event[calendars.DTSTART] = fields["BEGIN.value"];
+event[calendars.DTEND] = fields["END.value"];
+event["X-ADITO-ISALLDAYEVENT"] = fields["ALLDAY.value"];
+event[calendars.CLASSIFICATION] = fields["CLASSIFICATION.value"];
+event[calendars.TRANSPARENCY] = fields["TRANSPARENCY.value"];
+event[calendars.CATEGORIES] = fields["CATEGORIES.value"];
+
+if(fields["RRULE.value"])
+    event[calendars.RRULE] = [fields["RRULE.value"]];
+if (fields["REMINDER.value"])
 {
     event[calendars.HASREMINDER] = "true";
-    event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
+    event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
 }
 var idstringarray = calendars.insert([event]);
 event[calendars.ID] = idstringarray[0];

entity/Appointment_entity/recordcontainers/jdito/onUpdate.js

@@ -33,28 +33,31 @@ if(event)
     //    question.showMessage(translate.text("Ein Gruppentermin kann nur durch den Organisator bearbeitet werden."));
     //else
     //{
-        event[calendars.ID] = vars.getString("$field.UID");
+    
+    var fields = vars.get("$local.rowdata");
+    
+        event[calendars.ID] = fields["UID.value"];
         event[calendars.TYPE] = calendars.VEVENT;
-        event[calendars.STATUS] = vars.getString("$field.STATUS");
-        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.BEGIN");
-        event[calendars.DTEND] = vars.get("$field.END");
+        event[calendars.STATUS] = fields["STATUS.value"];
+        event[calendars.SUMMARY] = fields["SUMMARY.value"];
+        event[calendars.LOCATION] = fields["LOCATION.value"];
+        event[calendars.DESCRIPTION] = fields["DESCRIPTION.value"];
+        event[calendars.DTSTART] = fields["BEGIN.value"];
+        event[calendars.DTEND] = fields["END.value"];
         event[calendars.HASREMINDER] = "false";
-        event["X-ADITO-ISALLDAYEVENT"] = vars.get("$field.ALLDAY");
-        event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
-        event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
-        event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
-        event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY");
-        if(vars.get("$field.REMINDER"))
+        event["X-ADITO-ISALLDAYEVENT"] = fields["ALLDAY.value"];
+        event[calendars.CLASSIFICATION] = fields["CLASSIFICATION.value"];
+        event[calendars.CATEGORIES] = fields["CATEGORIES.value"];
+        event[calendars.AFFECTEDUSERS] = fields["ATTENDEES.value"];
+        event[calendars.TRANSPARENCY] = fields["TRANSPARENCY.value"];
+        if(fields["REMINDER.value"])
         {
             event[calendars.HASREMINDER] = "true";
-            event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
+            event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
         }
         
         if(event[calendars.RRULE])
-            event[calendars.RRULE] = [vars.getString("$field.RRULE")];
+            event[calendars.RRULE] = [fields["RRULE.value"]];
         
         calendars.updateEntry(event);
 }