diff --git a/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl b/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl index bedbcc1..923692c 100644 --- a/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl +++ b/RFXtoRP_HsrCarrierApt_AppointmentCommissionsUpdated.ftl @@ -7,11 +7,11 @@ }, "ID": { "RefDate": { - "AuthorTimeZone": "${time_zone_rfx}", - "DateTime": "${creation_datetime}" + "AuthorTimeZone": "${time_zone_rfx}", + "DateTime": "${creation_datetime}" }, <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> - "RefID": "${carrier_apt.appointment_reference?json_string}", + "RefID": "${carrier_apt.appointment_reference?json_string}", <#else> <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", diff --git a/RPtoRFX_CarrierAppointment.ftl b/RPtoRFX_CarrierAppointment.ftl index 1ed35dd..1ec5c55 100644 --- a/RPtoRFX_CarrierAppointment.ftl +++ b/RPtoRFX_CarrierAppointment.ftl @@ -8,29 +8,29 @@ "payload" : { "appointment_reference": "${eventRP.refid?json_string}", - + <#switch appointment.AppointmentType> <#case "APPOINTMENT_TYPE_EXPEDITION"> - "unloading_appointment" : "false", - "load_appointment" : "true", - "planned_load_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}", - "planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime,appointment.Slot.DurationInSeconds)?iso_nz(time_zone_rfx)}" + "unloading_appointment" : "false", + "load_appointment" : "true", + "planned_load_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}", + "planned_load_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime,appointment.Slot.DurationInSeconds)?iso_nz(time_zone_rfx)}" <#break> - + <#case "APPOINTMENT_TYPE_RECEPTION"> - "unloading_appointment" : "true", - "load_appointment" : "false", - "planned_unloading_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime?iso_nz(time_zone_rfx)}", - "planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime,appointment.Slot.DurationInSeconds)?iso_nz(time_zone_rfx)}" + "unloading_appointment" : "true", + "load_appointment" : "false", + "planned_unloading_start_datetime : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime?iso_nz(time_zone_rfx))}", + "planned_unloading_end_datetime": "${AddSecondsToDatetime(appointment.Slot.StartDateTime,appointment.Slot.DurationInSeconds)?iso_nz(time_zone_rfx)}" <#break> <#default> <#stop "appointment.AppointmentType not implemented" > - - + + "planned_carrier" : "${appointment.CarrierName?json_string}", - + <#if appointment.Commissions??> "physical_receipt_list": [ <#list appointment.Commissions as commission> @@ -69,7 +69,7 @@ ], "constant_appointment": "false" - + } }