RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl

@@ -7,9 +7,9 @@
         "ID": {
         <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"RefID": "${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>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">

RFXtoRP_HsrCarrierApt_CarrierArrived.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl

@@ -7,15 +7,15 @@
         "ID": {
            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl

@@ -7,15 +7,15 @@
         "ID": {
            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_LoadingStarted.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl

@@ -1,19 +1,15 @@
 <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
 [
   {
-    <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-			"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
-		<#else>
-			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
-		</#if>
-	<#else>
-		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+    <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
 			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
 		<#else>
-			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			<#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>
+				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+			</#if>
 		</#if>
-	</#if>
     "Header": {
       "ProjectID": "${projectRP}"
     },

RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl

@@ -6,9 +6,9 @@
 		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${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.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">

RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${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 -->
+                    "AppointmentID": "${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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl

@@ -7,15 +7,15 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${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 -->
+                    "AppointmentID": "${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>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl

@@ -7,9 +7,9 @@
         },
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${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.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">

RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl

@@ -6,9 +6,9 @@
         },
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${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.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
@@ -75,7 +75,7 @@
 					"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
 					<#else>
 						<#stop "Appointment type not supported" >
-					</#if>
+					</#if>	
 			</#if>
 		</#if>
 		}]

VERSION

@@ -1 +1 @@
-2.0.18+2
+2.0.18+1