SCPN1-10253

This commit is contained in:
2026-02-27 10:22:13 +01:00
parent 4136118604
commit 9dd1998c98

View File

@@ -12,10 +12,6 @@
<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl"> <#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}", "unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}", "load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
<<<<<<< HEAD
<#switch appointment.AppointmentType>
=======
>>>>>>> b1577d1 (SCPN1-10253)
<#switch appointment.AppointmentType> <#switch appointment.AppointmentType>
<#case "APPOINTMENT_TYPE_LOADING"> <#case "APPOINTMENT_TYPE_LOADING">
<#if appointment.TimeZone?? && appointment.TimeZone!=""> <#if appointment.TimeZone?? && appointment.TimeZone!="">
@@ -27,12 +23,6 @@
</#if> </#if>
<#break> <#break>
<#case "APPOINTMENT_TYPE_UNLOADING"> <#case "APPOINTMENT_TYPE_UNLOADING">
<<<<<<< HEAD
<#if appointment.TimeZone?? && appointment.TimeZone!="">
"unloading_appointment" : "true",
"load_appointment" : "false",
=======
>>>>>>> b1577d1 (SCPN1-10253)
<#if appointment.TimeZone?? && appointment.TimeZone!=""> <#if appointment.TimeZone?? && appointment.TimeZone!="">
"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", "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)}", "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",