Skip to content

Commit bf23918

Browse files
TimotheeHrlFrancoisEricMerlin
TimotheeHrl
authored and
FrancoisEricMerlin
committed
LUT-28104 : Too many line breaks in the export
1 parent 6129972 commit bf23918

15 files changed

+79
-56
lines changed

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntry.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Parameters: q (forms.FormQuestionResponse) - The form question response
6767
<#elseif entry.entryType.beanName == "forms.entryTypeSelectOrder">
6868
<@displayEntryTypeSelectOrder entry=entry list_responses=list_responses />
6969
<#elseif entry.entryType.beanName == "forms.entryTypeTelephoneNumber">
70-
<@displayEntryTypeTelephoneNumber entry=entry list_responses=list_responses />
70+
<@displayEntryTypeTelephone entry=entry list_responses=list_responses />
7171
<#elseif entry.entryType.beanName == "forms.entryTypeTermsOfService">
7272
<@displayEntryTypeTermsOfService entry=entry list_responses=list_responses />
7373
<#elseif entry.entryType.beanName == "forms.entryTypeText">

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeCheckBox.ftl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ Description: Display an entry of type Check Box
44
Parameters: entry, list_responses
55
-->
66
<#macro displayEntryTypeCheckBox entry, list_responses >
7-
<div style="display: flex; flex-wrap: wrap;">
8-
<div style="flex: 0 0 75%; max-width: 75%;">
97
<#if list_responses?has_content>
8+
<#assign iteration = 0>
109
<#list list_responses as response>
11-
<p>
10+
<#if iteration != 0 && response.file.title?has_content>
11+
<span>; </span>
12+
</#if>
13+
<#assign iteration = iteration + 1>
14+
<span>
1215
<#if response.field??>${response.field.title!''}</#if>
13-
<#--image url deleted-->
14-
</p>
16+
</span>
1517
</#list>
1618
</#if>
17-
</div>
18-
</div>
1919
</#macro>

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeComment.ftl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@ Description: Display the comment of an entry
44
Parameters: entry, list_responses
55
-->
66
<#macro displayEntryTypeComment entry, list_responses >
7-
<div>
8-
<div>
9-
<p>${entry.comment}</p>
10-
</div>
11-
</div>
7+
<span>${entry.comment}</span>
128
</#macro>

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeDate.ftl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@ Parameters: entry, list_responses
55
-->
66
<#macro displayEntryTypeDate entry, list_responses >
77
<#if list_responses?has_content>
8+
<#assign iteration = 0>
89
<#list list_responses as response>
910
<#if response.responseValue??>
10-
<p>${response.responseValue?number?number_to_date}</p>
11+
<#if iteration != 0 && response.file.title?has_content>
12+
<span>; </span>
13+
</#if>
14+
<#assign iteration = iteration + 1>
15+
<span>${response.responseValue?number?number_to_date}</span>
1116
</#if>
1217
</#list>
1318
</#if>

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeFile.ftl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ Parameters: entry, list_responses
55
-->
66
<#macro displayEntryTypeFile entry, list_responses >
77
<#if list_responses?has_content>
8+
<#assign iteration = 0>
89
<#list list_responses as response>
9-
<p>
1010
<#if response.file?exists>
1111
<#if response.file.fileKey?exists>
12+
<#if iteration != 0 && response.file.title?has_content>
13+
<span>; </span>
14+
</#if>
15+
<#assign iteration = iteration + 1>
1216
<@link href='${base_url!""}jsp/admin/plugins/forms/FormsDownloadFile.jsp?id_file=${response.file.idFile}&id_response=${response.idResponse}'>
1317
${response.file.title}(${response.file.size} O)
1418
</@link>
1519
</#if>
1620
</#if>
17-
</p>
1821
</#list>
1922
</#if>
2023
</#macro>

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeGalleryImage.ftl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Parameters: entry, list_responses
88
<div style="flex: 0 0 75%; max-width: 75%;">
99
<#if list_responses?has_content>
1010
<#list list_responses as response>
11-
<p>
1211
<#assign displayImageWithBase64 = false>
1312
<#if base64?exists && base64?is_boolean>
1413
<#assign displayImageWithBase64 = base64>
@@ -24,7 +23,6 @@ Parameters: entry, list_responses
2423
</@link>
2524
</#if>
2625
</#if>
27-
</p>
2826
</#list>
2927
</#if>
3028
</div>

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeImage.ftl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ Description: Display an entry of type Image
44
Parameters: entry, list_responses
55
-->
66
<#macro displayEntryTypeImage entry, list_responses >
7-
<div style="display: flex; flex-wrap: wrap;">
8-
<div style="flex: 0 0 75%; max-width: 75%;">
9-
<#if list_responses?has_content>
7+
<#if list_responses?has_content>
108
<#list list_responses as response>
11-
<p>
129
<#assign displayImageWithBase64 = false>
1310
<#if base64?exists && base64?is_boolean>
1411
<#assign displayImageWithBase64 = base64>
1512
</#if>
1613
<#if displayImageWithBase64>
1714
<#if response.file?exists && entry?exists >
18-
<img src="data:image/jpeg;base64,${response.toStringValueResponse!}" width="100px" height="100px"/>
15+
<div style="display: flex; flex-wrap: wrap;">
16+
<div style="flex: 0 0 75%; max-width: 75%;">
17+
<img src="data:image/jpeg;base64,${response.toStringValueResponse!}" width="100px" height="100px"/>
18+
</div>
19+
</div>
1920
</#if>
2021
<#else>
2122
<#if response.file?exists && entry?exists >
@@ -24,9 +25,6 @@ Parameters: entry, list_responses
2425
</@link>
2526
</#if>
2627
</#if>
27-
</p>
2828
</#list>
2929
</#if>
30-
</div>
31-
</div>
3230
</#macro>

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeNumber.ftl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@ Description: Display an entry of type number
44
Parameters: entry, list_responses
55
-->
66
<#macro displayEntryTypeNumber entry, list_responses >
7-
<div style="display: flex; flex-wrap: wrap;">
87
<#if list_responses?has_content>
8+
<#assign iteration = 0>
99
<#list list_responses as response>
10-
<p>${response.toStringValueResponse!''}</p>
10+
<#if iteration != 0 && response.toStringValueResponse?has_content>
11+
<span>; </span>
12+
</#if>
13+
<#assign iteration = iteration + 1>
14+
<span>${response.toStringValueResponse!''}</span>
1115
</#list>
1216
</#if>
1317
</#macro>

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeNumbering.ftl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ Description: Display an entry of type numbering
44
Parameters: entry, list_responses
55
-->
66
<#macro displayEntryTypeNumbering entry, list_responses >
7-
<div style="display: flex; flex-wrap: wrap;">
87
<#if list_responses?has_content>
8+
<#assign iteration = 0>
99
<#list list_responses as response>
10-
<p>${response.toStringValueResponse!''}</p>
10+
<#if iteration != 0 && response.toStringValueResponse?has_content>
11+
<span>; </span>
12+
</#if>
13+
<#assign iteration = iteration + 1>
14+
<span>${response.toStringValueResponse!''}</span>
1115
</#list>
1216
</#if>
13-
</div>
1417
</#macro>

‎webapp/WEB-INF/templates/admin/plugins/workflow/modules/formspdf/display_entries/displayEntryTypeRadioButton.ftl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@ Parameters: entry, list_responses
55
-->
66
<#macro displayEntryTypeRadioButton entry, list_responses >
77
<#if list_responses?has_content>
8+
<#assign iteration = 0>
89
<#list list_responses as response>
9-
<p>
10+
<#if iteration != 0>
11+
<span>; </span>
12+
</#if>
13+
<#assign iteration = iteration + 1>
14+
<span>
1015
<#if response.field??>${response.field.title!''}
1116
<#if response.field.fileImage.url??>
1217
<@img url=response.field.fileImage.url title=response.field.title alt=response.field.title params='width="100" height="100"' />
1318
</#if>
1419
</#if>
15-
</p>
20+
</span>
1621
</#list>
1722
</#if>
1823
</#macro>

0 commit comments

Comments
 (0)