Merge branch 'revert-929fcb85' into '2021.0.2'

Revert "Merge branch 'cm_dt_1077138_creating_appointment' into '2021.0.2'"

See merge request xrm/basic!810

entity/Appointment_entity/recordcontainers/jdito/contentProcess.js

@@ -18,12 +18,12 @@ var appointmentUids;
 /**
  * Will be used, if the user is operating the calendar.
  */
-if(vars.get("$param.Entry_param"))
+if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
 {
     var entry = JSON.parse(vars.getString("$param.Entry_param"));
 
     var masterEntry = null;
-    if (vars.get("$param.MasterEntry_param") != "") {
+    if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
         masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
     }
 

entity/Organisation_entity/Organisation_entity.aod

@@ -1418,7 +1418,6 @@
       <title>New appointment</title>
       <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:CALENDAR</iconId>
-      <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/newappointment/stateProcess.js</stateProcess>
       <tooltip>New Appointment</tooltip>
     </entityActionField>

entity/Person_entity/Person_entity.aod

@@ -1453,7 +1453,6 @@
       <title>New appointment</title>
       <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newappointment/onActionProcess.js</onActionProcess>
       <iconId>VAADIN:CALENDAR</iconId>
-      <state>INVISIBLE</state>
       <stateProcess>%aditoprj%/entity/Person_entity/entityfields/newappointment/stateProcess.js</stateProcess>
       <tooltip>New Appointment</tooltip>
     </entityActionField>

entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod

@@ -111,7 +111,7 @@
           <title>New Appointment</title>
           <onActionProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js</onActionProcess>
           <iconId>VAADIN:CALENDAR</iconId>
-          <state>INVISIBLE</state>
+          <state>EDITABLE</state>
           <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/stateProcess.js</stateProcess>
           <tooltip>Create new Appointment</tooltip>
           <tooltipProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/tooltipProcess.js</tooltipProcess>

entity/VisitPlanEntry_entity/afterSave.js

@@ -26,12 +26,11 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED")
     var description = savedData["CONTACT_ID.displayValue"];
     var standardMail = CommUtil.getStandardMail(savedData["CONTACT_ID"]); 
     
-    //1077138, 1074419 customized code to match, new CalendarUtil.createEntry()/newSilentEvent() and work without misbehaviour.
-    var entryDateLocalTime = parseInt(datetime.toLong(datetime.toLocaleDate(parseInt(savedData["ENTRYDATE"]), "dd-MM-yyyy"), "dd-MM-yyyy", 
-                                                                                        vars.get("$sys.timezone")));
-
-    var start = new Date(entryDateLocalTime+Number(savedData["BEGIN_TIME"]));
-    var end = new Date(entryDateLocalTime+Number(savedData["END_TIME"]));
+    var entryDate = datetime.toLocaleDate(savedData["ENTRYDATE"], "dd-MM-yyyy");
+    var startTime = entryDate + " " + datetime.toLocaleDate(savedData["BEGIN_TIME"], "HH:mm:ss.S");
+        startTime = datetime.toLong(startTime, "dd-MM-yyyy HH:mm:ss.S", "UTC"); // #1076044 set tz to prevent time gaps.
+    var endTime = savedData["END_TIME"];
+    var duration = eMath.subInt(endTime, startTime);
     
     var links = [
         {
@@ -46,7 +45,8 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED")
     
     var params = {
         "Entry_param" : JSON.stringify(CalendarUtil.createEntry(summary, description, links, undefined, undefined, 
-                                            start, end, undefined, undefined, undefined, [standardMail], undefined, undefined, undefined))
+                                            Date(Date.toExponential(startTime)), Date(Date.toExponential(endTime)), 
+                                            undefined, undefined, undefined, [standardMail], undefined, undefined, undefined))
     };
     
     neon.openContext("Appointment", "AppointmentEdit_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_NEW, params, null);

entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js

@@ -25,7 +25,6 @@ var summary = translate.text("Site visit") + " || " + fullName;
 var description = fullName;
 var standardMail = CommUtil.getStandardMail(selectionRowData[0].CONTACT_ID); 
 
-//1077138, 1074419 customized code to match, new CalendarUtil.createEntry()/newSilentEvent() and work without misbehaviour.
 var startTime = selectionRowData[0].BEGIN_TIME;
 var endTime = selectionRowData[0].END_TIME;
 var duration = eMath.subInt(endTime, startTime);

process/Calendar_lib/process.js

@@ -391,7 +391,7 @@ CalendarUtil.createEntry = function(pSummary, pDescription, pLinks, pOwner, pAff
         pStatus = calendars.STATUS_CONFIRMED;
     }
     
-    if(pReminder)
+    if(!pReminder)
     {
         entry[calendars.HASREMINDER] = "true";
         entry[calendars.REMINDER_DURATION] = pReminder.getTime().toString();