#1029757 Exchange Änderungen

entity/Appointment_entity/Appointment_entity.aod

@@ -3,7 +3,7 @@
   <name>Appointment_entity</name>
   <title>Termin</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <recordContainer>jdito</recordContainer>
+  <recordContainer>jDitoRC</recordContainer>
   <entityFields>
     <entityField>
       <name>SUMMARY</name>
@@ -169,13 +169,5 @@
         <element>MASTEREND.value</element>
       </recordFields>
     </jDitoRecordContainer>
-    <jDitoRecordContainer>
-      <name>jdito</name>
-      <jDitoRecordAlias></jDitoRecordAlias>
-      <contentProcess>%aditoprj%/entity/Appointment_entity/contentProcess.js</contentProcess>
-      <onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert>
-      <onUpdate>%aditoprj%/entity/Appointment_entity/onUpdate.js</onUpdate>
-      <onDelete>%aditoprj%/entity/Appointment_entity/onDelete.js</onDelete>
-    </jDitoRecordContainer>
   </recordContainers>
 </entity>

entity/Appointment_entity/entityfields/status/possibleItemsProcess.js

@@ -13,7 +13,7 @@ if( calendars.getBackendType() != calendars.BACKEND_EXCHANGEWS )
 else 
 {
     result.object( [ 
-            [calendars.STATUS_BUSY, translate.text("Gebucht")],
+            //[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")] 

entity/Appointment_entity/recordcontainers/jditorc/onUpdate.js

@@ -16,14 +16,10 @@ if(vars.exists("$param.entry"))
 {
     var event = JSON.parse(vars.getString("$param.entry"));
 
-    var ok = false;
-    if ( calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS  && event[calendars.ORGANIZER2]["cn"] != event[calendars.USER2]["cn"])
-    {
-        question.showMessage(translate.text("Ein Gruppentermin kann nur durch den Organisator bearbeitet werden."));
-        ok = true;
-    }
-    else
-    {
+    //if ( calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS  && event[calendars.ORGANIZER2]["cn"] != event[calendars.USER2]["cn"])
+    //    question.showMessage(translate.text("Ein Gruppentermin kann nur durch den Organisator bearbeitet werden."));
+    //else
+    //{
         event[calendars.ID] = vars.getString("$field.UID");
         event[calendars.TYPE] = calendars.VEVENT;
         event[calendars.STATUS] = vars.getString("$field.STATUS");
@@ -53,7 +49,7 @@ if(vars.exists("$param.entry"))
         calendars.updateEntry(event);
          
         ok = true;
-    }
+    //}
 }
 // Liefert die AffectedUsers
 function getAffectedUsers( pEvent )

process/Appointment_lib/process.js

+import("system.logging");
+import("system.calendars");
 import("system.neon");
 import("system.text");
 
@@ -73,7 +75,24 @@ AppointmentUtils.setPartStat = function (currentUserUri, attendees, newState) {
  */
 AppointmentUtils.sendExchangedAction = function(event, newState)
 {
-    event["X-ADITO-STATUSACTION"] = newState;    // "ACCEPT", "DECLINE", ""
-    event[calendars.AFFECTEDUSERS] = "";
-    calendars.updateEntry(event);
+    switch(newState)
+    {
+        case "ACCEPTED":
+            newState = "ACCEPT";
+            break;
+        case "DECLINED":
+            newState = "DECLINE";
+            break;
+        case "TENTATIVE":
+            newState = "TENTATIVELYACCEPT";
+            break;
+        default :
+            newState = "TENTATIVELYACCEPT";
+    }
+    
+    
+    jsonEvent = JSON.parse(event);
+    jsonEvent["X-ADITO-STATUSACTION"] = newState;    // "ACCEPT", "DECLINE", ""
+    jsonEvent[calendars.AFFECTEDUSERS] = "";
+    calendars.updateEntry(jsonEvent);
 }
\ No newline at end of file