From 7ff859420a890cb70b0a143f145c38c166fdfaef Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Mon, 17 Nov 2025 17:31:23 +0100 Subject: [PATCH] modif sur les rdz --- ...P_HsrCarrierApt_ForceUpdateAppointment.ftl | 66 ------------------- ...HsrCarrierApt_SiteForceBookAppointment.ftl | 8 ++- ...rCarrierApt_SiteForceUpdateAppointment.ftl | 12 +++- 3 files changed, 16 insertions(+), 70 deletions(-) delete mode 100644 RFXtoRP_HsrCarrierApt_ForceUpdateAppointment.ftl diff --git a/RFXtoRP_HsrCarrierApt_ForceUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_ForceUpdateAppointment.ftl deleted file mode 100644 index 0bf5775..0000000 --- a/RFXtoRP_HsrCarrierApt_ForceUpdateAppointment.ftl +++ /dev/null @@ -1,66 +0,0 @@ -[ - { - "Header":{ - "ProjectID": "${projectRP}" - }, - "ActorID": "${carrier_apt.physical_depot}", - <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false"> - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION> - <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_unloading_end_datetime) /> - <#else> - <#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" > - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION> - <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> - <#else> - <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH> - <#assign duration = 0 /> <#-- à confirmer --> - <#else> - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> - <#assign duration = 0 /> <#-- à confirmer --> - - - - "ProjectID": "${projectRP}", - "TimeZone": "${time_zone_rfx}", - "AppointmentID": "${carrier_apt.appointment_reference}", - <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?size == lv.physical_receipt_list?filter(l ->l??)?size)> - "Commissions": [ - <#list carrier_apt.physical_receipt_list as physical_receipt> - { - "ActorID": "${carrier_apt.physical_depot}", - "OrderID": "${physical_receipt.physical_receipt_reference?json_string}", - "ProjectID": "${projectRP}", - "Quantities": [ - { - "UnitID": "PAL", <#-- à changer --> - "Value": 1 <#-- à changer --> - } - ] - }<#sep>, - - ], - - - "Slots": [{ - <#-- calcul de de la durée en fonction des start et end time--> - "DurationInSeconds": "${duration}", - <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false"> - "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" - <#else> - <#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true"> - "StartDateTime": "${carrier_apt.planned_load_start_datetime}" - <#else> - <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_load_start_datetime,time_zone_rfx) /> - <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#if duration >= 0> - "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" - <#else> - "StartDateTime": "${carrier_apt.planned_load_start_datetime}" - - - - - }] - } -] \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index f2b17d4..f9ad303 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -6,11 +6,17 @@ "ActorID": "${RPtoRFXprefixDepot("DPF")}", "AppointmentID": "${carrier_apt.appointment_reference?json_string}", "TimeZone":"${time_zone_rfx}", - <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false"> + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false"> + <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?starts_with("00")> + <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" > + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) /> <#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_end_datetime?starts_with("00")> + <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> <#else> diff --git a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl index 86a3422..ff542e2 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceUpdateAppointment.ftl @@ -8,11 +8,17 @@ "ProjectID": "${projectRP}" }, "ActorID": "${carrier_apt.physical_depot}", - <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false"> + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false"> + <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?starts_with("00")> + <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" > + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) /> <#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_end_datetime?starts_with("00")> + <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> <#else> @@ -20,8 +26,8 @@ <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH> <#assign duration = 0 /> <#-- à confirmer --> <#else> - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> - <#assign duration = 0 /> <#-- à confirmer --> + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> + <#assign duration = 0 /> <#-- à confirmer -->