From 7a46793fe77ce214e46feb666640d01973b37dcb Mon Sep 17 00:00:00 2001 From: Laure Pascal Date: Wed, 6 Sep 2023 15:13:47 +0200 Subject: [PATCH] Format date from Reflex --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 4 +--- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- ...RP_HsaProStatus_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 2 +- RFXtoRP_HsaProStatus_TransportStarted.ftl | 2 +- RFXtoRP_HsrPrepa_TransportStarted.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 9 ++++++++- RFXtoRP_HsrPro_PreparationCompleted.ftl | 2 +- RFXtoRP_HsrPro_PreparationExpected.ftl | 20 ------------------- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 8 ++++---- RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 3 ++- ...P_HsrReciptList_ExecutionflowCancelled.ftl | 12 ----------- 16 files changed, 25 insertions(+), 51 deletions(-) delete mode 100644 RFXtoRP_HsrPro_PreparationExpected.ftl delete mode 100644 RFXtoRP_HsrReciptList_ExecutionflowCancelled.ftl diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 1c473bf..53a2efd 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -2,7 +2,7 @@ <#include "ReflexUtils.ftl"> [ <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) /> - + <#assign priority_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_priority_datetime,time_zone_offset_rfx) /> { "Header": { "ProjectID": "${projectRP}" @@ -21,12 +21,10 @@ "Goods": { "ItemID": "${reflexMvtStockInterface.item_code}", "LVBranchID": "${reflexMvtStockInterface.lv_code}", - <#assign priority_date = "${Default_date}"?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> - }, "ExecutionflowID": "R-${reflexMvtStockInterface.receipt_year_number}-${reflexMvtStockInterface.receipt_number}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index e9bf2bd..089a70a 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -14,7 +14,7 @@ "410":"STOCK_MOVEMENT_TYPE_FIX", "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}> <#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) /> -<#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc /> +<#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc /> [ { diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index adb35f5..847ec8a 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -1,7 +1,7 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> +<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> -<#assign preparation_status_datetime = preparationStatusInterface.preparation_status_datetime?datetime(rfx_date_format_default)?iso_utc /> [ { "Header": { diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index e53c45e..110b7f6 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = preparationStatusInterface.preparation_status_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index e53c45e..110b7f6 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = preparationStatusInterface.preparation_status_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index e53c45e..110b7f6 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = preparationStatusInterface.preparation_status_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index e53c45e..110b7f6 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = preparationStatusInterface.preparation_status_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsrPrepa_TransportStarted.ftl b/RFXtoRP_HsrPrepa_TransportStarted.ftl index ca326ef..6075737 100644 --- a/RFXtoRP_HsrPrepa_TransportStarted.ftl +++ b/RFXtoRP_HsrPrepa_TransportStarted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> [ <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> { diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index 503df5e..bac9ea4 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -1,10 +1,17 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#assign preparation_status_datetime = RfxDateTimetoUTC(order.modification_datetime,time_zone_offset_rfx) /> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${order.originator_reference}" + "RefID": "${order.originator_reference}", + "RefDate": { + "DateTime": "${preparation_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } }, "Payload": { } diff --git a/RFXtoRP_HsrPro_PreparationCompleted.ftl b/RFXtoRP_HsrPro_PreparationCompleted.ftl index b78bb03..4cfb270 100644 --- a/RFXtoRP_HsrPro_PreparationCompleted.ftl +++ b/RFXtoRP_HsrPro_PreparationCompleted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = order.confirmation_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign preparation_status_datetime = RfxDateTimetoUTC(order.confirmation_datetime,time_zone_offset_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsrPro_PreparationExpected.ftl b/RFXtoRP_HsrPro_PreparationExpected.ftl deleted file mode 100644 index 9a8755b..0000000 --- a/RFXtoRP_HsrPro_PreparationExpected.ftl +++ /dev/null @@ -1,20 +0,0 @@ -<#include "HfRpConfig.ftl"> -<#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = order.creation_datetime?datetime(rfx_date_format_default)?iso_utc /> -[ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${order.originator_reference}", - "RefDate": { - "DateTime": "${preparation_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - - "Payload": {} - - } -] diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 8cabd47..e294ccf 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = receipt.modification_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) /> [ { diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index bb6050e..2531f21 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -38,6 +38,7 @@ + <#if receipt.line_list??> "Lines" : [ <#list receipt.line_list as line> { @@ -55,13 +56,11 @@ <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${line_without_detail_priority_date}", - - <#-- Line Segmentation Keys inclusion --> - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineSegmentationKeys.ftl"> - <#else> <#stop "line with detail"> + <#-- Line Segmentation Keys inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineSegmentationKeys.ftl"> }, "Quantity" : { @@ -74,6 +73,7 @@ <#sep>, ], + "RequestedMilestones" : { diff --git a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl index 64a33f1..3d36bb1 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = receipt.confirmation_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 5120310..823866d 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -1,6 +1,7 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = receipt.creation_datetime?datetime(rfx_date_format_default)?iso_utc /> +<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) /> + [ { "Header": { diff --git a/RFXtoRP_HsrReciptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReciptList_ExecutionflowCancelled.ftl deleted file mode 100644 index 503df5e..0000000 --- a/RFXtoRP_HsrReciptList_ExecutionflowCancelled.ftl +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${order.originator_reference}" - }, - "Payload": { - } - } -]