From a6262045f481ae2af96520e479dc1471d4a3aff0 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 23 Dec 2025 10:15:16 +0100
Subject: [PATCH] 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}",
 			</#if>
@@ -25,7 +25,7 @@
 		   </#if>
 		<#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" >
 		       </#if>
 				<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING>
@@ -35,10 +35,17 @@
 				</#if>
 			<#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" >
+		       </#if>
+				<#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>
 				<#else>
 					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
+					<#assign duration = 0 />
 				</#if>
 			</#if>
 		</#if>
@@ -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",
+				</#if>
 			</#if>
 		</#if>
 		"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" >
 		       </#if>
-
 				"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 			<#else>
 				<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
@@ -115,7 +125,12 @@
 		       		</#if>
 			   		"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" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					</#if>
 				</#if>
 			</#if>
 		}]