From cab9eee2fb4af6feb8d60b35ffa16f146ad4ff3b Mon Sep 17 00:00:00 2001
From: Jindrich Susen <jindrich.susen@advantages.cz>
Date: Wed, 16 Aug 2023 11:13:01 +0200
Subject: [PATCH 1/2] Attachments screen was vertically overflowing

---
 .../src/gui/Components/ScreenElements/HBoxVBox.module.scss       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend-html/src/gui/Components/ScreenElements/HBoxVBox.module.scss b/frontend-html/src/gui/Components/ScreenElements/HBoxVBox.module.scss
index 7d1a2c43bb..ea93245986 100644
--- a/frontend-html/src/gui/Components/ScreenElements/HBoxVBox.module.scss
+++ b/frontend-html/src/gui/Components/ScreenElements/HBoxVBox.module.scss
@@ -21,7 +21,6 @@ along with ORIGAM. If not, see <http://www.gnu.org/licenses/>.
   flex-shrink: 0;
 
   width: 100%;
-  height: 100%;
   display: flex;
   flex-direction: row;
 

From a245304a9af4e0e1aeec925cf73a637ced62c912 Mon Sep 17 00:00:00 2001
From: Jindrich Susen <jindrich.susen@advantages.cz>
Date: Wed, 16 Aug 2023 11:13:17 +0200
Subject: [PATCH 2/2] Added attachments to demo project

---
 .../DataEntity/Widgets/AllDataTypes.origam    | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/model-tests/model/Widgets/DataEntity/Widgets/AllDataTypes.origam b/model-tests/model/Widgets/DataEntity/Widgets/AllDataTypes.origam
index d8d7167e00..9af2096714 100644
--- a/model-tests/model/Widgets/DataEntity/Widgets/AllDataTypes.origam
+++ b/model-tests/model/Widgets/DataEntity/Widgets/AllDataTypes.origam
@@ -13,11 +13,11 @@
   xmlns:eri="http://schemas.origam.com/Origam.Schema.EntityModel.EntityRelationItem/6.0.0"
   xmlns:euia="http://schemas.origam.com/Origam.Schema.GuiModel.EntityUIAction/6.2.0"
   xmlns:ewa="http://schemas.origam.com/Origam.Schema.MenuModel.EntityWorkflowAction/6.0.0"
-  xmlns:fc="http://schemas.origam.com/Origam.Schema.EntityModel.FunctionCall/6.0.0"
+  xmlns:fc1="http://schemas.origam.com/Origam.Schema.EntityModel.FunctionCall/6.0.0"
   xmlns:fcp="http://schemas.origam.com/Origam.Schema.EntityModel.FunctionCallParameter/6.0.0"
   xmlns:fmi="http://schemas.origam.com/Origam.Schema.EntityModel.FieldMappingItem/6.0.0"
   xmlns:lf="http://schemas.origam.com/Origam.Schema.EntityModel.LookupField/6.0.0"
-  xmlns:pr="http://schemas.origam.com/Origam.Schema.ParameterReference/6.0.0"
+  xmlns:pr1="http://schemas.origam.com/Origam.Schema.ParameterReference/6.0.0"
   xmlns:sc2="http://schemas.origam.com/Origam.Schema.GuiModel.ScreenCondition/6.0.0"
   xmlns:sia="http://schemas.origam.com/Origam.Schema.SchemaItemAncestor/6.0.0"
   xmlns:sip="http://schemas.origam.com/Origam.Schema.SchemaItemParameter/6.0.0"
@@ -68,14 +68,14 @@
       asi:abstract="false"
       x:id="37cb378c-573a-4c5d-9b4f-4cc151bc501d"
       asi:name="GetLikeText1">
-      <fc:DataEntityColumn
+      <fc1:DataEntityColumn
         asi:abstract="false"
         adec:allowNulls="true"
         adec:autoIncrement="false"
         adec:dataType="Boolean"
         adec:excludeFromAllFields="false"
-        fc:forceDatabaseCalculation="false"
-        fc:function="Root/Function/Like.origam#Like/519cd4e2-59fd-49cf-a820-9d5cb4f5078c"
+        fc1:forceDatabaseCalculation="false"
+        fc1:function="Root/Function/Like.origam#Like/519cd4e2-59fd-49cf-a820-9d5cb4f5078c"
         x:id="814eed3c-7b5e-4e3a-b471-0465d93f8235"
         adec:isPrimaryKey="false"
         asi:name="Like"
@@ -86,14 +86,14 @@
           x:id="17666e5c-2919-4679-ab0b-aa8e8ed0be0c"
           asi:name="Right"
           fcp:parameter="Root/Function/Like.origam#Like/Right/561a7476-b805-466d-a71d-0654eaff7b1f">
-          <fc:DataEntityColumn
+          <fc1:DataEntityColumn
             asi:abstract="false"
             adec:allowNulls="true"
             adec:autoIncrement="false"
             adec:dataType="Boolean"
             adec:excludeFromAllFields="false"
-            fc:forceDatabaseCalculation="false"
-            fc:function="Root/Function/Concat.origam#Concat/de6ad4e0-aa2d-406b-a48f-190a5aafa37e"
+            fc1:forceDatabaseCalculation="false"
+            fc1:function="Root/Function/Concat.origam#Concat/de6ad4e0-aa2d-406b-a48f-190a5aafa37e"
             x:id="9bbdcf5f-39ca-4361-806e-731040c62bdc"
             adec:isPrimaryKey="false"
             asi:name="Concat"
@@ -114,13 +114,13 @@
                 dcr:constant="Root/DataConstant/_strings/_wildcard.origam#_wildcard/7623e70b-d02d-4856-b713-a7a8510e2f3a"
                 x:id="e122fc85-2709-4477-8d34-668faec6d427"
                 asi:name="1_wildcard" />
-              <pr:ParameterReference
+              <pr1:ParameterReference
                 asi:abstract="false"
                 x:id="5f03d1e3-1fd0-42ce-8458-7143996729b6"
                 asi:name="2_parText1"
-                pr:parameter="Widgets/DataEntity/Widgets/AllDataTypes.origam#AllDataTypes/parText1/daafcc1e-46db-44bd-9bf1-732e4a2d1387" />
+                pr1:parameter="Widgets/DataEntity/Widgets/AllDataTypes.origam#AllDataTypes/parText1/daafcc1e-46db-44bd-9bf1-732e4a2d1387" />
             </fcp:FunctionCallParameter>
-          </fc:DataEntityColumn>
+          </fc1:DataEntityColumn>
         </fcp:FunctionCallParameter>
         <fcp:FunctionCallParameter
           asi:abstract="false"
@@ -133,20 +133,20 @@
             x:id="b87a1c63-d3f5-4d7b-879e-521a4b5a51c2"
             asi:name="Text1" />
         </fcp:FunctionCallParameter>
-      </fc:DataEntityColumn>
+      </fc1:DataEntityColumn>
     </ef:EntityFilter>
     <ef:EntityFilter
       asi:abstract="false"
       x:id="687edddd-c19a-4f4b-9649-bdfcff866a23"
       asi:name="GetTop30">
-      <fc:DataEntityColumn
+      <fc1:DataEntityColumn
         asi:abstract="false"
         adec:allowNulls="true"
         adec:autoIncrement="false"
         adec:dataType="Boolean"
         adec:excludeFromAllFields="false"
-        fc:forceDatabaseCalculation="false"
-        fc:function="Root/Function/LessThanOrEqual.origam#LessThanOrEqual/be0784a0-8a51-4003-a9cd-aa8467ca4f93"
+        fc1:forceDatabaseCalculation="false"
+        fc1:function="Root/Function/LessThanOrEqual.origam#LessThanOrEqual/be0784a0-8a51-4003-a9cd-aa8467ca4f93"
         x:id="a4c459ca-a0d3-4488-a70f-5a4e3521b862"
         adec:isPrimaryKey="false"
         asi:name="&lt;="
@@ -174,7 +174,7 @@
             x:id="54927d2b-ec6e-453a-8b49-ccaad7062fe2"
             asi:name="_Number_30" />
         </fcp:FunctionCallParameter>
-      </fc:DataEntityColumn>
+      </fc1:DataEntityColumn>
     </ef:EntityFilter>
     <eri:EntityRelation
       asi:abstract="false"
@@ -376,6 +376,9 @@
       lf:isPrimaryKey="false"
       asi:name="TagInputSourceLabel"
       lf:xmlMappingType="Attribute" />
+    <sia:ancestor
+      sia:ancestor="Attachments/DataEntity/Attachments/IOrigamAttachments.origam#IOrigamAttachments/b5ed521a-4f64-4323-baed-6e01ceb2dada"
+      x:id="e47782d5-7a7e-4b13-8e3a-a10db02f3da6" />
     <sia:ancestor
       sia:ancestor="Root/DataEntity/__Origam General Interfaces/IOrigamEntity2.origam#IOrigamEntity2/28c21d99-785a-4cc5-bce9-62dca7b852c6"
       x:id="f63bb67a-b8b6-4936-b5af-b158f97c1dab" />