modif sur les rdz
This commit is contained in:
parent
c9050d837a
commit
1dcf91bf71
@ -8,11 +8,11 @@
|
|||||||
"TimeZone":"${time_zone_rfx}",
|
"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">
|
||||||
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
|
<#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,time_zone_rfx) />
|
<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />
|
||||||
<#else>
|
<#else>
|
||||||
<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
|
<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
|
||||||
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION>
|
<#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,time_zone_rfx) />
|
<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
|
||||||
<#else>
|
<#else>
|
||||||
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
|
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
|
||||||
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH>
|
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH>
|
||||||
@ -58,9 +58,9 @@
|
|||||||
<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
|
<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
|
||||||
"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
|
"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
|
||||||
<#else>
|
<#else>
|
||||||
<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_start_datetime?datetime.iso,time_zone_rfx) />
|
<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_start_datetime?datetime.iso) />
|
||||||
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
|
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
|
||||||
<#if duration >= 0>
|
<#if (duration >= 0) >
|
||||||
"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
|
"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
|
||||||
<#else>
|
<#else>
|
||||||
"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
|
"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
|
||||||
|
|||||||
@ -57,7 +57,7 @@
|
|||||||
<#else>
|
<#else>
|
||||||
<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_start_datetime?datetime.iso) />
|
<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_start_datetime?datetime.iso) />
|
||||||
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
|
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
|
||||||
<#if duration >= 0>
|
<#if (duration >= 0) >
|
||||||
"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
|
"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
|
||||||
<#else>
|
<#else>
|
||||||
"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
|
"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user