From 2d022ccf472ffec7aa655b07aa52ac7df8c6cac5 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 27 Jan 2026 13:31:55 +0100 Subject: [PATCH] SCPN1-10100 --- RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl | 44 ++++--------------- RPtoRFX_CarrierAppointmentUpdatedByRef.ftl | 40 +++-------------- 2 files changed, 16 insertions(+), 68 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl index dc49e0c..4ca9c1d 100644 --- a/RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentUpdatedByNumber.ftl @@ -9,43 +9,17 @@ }, "payload" : { -<#-- <#switch appointment.AppointmentType> - <#case "APPOINTMENT_TYPE_LOADING"> - "unloading_appointment" : "false", - "load_appointment" : "true", - <#if appointment.TimeZone?? && appointment.TimeZone!=""> - "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#else> - "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", - "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", - - <#break> - <#case "APPOINTMENT_TYPE_UNLOADING"> - "unloading_appointment" : "true", - "load_appointment" : "false", - <#if appointment.TimeZone?? && appointment.TimeZone!=""> - "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#else> - "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", - - <#break> - <#default> - <#stop "appointment.AppointmentType not implemented" > - --> <#switch appointment.AppointmentType> - <#case "APPOINTMENT_TYPE_LOADING"> - "unloading_appointment" : "false", - "load_appointment" : "true", - <#break> - <#case "APPOINTMENT_TYPE_UNLOADING"> - "unloading_appointment" : "true", - "load_appointment" : "false", + <#case "APPOINTMENT_TYPE_LOADING"> + "unloading_appointment" : "false", + "load_appointment" : "true", <#break> - <#default> - <#stop "appointment.AppointmentType not implemented" > + <#case "APPOINTMENT_TYPE_UNLOADING"> + "unloading_appointment" : "true", + "load_appointment" : "false", + <#break> + <#default> + <#stop "appointment.AppointmentType not implemented" > "appointment_designation":"${(appointment.Reason!"")!?json_string}" } diff --git a/RPtoRFX_CarrierAppointmentUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentUpdatedByRef.ftl index 8968b2f..cc87aa4 100644 --- a/RPtoRFX_CarrierAppointmentUpdatedByRef.ftl +++ b/RPtoRFX_CarrierAppointmentUpdatedByRef.ftl @@ -8,43 +8,17 @@ }, "payload" : { -<#-- <#switch appointment.AppointmentType> - <#case "APPOINTMENT_TYPE_LOADING"> - "unloading_appointment" : "false", - "load_appointment" : "true", - <#if appointment.TimeZone?? && appointment.TimeZone!=""> - "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#else> - "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", - "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", - - <#break> - <#case "APPOINTMENT_TYPE_UNLOADING"> - "unloading_appointment" : "true", - "load_appointment" : "false", - <#if appointment.TimeZone?? && appointment.TimeZone!=""> - "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#else> - "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", - - <#break> - <#default> - <#stop "appointment.AppointmentType not implemented" > - --> <#switch appointment.AppointmentType> - <#case "APPOINTMENT_TYPE_LOADING"> - "unloading_appointment" : "false", - "load_appointment" : "true", - <#break> - <#case "APPOINTMENT_TYPE_UNLOADING"> + <#case "APPOINTMENT_TYPE_LOADING"> + "unloading_appointment" : "false", + "load_appointment" : "true", + <#break> + <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", "load_appointment" : "false", <#break> - <#default> - <#stop "appointment.AppointmentType not implemented" > + <#default> + <#stop "appointment.AppointmentType not implemented" > "appointment_designation":"${(appointment.Reason!"")!?json_string}" }