Merge origin/master

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

entity/Appointment_entity/Appointment_entity.aod

@@ -21,6 +21,7 @@
     <element>LOCATION</element>
     <element>ICON</element>
     <element>CLASSIFICATION</element>
+    <element>ALLDAY</element>
   </fields>
   <contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
   <onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
@@ -96,5 +97,11 @@
       <fieldName>ATTENDEES</fieldName>
       <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
+    <entityField>
+      <name>ALLDAY</name>
+      <fieldName>ALLDAY</fieldName>
+      <contentType>BOOLEAN</contentType>
+      <selectionMode>NONE</selectionMode>
+    </entityField>
   </entityFields>
 </entity>

entity/Appointment_entity/contentProcess.js

@@ -4,6 +4,7 @@ import("system.vars");
 import("system.calendars");
 import("system.datetime");
 import("system.eMath");
+import("system.util");
 
 if(vars.exists("$image.entry"))
 {
@@ -11,8 +12,7 @@ if(vars.exists("$image.entry"))
 
     var uid = entry[calendars.ID];    
     var summary = entry[calendars.SUMMARY];
-    var affectedusers = entry[calendars.AFFECTEDUSERS];
-    var attendees = entry[calendars.ATTENDEES];
+    var attendees = entry[calendars.AFFECTEDUSERS];
     var startdate = entry[calendars.DTSTART];
     var enddate = entry[calendars.DTEND];
     var links = entry[calendars.LINKS];
@@ -23,17 +23,16 @@ if(vars.exists("$image.entry"))
     var reminder = entry[calendars.REMINDER];
     var remindercheck = entry[calendars.HASREMINDER]
     var classification = entry[calendars.CLASSIFICATION];
-  
+    var allday = entry[calendars];
+    
     //@TODO Icon 
   
     result.object([
-        [uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification] //, location, reminder, remindercheck
+        [uid, '', '', attendees.length, startdate, enddate, summary, organizer, attendees, status, links, description, location, '', classification, allday] //, location, reminder, remindercheck
         ]);
 }
 else
 {
-    logging.log("contentproc: empty");
-    
     var filter = ( vars.exists("$param.p_filter") 
                     && vars.get("$param.p_filter") != null 
                     && vars.get("$param.p_filter") != undefined) ? vars.get("$param.p_filter") : "";
@@ -55,5 +54,5 @@ else
     //    var icon = (getIcon("termine_aufgaben", iconInfo));
     //    events[i] = events[i].concat(icon);
     //}
-    //result.object(events);        
-}
\ No newline at end of file
+    //result.object(events);         
+}

entity/Appointment_entity/onUpdate.js

@@ -27,7 +27,8 @@ if(vars.exists("$image.entry"))
         ok = true;
     }
     else
-    {
+        {
+        
         event[calendars.TYPE] = calendars.VEVENT;
         event[calendars.STATUS] = vars.getString("$field.STATUS");
         event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
@@ -36,6 +37,10 @@ if(vars.exists("$image.entry"))
         event[calendars.DTSTART] = vars.get("$field.BEGIN");
         event[calendars.DTEND] = vars.get("$field.END");
         event[calendars.HASREMINDER] = "false";
+        event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
+        event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
+        var att = vars.get("$field.ATTENDEES");
+        event[calendars.AFFECTEDUSERS] = att;
         var hasReminder = vars.get("$field.REMINDER_CHECK");
         if (hasReminder == "true")
         {
@@ -59,12 +64,8 @@ if(vars.exists("$image.entry"))
         //            }
         //        }
         }
-            event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
         //    event[calendars.TRANSPARENCY] = vars.get("$comp.transparency");  
             //event[calendars.AFFECTEDUSERS] = getAffectedUsers( event ); 
-            var categs = vars.get("$field.CATEGORIES");
-            logging.log(categs);
-            event[calendars.CATEGORIES] = categs;
         //    calcrecurrence(event);
         //    if (event[calendars.RRULE] != undefined)     recurrencend(event);
         // Links updaten

neonView/AppointmentEdit_view/AppointmentEdit_view.aod

@@ -14,12 +14,13 @@
       <descriptionField>DESCRIPTION</descriptionField>
       <beginField>BEGIN</beginField>
       <endField>END</endField>
-      <affectedUsersField>SUMMARY</affectedUsersField>
+      <affectedUsersField>ATTENDEES</affectedUsersField>
       <attendeesField>ATTENDEES</attendeesField>
       <privateField>CLASSIFICATION</privateField>
       <statusField>STATUS</statusField>
       <locationField>LOCATION</locationField>
       <categoriesField>CATEGORIES</categoriesField>
+      <alldayField>ALLDAY</alldayField>
       <entityField>#ENTITY</entityField>
     </appointmentEditViewTemplate>
   </children>

neonView/AppointmentPreview_view/AppointmentPreview_view.aod

@@ -13,8 +13,7 @@
       <summaryField>SUMMARY</summaryField>
       <descriptionField>DESCRIPTION</descriptionField>
       <periodField>STARTEND</periodField>
-      <affectedUsersField>SUMMARY</affectedUsersField>
-      <attendeesField>SUMMARY</attendeesField>
+      <attendeesField>ATTENDEES</attendeesField>
       <privateField>CLASSIFICATION</privateField>
       <statusField>STATUS</statusField>
       <locationField>LOCATION</locationField>