modif trim

This commit is contained in:
Laurie MONTANT 2024-12-02 16:03:45 +01:00
parent e41309e744
commit f5e6c2b22e
2 changed files with 37 additions and 18 deletions

View File

@ -9,14 +9,13 @@
"ID": {
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
<#else>
<#stop "preparation order list is empty" >
</#if>
<#else>
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?trim?json_string}${dispute.dispute_reception.reception_activity_code?trim?json_string}${dispute.dispute_reception.reception_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
</#if>
</#if>
},

View File

@ -6,11 +6,15 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#if dispute.dispute_preparation??>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
<#else>
<#stop "preparation order list is empty" >
</#if>
<#else>
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?trim?json_string}${dispute.dispute_reception.reception_activity_code?trim?json_string}${dispute.dispute_reception.reception_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
</#if>
</#if>
},
@ -32,11 +36,15 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#if dispute.dispute_preparation??>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
<#else>
<#stop "preparation order list is empty" >
</#if>
<#else>
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?trim?json_string}${dispute.dispute_reception.reception_activity_code?trim?json_string}${dispute.dispute_reception.reception_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
</#if>
</#if>
},
@ -50,11 +58,15 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#if dispute.dispute_preparation??>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
<#else>
<#stop "preparation order list is empty" >
</#if>
<#else>
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?trim?json_string}${dispute.dispute_reception.reception_activity_code?trim?json_string}${dispute.dispute_reception.reception_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
</#if>
</#if>
},
@ -68,11 +80,15 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#if dispute.dispute_preparation??>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
<#else>
<#stop "preparation order list is empty" >
</#if>
<#else>
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?trim?json_string}${dispute.dispute_reception.reception_activity_code?trim?json_string}${dispute.dispute_reception.reception_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
</#if>
</#if>
},
@ -86,11 +102,15 @@
"ProjectID": "${projectRP}"
},
"ID": {
<#if dispute.dispute_preparation??>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
<#if dispute.dispute_preparation??>
<#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0>
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
<#else>
<#stop "preparation order list is empty" >
</#if>
<#else>
<#if dispute.dispute_reception??>
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?trim?json_string}${dispute.dispute_reception.reception_activity_code?trim?json_string}${dispute.dispute_reception.reception_contractor_code?trim?json_string}${dispute.dispute_year_number?trim?json_string}${dispute.dispute_number?trim?json_string}"
</#if>
</#if>
},