From c273754d49198ff0b73f9132a3d1388a92e9ce81 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 20 Nov 2025 10:11:22 +0100 Subject: [PATCH] RDV --- RFXtoRP_HsrCarrierApt.ftl | 4 +-- ...rCarrierApt_SiteForceUpdateAppointment.ftl | 25 +++++++------------ 2 files changed, 11 insertions(+), 18 deletions(-) rename RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl => RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl (51%) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 9c958ed..5ce6c6f 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -39,10 +39,10 @@ <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?size == carrier_apt.physical_receipt_list?filter(l ->l??)?size)> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCommissionsUpdated> <#-- à revoir--> + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceUpdateAppointment> <#-- à revoir--> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl"> + <#include "RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl"> } ] <#else> diff --git a/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl similarity index 51% rename from RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl rename to RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl index d77f769..677fd91 100644 --- a/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl @@ -5,23 +5,16 @@ "Header":{ "ProjectID": "${projectRP}" }, - "ID": { - "RefDate": { - "AuthorTimeZone": "${time_zone_rfx}", - "DateTime": "${creation_datetime}" - }, - <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> - "RefID": "${carrier_apt.appointment_reference?json_string}" + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> + "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}", <#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}" - + "AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", - }, - "Payload": { - "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", + + "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?size == carrier_apt.physical_receipt_list?filter(l ->l??)?size)> "Commissions": [ <#list carrier_apt.physical_receipt_list as physical_receipt> @@ -39,6 +32,6 @@ ] - } + } ] \ No newline at end of file