From 12bf8c687b845aa5c249e294e988610a8ef9ea89 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Wed, 24 Apr 2019 13:10:49 +0200
Subject: [PATCH] intermediate result attachments
---
.../DocumentTemplateLink_entity.aod | 5 +---
.../documenttemplate_id_child/stateProcess.js | 13 +++++++++++
.../expression.js | 4 ----
.../DocumentTemplate_entity.aod | 7 +++++-
.../DocumentTemplate_entity/titleProcess.js | 2 +-
.../_____LANGUAGE_EXTRA.aod | 15 ++++++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 15 ++++++++++++
.../DocumentTemplateLink.aod | 4 ++++
.../DocumentTemplateLinkList_view.aod | 23 +++++++++++++++++++
.../DocumentTemplateLinkMultiEdit_view.aod | 1 +
.../DocumentTemplatePreview_view.aod | 15 ++++--------
12 files changed, 88 insertions(+), 20 deletions(-)
create mode 100644 entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js
delete mode 100644 entity/DocumentTemplateLink_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id_child.displayvalue/expression.js
create mode 100644 neonView/DocumentTemplateLinkList_view/DocumentTemplateLinkList_view.aod
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 6644b36513a..d14eead2639 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -38,6 +38,7 @@
<entityField>
<name>DOCUMENTTEMPLATE_ID_CHILD</name>
<consumer>Attachments</consumer>
+ <stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
@@ -119,10 +120,6 @@
<name>USER_NEW.value</name>
<recordfield>DOCUMENTTEMPLATELINK.USER_NEW</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DOCUMENTTEMPLATE_ID_CHILD.displayValue</name>
- <expression>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id_child.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js
new file mode 100644
index 00000000000..c04409ebc2e
--- /dev/null
+++ b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("system.db");
+
+var parenttype = db.cell("select TYPE from DOCUMENTTEMPLATE");
+
+logging.log(parenttype);
+
+//
+//if(parenttype == "MAI")
+// result.string("DISABLED");
\ No newline at end of file
diff --git a/entity/DocumentTemplateLink_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id_child.displayvalue/expression.js b/entity/DocumentTemplateLink_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id_child.displayvalue/expression.js
deleted file mode 100644
index ac1f10488e6..00000000000
--- a/entity/DocumentTemplateLink_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id_child.displayvalue/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getNameSubselectSql("DOCUMENTTEMPLATE_ID_CHILD"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index c9f0f90cd78..202f0d096e8 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>DocumentTemplate_entity</name>
- <title>Document Template</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:FILE_FONT</icon>
<titleProcess>%aditoprj%/entity/DocumentTemplate_entity/titleProcess.js</titleProcess>
@@ -212,6 +211,12 @@
<entityName>DocumentTemplateLink_entity</entityName>
<fieldName>Links</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityParameter>
<name>DocumentTemplateTypeClassification_param</name>
diff --git a/entity/DocumentTemplate_entity/titleProcess.js b/entity/DocumentTemplate_entity/titleProcess.js
index 1800cc012b7..50558aa1c66 100644
--- a/entity/DocumentTemplate_entity/titleProcess.js
+++ b/entity/DocumentTemplate_entity/titleProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.translate");
import("system.result");
-result.string(translate.text(vars.get("$field.NAME")));
\ No newline at end of file
+result.string(translate.text(vars.get("$field.NAME")));
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 1fe0fd42b5e..c7de1a577d0 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2919,6 +2919,21 @@
<entry>
<key>${ATTRIBUTE_VOID}</key>
</entry>
+ <entry>
+ <key>Document Template</key>
+ </entry>
+ <entry>
+ <key>Text Modular</key>
+ </entry>
+ <entry>
+ <key>Mail</key>
+ </entry>
+ <entry>
+ <key>Attachment</key>
+ </entry>
+ <entry>
+ <key>Letter</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 3831c61cee0..664b262a384 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -70,6 +70,10 @@
<key>Turnover</key>
<value>Umsatz</value>
</entry>
+ <entry>
+ <key>Attachments</key>
+ <value>Anhänge</value>
+ </entry>
<entry>
<key>Discount %</key>
<value>Rabatt %</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index c467d57a3c5..c3812a1621a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2952,6 +2952,21 @@
<key>${ATTRIBUTE_VOID}</key>
<value>Void</value>
</entry>
+ <entry>
+ <key>Document Template</key>
+ </entry>
+ <entry>
+ <key>Text Modular</key>
+ </entry>
+ <entry>
+ <key>Mail</key>
+ </entry>
+ <entry>
+ <key>Attachment</key>
+ </entry>
+ <entry>
+ <key>Letter</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/DocumentTemplateLink/DocumentTemplateLink.aod b/neonContext/DocumentTemplateLink/DocumentTemplateLink.aod
index c0cc54b60de..f051fead70c 100644
--- a/neonContext/DocumentTemplateLink/DocumentTemplateLink.aod
+++ b/neonContext/DocumentTemplateLink/DocumentTemplateLink.aod
@@ -8,5 +8,9 @@
<name>f21abb6d-0abf-472e-8f5e-2b2578d355ea</name>
<view>DocumentTemplateLinkMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>a9968bc4-885e-41df-9a50-15798e91f901</name>
+ <view>DocumentTemplateLinkList_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/DocumentTemplateLinkList_view/DocumentTemplateLinkList_view.aod b/neonView/DocumentTemplateLinkList_view/DocumentTemplateLinkList_view.aod
new file mode 100644
index 00000000000..8835ec99947
--- /dev/null
+++ b/neonView/DocumentTemplateLinkList_view/DocumentTemplateLinkList_view.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>DocumentTemplateLinkList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>TitledList</name>
+ <entityField>#ENTITY</entityField>
+ <title>Attachments</title>
+ <columns>
+ <neonTableColumn>
+ <name>3c550757-70cf-40b9-a0af-687b998b6b77</name>
+ <entityField>DOCUMENTTEMPLATE_ID_CHILD</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplateLinkMultiEdit_view/DocumentTemplateLinkMultiEdit_view.aod b/neonView/DocumentTemplateLinkMultiEdit_view/DocumentTemplateLinkMultiEdit_view.aod
index 4a22becce8b..df6a9f255f9 100644
--- a/neonView/DocumentTemplateLinkMultiEdit_view/DocumentTemplateLinkMultiEdit_view.aod
+++ b/neonView/DocumentTemplateLinkMultiEdit_view/DocumentTemplateLinkMultiEdit_view.aod
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
<name>DocumentTemplateLinkMultiEdit_view</name>
+ <title>Attachments</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index cab33e2cb6b..75ee9ba67be 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -15,20 +15,15 @@
<entityField>#ENTITY</entityField>
<title>Document Template</title>
</cardViewTemplate>
+ <neonViewReference>
+ <name>632c3a73-41f9-4d95-b394-2699a7200cf1</name>
+ <entityField>Links</entityField>
+ <view>DocumentTemplateLinkList_view</view>
+ </neonViewReference>
<neonViewReference>
<name>0da2cc6b-86c9-4455-b5b2-edc54b30e793</name>
<entityField>Documents</entityField>
<view>DocumentList_view</view>
</neonViewReference>
- <neonViewReference>
- <name>ba313d4c-e5c0-4077-8ae2-bc1f3c86d747</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>536b34ae-d86b-43e3-b8ad-9955ab292517</name>
- <entityField>Links</entityField>
- <view>DocumentTemplateLinkMultiEdit_view</view>
- </neonViewReference>
</children>
</neonView>
--
GitLab