From 7579ff4e68caab770ab2d1e0fbea64951422ca5b Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 23 Dec 2025 14:05:16 +0100
Subject: [PATCH] RDV

---
 RFXtoRP_HsrCarrierApt.ftl                     | 24 +++++-------
 ...HsrCarrierApt_SiteForceBookAppointment.ftl | 38 +++++++++++++------
 RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl   | 32 ++++++++++------
 ...RP_HsrCarrierApt_UpdateSlotAppointment.ftl | 14 ++++++-
 4 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl
index e957ae1..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}",
@@ -120,15 +114,15 @@
                     }
                   ]
                   <#else>
-                    <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
-                    [
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
-                      }
-                    ]
+                    <#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>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
+                        }
+                      ]
                     <#else>
                     [
                       {
diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index 34a0b14..34d6cf6 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>
@@ -76,11 +83,10 @@
 					"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 					<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
 						"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-						"ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
 					<#else>
-						"OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
-						"ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
+						"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
 					</#if>
+					"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 					"ProjectID": "${projectRP}",
 		            <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}<#sep>,</#sep>
@@ -94,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": [{
@@ -107,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">
@@ -116,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>
 		}]
diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
index 0517881..8e424ff 100644
--- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
@@ -35,10 +35,19 @@
 				</#if>
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#stop "Not managed">
-				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
+					<#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" >
+						</#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 -->
+					</#if>
 				</#if>
 			</#if>
 		</#if>
@@ -70,14 +79,13 @@
 			<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
 			{
 				"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-			<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
-				"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-				"ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
-			<#else>
-				"OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
-				"ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
-			</#if>
-					"ProjectID": "${projectRP}"
+				<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
+					"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
+				<#else>
+					"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+				</#if>
+				"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
+				"ProjectID": "${projectRP}"
 			}<#sep>,</#sep>
 			</#list>
 			],
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 @@
 				</#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 -->
@@ -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" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 				</#if>
 			</#if>
 		</#if>