Merge branch 'sales_1084806_FixVisitPlanCalendarFunctionUsage' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1084806][Besuchsplannungs Datensätze über...

See merge request xrm/basic!1189

entity/Appointment_entity/Appointment_entity.aod

@@ -200,7 +200,7 @@
       </dependency>
       <children>
         <entityParameter>
-          <name>AppointmentId_param</name>
+          <name>VisitPlanId_param</name>
           <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js</valueProcess>
         </entityParameter>
         <entityParameter>
@@ -268,6 +268,10 @@
       <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/erroronpermissiondenied/valueProcess.js</valueProcess>
       <expose v="true" />
     </entityParameter>
+    <entityParameter>
+      <name>VisitPlanId_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/Appointment_entity/recordcontainers/jdito/onInsert.js

+import("Sql_lib");
 import("system.calendars");
 import("system.question");
 import("system.translate");
@@ -43,3 +44,8 @@ event[calendars.ID] = calendars.insert([event])[0];
 neon.setFieldValue("$field.UID", event[calendars.ID]);
 
 vars.set("$context.editmode", calendars.MODE_UPDATE);
+
+if(vars.exists("$param.VisitPlanId_param") && vars.get("$param.VisitPlanId_param"))
+{
+    newWhere("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$param.VisitPlanId_param")).updateData(true, "VISITPLANENTRY", ["APPOINTMENT_ID"], null, [event[calendars.ID]]);
+}
\ No newline at end of file

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

@@ -45,8 +45,9 @@ var params = {
     "Entry_param": JSON.stringify(CalendarUtil.createEntry(summary, description, links, undefined, undefined, start,
                                                                 end, undefined, undefined, undefined, [standardMail], 
                                                                 undefined, undefined, undefined))
+    , "VisitPlanId_param": selectionRowData[0]["#UID"]
 };
 
-neon.openContext("Appointment", "AppointmentEdit_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_NEW, params, null);
+neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params, null);
 result.string(true);
 

entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js

+import("system.calendars");
 import("system.vars");
 import("Calendar_lib");
 import("system.neon");
@@ -10,12 +11,7 @@ var recommendationId = vars.get("$field.VISITRECOMMENDATION_ID");
 newWhere("VISITRECOMMENDATION.VISITRECOMMENDATIONID", recommendationId)
     .updateData(true, "VISITRECOMMENDATION", ["STATUS"], null, [""]);
 
-new SqlBuilder(SqlUtils.getSystemAlias()).whereIfSet("ASYS_CALENDARBACKEND.ELEMENTUID", id)
-    .deleteData();
-    
-newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", id)
-    .deleteData();
+calendars.removeEntryByUID(calendars.VEVENT, null, id, null)
 
 newWhereIfSet("VISITPLANENTRY.VISITPLANENTRYID", "$field.UID")
-    .deleteData();
-    
+    .deleteData();
\ No newline at end of file