diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index 8ea9242..a8bdd1f 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -75,6 +75,14 @@ { "Key": "carrier", "Value": "${carrier_apt.planned_carrier?json_string}" + }, + { + "Key": "loading", + "Value": "${carrier_apt.load_appointment?json_string}" + }, + { + "Key": "unloading", + "Value": "${carrier_apt.unloading_appointment?json_string}" } ], <#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">, diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl index 6cf23f5..9fcc9f2 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl @@ -77,6 +77,14 @@ { "Key": "carrier", "Value": "${carrier_apt.planned_carrier?json_string}" + }, + { + "Key": "loading", + "Value": "${carrier_apt.load_appointment?json_string}" + }, + { + "Key": "unloading", + "Value": "${carrier_apt.unloading_appointment?json_string}" } ], <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))> @@ -94,8 +102,8 @@ }<#sep>, ], - - <#--<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + <#else> + <#--<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> "Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}", <#else> <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> @@ -108,6 +116,8 @@ --> + + "Slots": [{ <#-- calcul de de la durée en fonction des start et end time--> "DurationInSeconds": "${duration}", diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 8d0692a..7fd725d 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -84,9 +84,10 @@ ] <#break> -<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated ******************** --> +<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated or ReasonUpdated******************** --> <#case "SlotUpdated"> <#case "CarrierInformationUpdated"> + <#case "ReasonUpdated"> <#assign appointment = eventRP.data /> [ <#if eventRP.appointmentCustomFields?has_content>