From 13c8d0fa886d767db87a9388d4e0402eda265b60 Mon Sep 17 00:00:00 2001
From: Alexander Opitz <opitz.alexander@googlemail.com>
Date: Wed, 28 Feb 2024 18:41:03 +0100
Subject: [PATCH] [BUGFIX] Sheets in BE Preview

Better support for sheets with subcontent

Resolves: #545
Release: 12.0.1
---
 .../DoktypeDefaultHandler/Node/Childs.html    | 45 ++++++++++++++-----
 .../Node/ChildsTable.html                     | 15 ++++++-
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/Resources/Private/Partials/Backend/Handler/DoktypeDefaultHandler/Node/Childs.html b/Resources/Private/Partials/Backend/Handler/DoktypeDefaultHandler/Node/Childs.html
index d8e0c3b7d..97c7ffbea 100644
--- a/Resources/Private/Partials/Backend/Handler/DoktypeDefaultHandler/Node/Childs.html
+++ b/Resources/Private/Partials/Backend/Handler/DoktypeDefaultHandler/Node/Childs.html
@@ -1,7 +1,7 @@
-<f:for as="childNodesPerSheet" each="{node.childNodes}" key="sheetKey">
-    <f:if condition="{childNodesPerSheet.lDEF}">
-        <f:if condition="{node.rendering.beLayout}">
-            <f:then>
+<f:if condition="{node.rendering.beLayout}">
+    <f:then>
+        <f:for as="childNodesPerSheet" each="{node.childNodes}" key="sheetKey">
+            <f:if condition="{childNodesPerSheet.lDEF}">
                 <f:if condition="{node.rendering.beLayoutDesign}">
                     <f:then>
                         <f:render partial="Backend/Handler/DoktypeDefaultHandler/Node/ChildsDesign" section="renderChildElements" arguments="{fieldConfig: '{node.datastructure.sheets.{sheetKey}.ROOT.el}', childElements: '{childNodesPerSheet.lDEF}', childFlexformData: '{node.flexform.data.{sheetKey}.lDEF}', parentPointer: '{node.raw.table}:{node.raw.entity.uid}:{sheetKey}:lDEF:', node: node}" />
@@ -14,10 +14,33 @@
                         />
                     </f:else>
                 </f:if>
-            </f:then>
-            <f:else>
-                <f:render partial="Backend/Handler/DoktypeDefaultHandler/Node/ChildsTable" section="renderChildElements" arguments="{fieldConfig: '{node.datastructure.sheets.{sheetKey}.ROOT.el}', childElements: '{childNodesPerSheet.lDEF}', childFlexformData: '{node.flexform.data.{sheetKey}.lDEF}', parentPointer: '{node.raw.table}:{node.raw.entity.uid}:{sheetKey}:lDEF:', subpart: 'CHILD'}" />
-            </f:else>
-        </f:if>
-    </f:if>
-</f:for>
+            </f:if>
+        </f:for>
+    </f:then>
+    <f:else>
+        <div class="row">
+            <f:variable name="count">0</f:variable>
+            <f:for as="childNodesPerSheet" each="{node.childNodes}" key="sheetKey">
+                <f:if condition="{childNodesPerSheet.lDEF}">
+                    <f:variable name="count">{count + 1}</f:variable>
+                </f:if>
+            </f:for>
+            <f:switch expression="{count}">
+                <f:case value="1">{f:variable(name: 'colwidthclass', value: 'col col-lg-12')}</f:case>
+                <f:case value="2">{f:variable(name: 'colwidthclass', value: 'col col-lg-6')}</f:case>
+                <f:case value="3">{f:variable(name: 'colwidthclass', value: 'col col-lg-4')}</f:case>
+                <f:case value="4">{f:variable(name: 'colwidthclass', value: 'col col-lg-3')}</f:case>
+                <f:case value="6">{f:variable(name: 'colwidthclass', value: 'col col-lg-2')}</f:case>
+                <f:defaultCase>{f:variable(name: 'colwidthclass', value: 'col')}</f:defaultCase>
+            </f:switch>
+            <f:for as="childNodesPerSheet" each="{node.childNodes}" key="sheetKey">
+                <f:if condition="{childNodesPerSheet.lDEF}">
+                    <div class="{colwidthclass}">
+                        <f:render partial="Backend/Handler/DoktypeDefaultHandler/Node/ChildsTable" section="renderChildElements" arguments="{fieldConfig: '{node.datastructure.sheets.{sheetKey}.ROOT.el}', childElements: '{childNodesPerSheet.lDEF}', childFlexformData: '{node.flexform.data.{sheetKey}.lDEF}', parentPointer: '{node.raw.table}:{node.raw.entity.uid}:{sheetKey}:lDEF:', subpart: 'CHILD'}" />
+                    </div>
+                </f:if>
+            </f:for>
+        </div>
+    </f:else>
+</f:if>
+
diff --git a/Resources/Private/Partials/Backend/Handler/DoktypeDefaultHandler/Node/ChildsTable.html b/Resources/Private/Partials/Backend/Handler/DoktypeDefaultHandler/Node/ChildsTable.html
index 678ac0202..d7e967de9 100644
--- a/Resources/Private/Partials/Backend/Handler/DoktypeDefaultHandler/Node/ChildsTable.html
+++ b/Resources/Private/Partials/Backend/Handler/DoktypeDefaultHandler/Node/ChildsTable.html
@@ -21,14 +21,17 @@
                         <tvp:format.stripTags whitespace="true">{childFlexformData.{fieldKey}.vDEF}</tvp:format.stripTags>
                     </tvp:format.wordLength>
                 </f:format.crop><br/>
-            </f:then>>
+            </f:then>
         </f:if>
     </f:for>
 </f:section>
 
 <f:section name="renderChildElements">
     <f:for each="{fieldConfig}" key="fieldKey" as="subFieldConfig">
-        <f:variable name="layoutKey">{subFieldConfig.config.foreign_table}{subFieldConfig.config.allowed}.{fieldKey}</f:variable>
+        <f:variable name="layoutKey">NoField.{fieldKey}</f:variable>
+        <f:if condition="{subFieldConfig.config.foreign_table} || {subFieldConfig.config.allowed}">
+            <f:variable name="layoutKey">{subFieldConfig.config.foreign_table}{subFieldConfig.config.allowed}.{fieldKey}</f:variable>
+        </f:if>
         <f:if condition="{childElements.{fieldKey}}">
             <tvp:arrayVariable name="layoutHeaders" key="{layoutKey}">
                 <strong>
@@ -72,6 +75,14 @@
                     </f:then>
                     <f:else>
                         <f:variable name="subFlexFormData" value="{childFlexformData.{fieldKey}.el}" />
+                        <tvp:arrayVariable name="layoutHeaders" key="{layoutKey}">
+                            <strong>
+                                <f:if condition="{subFieldConfig.label}">
+                                    <f:translate key="{subFieldConfig.label}" default="{subFieldConfig.label}" />
+                                </f:if>
+                            </strong>
+                        </tvp:arrayVariable>
+
                         <tvp:arrayVariable name="layoutFields" key="{layoutKey}">
                             <f:render section="renderChildElements" arguments="{fieldConfig: subFieldConfig.el, childElements: '{childElements.{fieldKey}}', childFlexformData: '{childFlexformData.{fieldKey}.el}', beLayout: beLayout, parentPointer: '{parentPointer}#{fieldKey}#el', subpart: '{subpart}.{fieldKey}'}" />
                             <f:render section="renderSubFields" arguments="{fieldConfig: subFieldConfig.el, childElements: '{childElements.{fieldKey}}', childFlexformData: '{childFlexformData.{fieldKey}.el}'}" />