From 39f654c95adcb7f2fd6731cf2d6a23777918b750 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 25 Nov 2025 13:30:00 +0100 Subject: [PATCH] modif sur les rdz --- RFXtoRP_HsaLstCarSta.ftl | 10 ++++------ ....ftl => RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl | 0 ...ed.ftl => RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl | 0 RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl | 4 ++-- RPtoRFX_CarrierAppointmentCreated.ftl | 4 ++-- RPtoRFX_CarrierAppointmentUpdated.ftl | 4 ++-- 6 files changed, 10 insertions(+), 12 deletions(-) rename RFXtoRP_HsaLstCarSta_ReceptionUnloaded.ftl => RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl (100%) rename RFXtoRP_HsaLstCarSta_ReceptionStarted.ftl => RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl (100%) diff --git a/RFXtoRP_HsaLstCarSta.ftl b/RFXtoRP_HsaLstCarSta.ftl index 167ba10..87c97eb 100644 --- a/RFXtoRP_HsaLstCarSta.ftl +++ b/RFXtoRP_HsaLstCarSta.ftl @@ -21,8 +21,6 @@ <#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)> [ { - - <#switch carrier_apt_status.status.carrier_status_code> <#case "010"> <#-- Transporteur attendu --> <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> <#-- à revoir --> @@ -37,16 +35,16 @@ <#include "RFXtoRP_HsaLstCarSta_CarrierArrived.ftl"> <#break> <#case "040"> <#-- Déchargement commencé --> - <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentReceptionStarted> <#-- à revoir --> + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingStarted> <#-- à revoir --> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsaLstCarSta_ReceptionStarted.ftl"> + <#include "RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl"> <#break> <#case "050"> <#-- Déchargement terminé--> - <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentReceptionStarted> <#-- à revoir --> + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingStarted> <#-- à revoir --> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsaLstCarSta_ReceptionStarted.ftl"> + <#include "RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl"> <#break> <#default> diff --git a/RFXtoRP_HsaLstCarSta_ReceptionUnloaded.ftl b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl similarity index 100% rename from RFXtoRP_HsaLstCarSta_ReceptionUnloaded.ftl rename to RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl diff --git a/RFXtoRP_HsaLstCarSta_ReceptionStarted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl similarity index 100% rename from RFXtoRP_HsaLstCarSta_ReceptionStarted.ftl rename to RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index 619a8e7..6d3807f 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -18,7 +18,7 @@ <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-")> <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" > - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION> + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) /> <#if (duration <= 0)> <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" > @@ -28,7 +28,7 @@ <#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") || carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-")> <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION> + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> <#if (duration <= 0)> <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" > diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 4930854..6c9d802 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -10,7 +10,7 @@ "appointment_reference": "${eventRP.refid?json_string}", <#switch appointment.AppointmentType> - <#case "APPOINTMENT_TYPE_EXPEDITION"> + <#case "APPOINTMENT_TYPE_LOADING"> "unloading_appointment" : "false", "load_appointment" : "true", @@ -19,7 +19,7 @@ <#break> - <#case "APPOINTMENT_TYPE_RECEPTION"> + <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", "load_appointment" : "false", "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}", diff --git a/RPtoRFX_CarrierAppointmentUpdated.ftl b/RPtoRFX_CarrierAppointmentUpdated.ftl index 83bda83..51d3803 100644 --- a/RPtoRFX_CarrierAppointmentUpdated.ftl +++ b/RPtoRFX_CarrierAppointmentUpdated.ftl @@ -9,7 +9,7 @@ "payload" : { <#switch appointment.AppointmentType> - <#case "APPOINTMENT_TYPE_EXPEDITION"> + <#case "APPOINTMENT_TYPE_LOADING"> "unloading_appointment" : "false", "load_appointment" : "true", @@ -18,7 +18,7 @@ <#break> - <#case "APPOINTMENT_TYPE_RECEPTION"> + <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", "load_appointment" : "false", "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",