From 420d1cd0efdc5b141291751e8a713fca9c9c596a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 10:28:09 +0100 Subject: [PATCH 01/30] RDV --- RFXtoRP_HsrPrepa.ftl | 3 +-- ...xecutionflowMetaDataUpdatedToConfigure.ftl | 27 +++++++++++++++++++ ..._HsrPrepa_ExecutionflowMetadataUpdated.ftl | 10 +++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl create mode 100644 RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 6aa54a2..57fcfcc 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -27,14 +27,13 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl"> }, + <#include "RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl"> { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> } - <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!=""> , { diff --git a/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl b/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl new file mode 100644 index 0000000..3cf29a6 --- /dev/null +++ b/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl @@ -0,0 +1,27 @@ +<#-- +{ + "Header": { + "ProjectID": "${projectRP}" + }, + "ID":{ + "RefID": "${Your_Object_ID}" + }, + "Payload":{ + "MetaData": [ + { + "Key": "string", + "Value": { + "Bool": "true / false", + "Float": 3.1415, + "Int": 42, + "String": "Hello World !", + "Timestamp": { + "AuthorTimeZone": "Europe/Paris", + "DateTime": "2023-01-01T00:00:00Z" + } + } + } + ] + } +} +--> \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl b/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl new file mode 100644 index 0000000..057dc06 --- /dev/null +++ b/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl @@ -0,0 +1,10 @@ + <#-- A décommenter si besoin de les utiliser--> + <#-- Uncomment if you need to use them--> +<#-- +{ + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowMetaDataUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl"> +}, +--> \ No newline at end of file From 82c4aea28e3c1a469369c4cd2eaa58e128696621 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 11:30:31 +0100 Subject: [PATCH 02/30] RDV --- RPtoRFX_AppointmentEvent.ftl | 28 ++++++++++--------- ...mentPhysicalReceiptAssociationByNumber.ftl | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 21be0c7..65a2015 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -28,19 +28,21 @@ <#assign appointment = eventRP.data /> [ <#if eventRP.appointmentCustomFields?has_content> - { - <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> - "apiRestReflexID" : "${apiRestReflexID}", - "datas" : - <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl"> - } - <#else> - { - <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref> - "apiRestReflexID" : "${apiRestReflexID}", - "datas" : - <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> - } + <#list eventRP.executionflowCustomFields as commission> + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl"> + } + <#else> + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> + } + ] <#break> diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl index 3a6ba80..9d8f372 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl @@ -12,7 +12,7 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [ - <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> + <#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> { "receipt_activity": "${custom.value.activity_code?json_string}", "originator_code": "${custom.value.originator_code?json_string}", From a661bcc5e693d171a41360aa24d01021e8e6850b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 15:09:49 +0100 Subject: [PATCH 03/30] RDV --- RPtoRFX_AppointmentEvent.ftl | 4 ++-- ...X_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 65a2015..20fc7b8 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -28,7 +28,7 @@ <#assign appointment = eventRP.data /> [ <#if eventRP.appointmentCustomFields?has_content> - <#list eventRP.executionflowCustomFields as commission> + { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> "apiRestReflexID" : "${apiRestReflexID}", @@ -42,7 +42,7 @@ "datas" : <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> } - + ] <#break> diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl index 9d8f372..3a6ba80 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl @@ -12,7 +12,7 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [ - <#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> + <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> { "receipt_activity": "${custom.value.activity_code?json_string}", "originator_code": "${custom.value.originator_code?json_string}", From 6ae403817f4e0e075eb57eba3262321ccf96b550 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 15:28:42 +0100 Subject: [PATCH 04/30] RDV --- ReflexUtils.ftl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index 6b4231a..ef916e9 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -5,6 +5,11 @@ <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)> +<#function RfxDateTimetoUTCWithTimezone rfxdatetime timezone> + <#setting time_zone=timezone> + <#return (rfxdatetime?datetime.iso?iso_utc)> + + <#function DateTimeUTCtoRfxLocale dateutc locale > <#return dateutc?datetime.iso?iso_nz(locale)> @@ -16,14 +21,14 @@ <#assign timeInMilliseconds = (1000 * seconds) > <#assign aDate = date?long + timeInMilliseconds> <#return aDate?number_to_datetime> - + <#-- -------------------------------------------------------------------------------------------- --> <#-- Duration between two datetimes in second --> <#-- -------------------------------------------------------------------------------------------- --> <#function DurationBetweenTwoDatetimeInSeconds startDate endDate> <#return (endDate?long - startDate?long) / 1000 > - + <#-- --------------------------------------------------------------------------------------- --> <#-- Split email HARDIS WMS into json array string --> From 4faf7a37532292243773daf3c9f3707a28a7ae9e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 15:35:21 +0100 Subject: [PATCH 05/30] RDV --- ReflexUtils.ftl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index ef916e9..4e183d5 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -5,11 +5,6 @@ <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)> -<#function RfxDateTimetoUTCWithTimezone rfxdatetime timezone> - <#setting time_zone=timezone> - <#return (rfxdatetime?datetime.iso?iso_utc)> - - <#function DateTimeUTCtoRfxLocale dateutc locale > <#return dateutc?datetime.iso?iso_nz(locale)> From 72143d38bdea96b8f977d07d5d7c1ac723f83b0b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 15:48:26 +0100 Subject: [PATCH 06/30] RDV --- RPtoRFX_AppointmentEvent.ftl | 2 -- RPtoRFX_CarrierAppointmentCreated.ftl | 22 ++++++++++++----- ..._CarrierAppointmentSlotUpdatedByNumber.ftl | 20 ++++++++++++---- ...RFX_CarrierAppointmentSlotUpdatedByRef.ftl | 24 +++++++++++++------ 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 20fc7b8..9123321 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -28,7 +28,6 @@ <#assign appointment = eventRP.data /> [ <#if eventRP.appointmentCustomFields?has_content> - { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> "apiRestReflexID" : "${apiRestReflexID}", @@ -42,7 +41,6 @@ "datas" : <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> } - ] <#break> diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 017cee7..a3d7c03 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -12,15 +12,25 @@ <#case "APPOINTMENT_TYPE_LOADING"> "unloading_appointment" : "false", "load_appointment" : "true", - "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)}", - <#break> + <#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)}", + <#if> + <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", "load_appointment" : "false", - "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#break> + <#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,appointment.TimeZone),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#if> + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl index efd5dfc..b7bf4fc 100644 --- a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl @@ -13,15 +13,25 @@ <#case "APPOINTMENT_TYPE_LOADING"> "unloading_appointment" : "false", "load_appointment" : "true", - "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)}", + <#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)}", + <#if> <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", "load_appointment" : "false", - "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)}", - <#break> + <#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,appointment.TimeZone),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#if> + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl index b7f102d..bc3f95d 100644 --- a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl +++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl @@ -12,15 +12,25 @@ <#case "APPOINTMENT_TYPE_LOADING"> "unloading_appointment" : "false", "load_appointment" : "true", - "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)}", - <#break> - <#case "APPOINTMENT_TYPE_UNLOADING"> + <#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)}", + <#if> + <#break> + <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", "load_appointment" : "false", - "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)}", - <#break> + <#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,appointment.TimeZone),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#if> + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > From c0bec9085bb4b1e0f638b00a78b8cdcb622c33d2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 15:50:33 +0100 Subject: [PATCH 07/30] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 4 ++-- RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl | 4 ++-- RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index a3d7c03..0f4df5a 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -27,8 +27,8 @@ "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,appointment.TimeZone),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + "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)}", <#if> <#break> <#default> diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl index b7bf4fc..0d13306 100644 --- a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl @@ -28,8 +28,8 @@ "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,appointment.TimeZone),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + "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)}", <#if> <#break> <#default> diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl index bc3f95d..74bec59 100644 --- a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl +++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl @@ -27,8 +27,8 @@ "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,appointment.TimeZone),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + "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)}", <#if> <#break> <#default> From 613cfcd3774e4167f6908e734d3dd5db443ebc63 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 15:54:53 +0100 Subject: [PATCH 08/30] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 4 ++-- RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl | 4 ++-- RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 0f4df5a..01ab606 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -18,7 +18,7 @@ <#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)}", - <#if> + <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", @@ -29,7 +29,7 @@ <#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)}", - <#if> + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl index 0d13306..0167ef9 100644 --- a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl @@ -19,7 +19,7 @@ <#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)}", - <#if> + <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", @@ -30,7 +30,7 @@ <#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)}", - <#if> + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl index 74bec59..9c4189f 100644 --- a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl +++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl @@ -18,7 +18,7 @@ <#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)}", - <#if> + <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", @@ -29,7 +29,7 @@ <#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)}", - <#if> + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > From a3fc98c8d9a881cab435519ecb80de1961da9a68 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 16:07:50 +0100 Subject: [PATCH 09/30] RDV --- RPtoRFX_AppointmentEvent.ftl | 2 ++ ...RFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl | 2 +- RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 9123321..38e0f9f 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -28,6 +28,7 @@ <#assign appointment = eventRP.data /> [ <#if eventRP.appointmentCustomFields?has_content> + <#list eventRP.executionflowCustomFields as commission> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> "apiRestReflexID" : "${apiRestReflexID}", @@ -41,6 +42,7 @@ "datas" : <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> } + ] <#break> diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl index 3a6ba80..9d8f372 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl @@ -12,7 +12,7 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [ - <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> + <#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> { "receipt_activity": "${custom.value.activity_code?json_string}", "originator_code": "${custom.value.originator_code?json_string}", diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl index e5b91cf..3185e63 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl @@ -11,7 +11,7 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [ - <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> + <#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> { "receipt_activity": "${custom.value.activity_code?json_string}", "originator_code": "${custom.value.originator_code?json_string}", From 369a8b7e1050aa2b16338b5878a0e2c4dbfe3594 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 16:23:47 +0100 Subject: [PATCH 10/30] RDV --- RPtoRFX_AppointmentEvent.ftl | 3 ++- ...ppointmentPhysicalReceiptAssociationByNumber.ftl | 13 +++++-------- ...erAppointmentPhysicalReceiptAssociationByRef.ftl | 13 +++++-------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 38e0f9f..a84f8d6 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -28,7 +28,7 @@ <#assign appointment = eventRP.data /> [ <#if eventRP.appointmentCustomFields?has_content> - <#list eventRP.executionflowCustomFields as commission> + <#list eventRP.executionflowCustomFields.entrySet()(l ->l.value?? && l.value?has_content) as commission> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> "apiRestReflexID" : "${apiRestReflexID}", @@ -42,6 +42,7 @@ "datas" : <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> } + <#sep>, ] diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl index 9d8f372..c992b1f 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl @@ -12,16 +12,13 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [ - <#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> { - "receipt_activity": "${custom.value.activity_code?json_string}", - "originator_code": "${custom.value.originator_code?json_string}", - "physical_receipt_reference": "${custom.value.reference?json_string}", - "receipt_year": "${custom.value.order_year?json_string}", - "receipt_number": "${custom.value.order_number?json_string}" + "receipt_activity": "${commission.value.activity_code?json_string}", + "originator_code": "${commission.value.originator_code?json_string}", + "physical_receipt_reference": "${commission.value.reference?json_string}", + "receipt_year": "${commission.value.order_year?json_string}", + "receipt_number": "${commission.value.order_number?json_string}" } - <#sep>, - ] <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl index 3185e63..1ec4382 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl @@ -11,16 +11,13 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [ - <#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> { - "receipt_activity": "${custom.value.activity_code?json_string}", - "originator_code": "${custom.value.originator_code?json_string}", - "physical_receipt_reference": "${custom.value.reference?json_string}", - "receipt_year": "${custom.value.order_year?json_string}", - "receipt_number": "${custom.value.order_number?json_string}" + "receipt_activity": "${commission.value.activity_code?json_string}", + "originator_code": "${commission.value.originator_code?json_string}", + "physical_receipt_reference": "${commission.value.reference?json_string}", + "receipt_year": "${commission.value.order_year?json_string}", + "receipt_number": "${commission.value.order_number?json_string}" } - <#sep>, - ] <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> From 3bd0cd26fdf0854fe8acc7d026637607133766d9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 16:27:11 +0100 Subject: [PATCH 11/30] RDV --- RPtoRFX_AppointmentEvent.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index a84f8d6..7c339d1 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -28,7 +28,7 @@ <#assign appointment = eventRP.data /> [ <#if eventRP.appointmentCustomFields?has_content> - <#list eventRP.executionflowCustomFields.entrySet()(l ->l.value?? && l.value?has_content) as commission> + <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as commission> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> "apiRestReflexID" : "${apiRestReflexID}", From 249f9e3fbec990c571eb17d42525a2e1475bd8de Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 16:33:31 +0100 Subject: [PATCH 12/30] RDV --- RPtoRFX_AppointmentEvent.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 7c339d1..0ee48cc 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -27,8 +27,8 @@ <#case "CommissionsUpdated"> <#assign appointment = eventRP.data /> [ - <#if eventRP.appointmentCustomFields?has_content> <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as commission> + <#if eventRP.appointmentCustomFields?has_content> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> "apiRestReflexID" : "${apiRestReflexID}", @@ -42,9 +42,9 @@ "datas" : <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> } + <#sep>, - ] <#break> <#-- *********************************************** Action = SlotUpdated ******************** --> From 3a7cfb555fa4556885332fb4fbbf957759f4a857 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 09:33:10 +0100 Subject: [PATCH 13/30] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 01ab606..2a8b709 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -57,8 +57,6 @@ <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> <#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!=""> - "appointment_designation":"LOADING", - <#else> "appointment_designation":"${(appointment.Reason!"")?json_string}", From a6262045f481ae2af96520e479dc1471d4a3aff0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 10:15:16 +0100 Subject: [PATCH 14/30] RDV --- ...HsrCarrierApt_SiteForceBookAppointment.ftl | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index 1d1db08..d6a86b9 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -8,7 +8,7 @@ "AppointmentID": "${carrier_apt.appointment_reference?json_string}", <#else> <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> - "AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", + "AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.appointment_reference?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo --> <#else> "AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", @@ -25,7 +25,7 @@ <#else> <#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" > - <#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-")> + <#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_LOADING> @@ -35,10 +35,17 @@ <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#stop "Not managed"> + <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> + <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> + <#if (duration <= 0)> + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#else> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> - <#assign duration = 0 /> <#-- à confirmer --> + <#assign duration = 0 /> @@ -93,10 +100,14 @@ <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> } ], - <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> - "Reason": "${carrier_apt.appointment_designation?json_string}", + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + "Reason": "LOAD AND UNLOADING+" "+${carrier_apt.appointment_designation?json_string}", <#else> - "Reason": "No commission", + <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> + "Reason": "${carrier_apt.appointment_designation?json_string}", + <#else> + "Reason": "No commission", + "Slots": [{ @@ -106,7 +117,6 @@ <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")> <#stop "planned_unloading_start_datetime field of appointmend is not initialized" > - "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" <#else> <#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true"> @@ -115,7 +125,12 @@ "StartDateTime": "${carrier_apt.planned_load_start_datetime}" <#else> - <#stop "Not managed"> + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")> + <#stop "planned_unloading_start_datetime field of appointmend is not initialized" > + + "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" + }] From ce415efc4e3977eb0b15e0c3fb5dac6f3790bf03 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 10:30:55 +0100 Subject: [PATCH 15/30] RDV --- RFXtoRP_HsrCarrierApt.ftl | 2 +- RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl | 12 ++++++------ RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl | 10 +++++++++- RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl | 14 ++++++++++++-- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index e957ae1..e33ddd1 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -120,7 +120,7 @@ } ] <#else> - <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)> + <#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 !="true")> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index d6a86b9..f7b6062 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -37,12 +37,12 @@ <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > - - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> - <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> - <#if (duration <= 0)> - <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > - + + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> + <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> + <#if (duration <= 0)> + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#else> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> <#assign duration = 0 /> diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl index d175b83..99ed590 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl @@ -35,7 +35,15 @@ <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#stop "Not managed"> + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> + <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> + <#if (duration <= 0)> + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#else> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> <#assign duration = 0 /> <#-- à confirmer --> diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl index ba02b47..4c5b120 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl @@ -35,7 +35,14 @@ <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#stop "Not managed"> + <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> + <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> + <#if (duration <= 0)> + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#else> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> <#assign duration = 0 /> <#-- à confirmer --> @@ -58,7 +65,10 @@ "StartDateTime": "${carrier_apt.planned_load_start_datetime}" <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#stop "Not managed"> + <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")> + <#stop "planned_unloading_start_datetime field of appointmend is not initialized" > + + "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" From 6e4cc5549a40fe2fe632bbbc5e6624b8b6597764 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 11:12:41 +0100 Subject: [PATCH 16/30] RDV --- RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index f7b6062..3bb1d11 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -101,7 +101,7 @@ } ], <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - "Reason": "LOAD AND UNLOADING+" "+${carrier_apt.appointment_designation?json_string}", + "Reason": "LOAD AND UNLOADING ${carrier_apt.appointment_designation?json_string}", <#else> <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> "Reason": "${carrier_apt.appointment_designation?json_string}", From 481bbcb1afcd305779f5d1b79c2311a1e770aa49 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 11:31:35 +0100 Subject: [PATCH 17/30] RDV --- RFXtoRP_HsrCarrierApt.ftl | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index e33ddd1..a5f1225 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -120,24 +120,26 @@ } ] <#else> - <#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 !="true")> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl"> - } - ] - <#else> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl"> - } - ] + <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) > + <#if carrier_apt.unloading_appointment !="true" && carrier_apt.load_appointment !="true"> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl"> + } + ] + <#else> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl"> + } + ] + From 7d0d4d55388c3ed331ddf53cc1f269f7c70719ae Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 11:38:32 +0100 Subject: [PATCH 18/30] RDV --- RFXtoRP_HsrCarrierApt.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index a5f1225..8583b6b 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -121,7 +121,7 @@ ] <#else> <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) > - <#if carrier_apt.unloading_appointment !="true" && carrier_apt.load_appointment !="true"> + <#if (carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true")> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> From f81591371faca486b1aea09e69c25c58516ed868 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 11:43:58 +0100 Subject: [PATCH 19/30] RDV --- RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl index 99ed590..8e424ff 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl @@ -36,17 +36,18 @@ <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > - <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > - - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> - <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> - <#if (duration <= 0)> - <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> + <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> + <#if (duration <= 0)> + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + + <#else> + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> + <#assign duration = 0 /> <#-- à confirmer --> - <#else> - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> - <#assign duration = 0 /> <#-- à confirmer --> From fad0c31ae822b0f95d526b6b052b9ea8e39da8ae Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 11:52:49 +0100 Subject: [PATCH 20/30] RDV --- RFXtoRP_HsaLstCarSta.ftl | 2 +- RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaLstCarSta.ftl b/RFXtoRP_HsaLstCarSta.ftl index a8aa244..48408f3 100644 --- a/RFXtoRP_HsaLstCarSta.ftl +++ b/RFXtoRP_HsaLstCarSta.ftl @@ -19,7 +19,7 @@ <#-- *********************************************** Action = Update ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)> - <#if !carrier_apt_status.status??> + <#if !carrier_apt_status.status?? || (carrier_apt_status.appointment_year_number!=)> <#stop 'the updated appointment Status not initialized'> [ diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index 3bb1d11..34d6cf6 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -101,7 +101,7 @@ } ], <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - "Reason": "LOAD AND UNLOADING ${carrier_apt.appointment_designation?json_string}", + "Reason": "LOAD AND UNLOADING / ${carrier_apt.appointment_designation?json_string}", <#else> <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> "Reason": "${carrier_apt.appointment_designation?json_string}", From f1b0d1a5d45c37f1b23a52b6bb726b9421ed5f79 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 11:53:50 +0100 Subject: [PATCH 21/30] RDV --- RFXtoRP_HsaLstCarSta.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaLstCarSta.ftl b/RFXtoRP_HsaLstCarSta.ftl index 48408f3..70854ab 100644 --- a/RFXtoRP_HsaLstCarSta.ftl +++ b/RFXtoRP_HsaLstCarSta.ftl @@ -19,7 +19,7 @@ <#-- *********************************************** Action = Update ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)> - <#if !carrier_apt_status.status?? || (carrier_apt_status.appointment_year_number!=)> + <#if !carrier_apt_status.status?? || carrier_apt_status.appointment_year_number==0> <#stop 'the updated appointment Status not initialized'> [ From c352775cd4287ba9cd7dd4b10701047ff8057312 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 11:54:02 +0100 Subject: [PATCH 22/30] RDV --- RFXtoRP_HsaLstCarSta.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaLstCarSta.ftl b/RFXtoRP_HsaLstCarSta.ftl index 70854ab..ce11a5d 100644 --- a/RFXtoRP_HsaLstCarSta.ftl +++ b/RFXtoRP_HsaLstCarSta.ftl @@ -20,7 +20,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)> <#if !carrier_apt_status.status?? || carrier_apt_status.appointment_year_number==0> - <#stop 'the updated appointment Status not initialized'> + <#stop > [ { From b14e6c21ffc0f94d4e4bfb12e8a76f5d09eb976e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 12:03:15 +0100 Subject: [PATCH 23/30] RDV --- RFXtoRP_HsrCarrierApt.ftl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 8583b6b..45ed0a0 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -130,16 +130,16 @@ <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl"> } ] - <#else> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl"> - } - ] - + + <#else> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl"> + } + ] From 861cd70eb95f9e5b3550180dc20f49c9b355659e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 12:11:23 +0100 Subject: [PATCH 24/30] RDV --- RFXtoRP_HsrCarrierApt.ftl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 45ed0a0..18f932d 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -120,8 +120,7 @@ } ] <#else> - <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) > - <#if (carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true")> + <#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"))> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> @@ -130,7 +129,6 @@ <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl"> } ] - <#else> [ { From e1d6e3ca3fdbe23316ad2a2b89cd262d8bfcc39b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 13:56:04 +0100 Subject: [PATCH 25/30] RDV --- RFXtoRP_HsrCarrierApt.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 18f932d..274a5f5 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -24,12 +24,12 @@ "datas" : <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl"> }, - { + <#-- { <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl"> - }, + }, --> { <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 51b5fd7d1733462620ad62fba09492f21a032b44 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 13:59:33 +0100 Subject: [PATCH 26/30] RDV --- RFXtoRP_HsrCarrierApt.ftl | 6 ----- ...rCarrierApt_AppointmentCarrierExpected.ftl | 26 ------------------- 2 files changed, 32 deletions(-) delete mode 100644 RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 274a5f5..0a7bf34 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -24,12 +24,6 @@ "datas" : <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl"> }, - <#-- { - <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl"> - }, --> { <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", diff --git a/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl b/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl deleted file mode 100644 index 13bc369..0000000 --- a/RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl +++ /dev/null @@ -1,26 +0,0 @@ -[ - <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) /> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> - "RefID": "${carrier_apt.appointment_reference?json_string}", - <#else> - <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> - "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", - <#else> - "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", - - - "RefDate": { - "DateTime": "${ref_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload":{ - "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" - } - } -] \ No newline at end of file From b361f1fcf79294f1f0fec1b0c8b7b740a841d48d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 14:54:53 +0100 Subject: [PATCH 27/30] RDV --- ...RFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl | 2 +- RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl index c992b1f..fd9e237 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl @@ -22,7 +22,7 @@ ] <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> - "appointment_designation":"LOADING" + "appointment_designation":"${appointment.Reason!""?json_string}" diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl index 1ec4382..223b1cb 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl @@ -21,7 +21,7 @@ ] <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> - "appointment_designation":"LOADING" + "appointment_designation":"${appointment.Reason!""?json_string}" From f66912121ea3ea62bffbc25696fe260d40d61b19 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 15:17:25 +0100 Subject: [PATCH 28/30] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 2a8b709..7911b33 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -56,9 +56,7 @@ <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> - <#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!=""> "appointment_designation":"${(appointment.Reason!"")?json_string}", - From e1b1b8ad2dfb35e3fc03f5551e9ae8fa0e3738a6 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 15:23:43 +0100 Subject: [PATCH 29/30] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 7911b33..01ab606 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -56,7 +56,11 @@ <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> + <#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!=""> + "appointment_designation":"LOADING", + <#else> "appointment_designation":"${(appointment.Reason!"")?json_string}", + From 44a4f5f0ccedf9fdaf57b597f548f9020d6f53e9 Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Tue, 23 Dec 2025 15:37:44 +0100 Subject: [PATCH 30/30] Release 2.0.15+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9441ead..58f7c54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.15+1 +2.0.15+2