Merge branch 'master' of gitlab.adito.de:xrm/basic

entity/Appointment_entity/contentProcess.js

@@ -27,7 +27,7 @@ if(vars.exists("$param.entry"))
     var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
     var status = entry[calendars.STATUS];
     var location = entry[calendars.LOCATION];
-    var reminder = entry[calendars.REMINDER];
+    var reminder = entry[calendars.REMINDER_DURATION];
     var remindercheck = entry[calendars.HASREMINDER]
     var classification = entry[calendars.CLASSIFICATION];
     var transparency = entry[calendars.TRANSPARENCY];

entity/Appointment_entity/entityfields/status/possibleItemsProcess.js

@@ -4,21 +4,19 @@ import("system.translate");
 import("system.calendars");
 
 if( calendars.getBackendType() != calendars.BACKEND_EXCHANGEWS )
-{    
-    logging.log("possible items: if")
-    
-    result.object( [ [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")]
-          , [calendars.STATUS_CONFIRMED, translate.text("Bestätigt")]
-          , [calendars.STATUS_CANCELLED, translate.text("Abgesagt")]
-          ] );
+{
+    result.object([ 
+            [calendars.STATUS_CONFIRMED, translate.text("Bestätigt")],
+            [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")],
+            [calendars.STATUS_CANCELLED, translate.text("Abgesagt")]
+          ]);
 }
 else 
-{    
-    logging.log("possible items: else")
-    
-    result.object( [ [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")]
-          , [calendars.STATUS_BUSY, translate.text("Gebucht")]
-          , [calendars.STATUS_OOF, translate.text("Außer Haus")]
-          , [calendars.STATUS_FREE, translate.text("frei")] 
+{
+    result.object( [ 
+            [calendars.STATUS_BUSY, translate.text("Gebucht")],
+            [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")],
+            [calendars.STATUS_OOF, translate.text("Außer Haus")],
+            [calendars.STATUS_FREE, translate.text("frei")] 
           ] );
 }
\ No newline at end of file

entity/Appointment_entity/onInsert.js

@@ -22,39 +22,14 @@ event[calendars.LOCATION] = vars.get("$field.LOCATION");
 event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
 event[calendars.DTSTART] = vars.get("$field.STARTDATE");
 event[calendars.DTEND] = vars.get("$field.ENDDATE");
-event[calendars.HASREMINDER] = "false";
-var hasReminder = vars.get("$field.REMINDER_CHECK");
-if (hasReminder == "true")
-{
-    // Absolut nur, wenn auch gesetzt. Default ist relativ
-    if ( event[calendars.REMINDER_ABSOLUT] == "true")
-    {
-        var reminder_date = vars.get("$field.REMINDER");
-        if ( reminder_date != "" )
-        {
-            event[calendars.HASREMINDER] = "true";
-            event[calendars.REMINDER_DATE] = reminder_date;
-        }
-    }
-    else
-    {
-        var reminder_duration = vars.getString("$field.reminder_duration");
-        if ( reminder_duration != "")
-        {
-            event[calendars.HASREMINDER] = "true";
-            event[calendars.REMINDER_DURATION] = reminder_duration;
-        }
-    }
-    
-}
 event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
 event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY"); 
 event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
-//calcrecurrence(event);
-//if (event[calendars.RRULE] != undefined)     recurrencend(event);
-// Links updaten
-//    swing.saveTableEdit("$field.links");
-// Entweder jetzt neu anlegen oder nur updaten
+if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
+{
+    event[calendars.HASREMINDER] = "true";
+    event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
+}
 event[calendars.ID] = calendars.insert([event])[0];
 vars.set("$image.editmode", calendars.MODE_UPDATE);
 ok = true;

entity/Appointment_entity/onUpdate.js

@@ -41,7 +41,7 @@ if(vars.exists("$param.entry"))
         if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
         {
             event[calendars.HASREMINDER] = "true";
-            event[calendars.REMINDER] = vars.get("$field.REMINDER");
+            event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
         }
             //event[calendars.AFFECTEDUSERS] = getAffectedUsers( event ); 
         //    calcrecurrence(event);

entity/History_entity/History_entity.aod

@@ -3,15 +3,15 @@
   <name>History_entity</name>
   <title>History</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainerType>DB</recordContainerType>
+  <caption>History</caption>
+  <iconId>NEON:HISTORY</iconId>
+  <imageProcess>%aditoprj%/entity/History_entity/imageProcess.js</imageProcess>
   <alias>Data_alias</alias>
   <fromClauseProcess>%aditoprj%/entity/History_entity/fromClauseProcess.js</fromClauseProcess>
   <conditionProcess>%aditoprj%/entity/History_entity/conditionProcess.js</conditionProcess>
   <onDBInsert>%aditoprj%/entity/History_entity/onDBInsert.js</onDBInsert>
   <onDBDelete>%aditoprj%/entity/History_entity/onDBDelete.js</onDBDelete>
-  <recordContainerType>DB</recordContainerType>
-  <caption>History</caption>
-  <iconId>NEON:HISTORY</iconId>
-  <imageProcess>%aditoprj%/entity/History_entity/imageProcess.js</imageProcess>
   <entityFields>
     <entityField>
       <name>DIRECTION</name>
@@ -129,6 +129,11 @@
     <entityIncomingField>
       <name>#INCOMING</name>
     </entityIncomingField>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/History_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <linkInformation>
     <linkInformation>

entity/History_entity/entityfields/icon/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+result.string("NEON:HISTORY");
\ No newline at end of file

neonView/HistoryFilter_view/HistoryFilter_view.aod

@@ -46,5 +46,11 @@
       <iconIdField>DIRECTION_ICON</iconIdField>
       <entityField>#ENTITY</entityField>
     </timelineViewTemplate>
+    <treetableViewTemplate>
+      <name>Treetable</name>
+      <descriptionField>SUBJECT</descriptionField>
+      <iconField>ICON</iconField>
+      <entityField>#ENTITY</entityField>
+    </treetableViewTemplate>
   </children>
 </neonView>