From 7414ebb94c09cbf815656788a9c65f7d719e30df Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Fri, 28 Aug 2020 15:14:16 +0200
Subject: [PATCH] #1048305 New context for "Userhelp" created; Uses context
"documents" do handle image management; New filter view which displays the id
of uploaded file added to documents, used in userhelp.
---
entity/Document_entity/Document_entity.aod | 7 +++
.../UserhelpResources/UserhelpResources.aod | 31 ++++++++++++
.../assignmentrowid_param/valueProcess.js | 5 ++
.../assignmenttable_param/valueProcess.js | 3 ++
neonContext/Document/Document.aod | 4 ++
neonContext/Userhelp/Userhelp.aod | 18 +++++++
.../DocumentWithIdFilter_view.aod | 47 +++++++++++++++++++
.../Userhelp_FilterView.aod | 19 ++++++++
8 files changed, 134 insertions(+)
create mode 100644 entity/UserhelpResources/UserhelpResources.aod
create mode 100644 entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
create mode 100644 entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
create mode 100644 neonContext/Userhelp/Userhelp.aod
create mode 100644 neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod
create mode 100644 neonView/Userhelp_FilterView/Userhelp_FilterView.aod
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 1975ae7ba9..00112c6036 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -95,6 +95,7 @@
</entityParameter>
<entityField>
<name>UID</name>
+ <title>Id</title>
</entityField>
<entityField>
<name>DESCRIPTION</name>
@@ -220,6 +221,12 @@
<fieldName>LogDocuments</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>2e6fcf27-ee98-4f7d-a99d-7ce02774076b</name>
+ <entityName>UserhelpResources</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/UserhelpResources/UserhelpResources.aod b/entity/UserhelpResources/UserhelpResources.aod
new file mode 100644
index 0000000000..84eed213c7
--- /dev/null
+++ b/entity/UserhelpResources/UserhelpResources.aod
@@ -0,0 +1,31 @@
+<?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.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
+ <name>UserhelpResources</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>image</name>
+ </entityField>
+ <entityConsumer>
+ <name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+</entity>
diff --git a/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000..2031e39685
--- /dev/null
+++ b/entity/UserhelpResources/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+//result.string(vars.get("$field.CONTACTID"));
+result.string("meinetestid");
\ No newline at end of file
diff --git a/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000..886237ba81
--- /dev/null
+++ b/entity/UserhelpResources/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("USERHELP");
\ No newline at end of file
diff --git a/neonContext/Document/Document.aod b/neonContext/Document/Document.aod
index 23df7610e8..cfb02a7f2b 100644
--- a/neonContext/Document/Document.aod
+++ b/neonContext/Document/Document.aod
@@ -33,5 +33,9 @@
<name>cd17be33-73ae-4e8d-a852-65152a772926</name>
<view>DocumentMultipleEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>434ed60c-8219-4ef5-b795-6d72b9ae48c9</name>
+ <view>DocumentWithIdFilter_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Userhelp/Userhelp.aod b/neonContext/Userhelp/Userhelp.aod
new file mode 100644
index 0000000000..bcacbf186d
--- /dev/null
+++ b/neonContext/Userhelp/Userhelp.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext 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/neonContext/1.1.1">
+ <name>Userhelp</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterView>Userhelp_FilterView</filterView>
+ <editView>Userhelp_EditView</editView>
+ <entity>UserhelpResources</entity>
+ <references>
+ <neonViewReference>
+ <name>44005781-a90b-468f-a970-7833d170f671</name>
+ <view>Userhelp_EditView</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>2a1dd62b-0f30-442b-aa1d-969b46312d2a</name>
+ <view>Userhelp_FilterView</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod b/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod
new file mode 100644
index 0000000000..3cafd27757
--- /dev/null
+++ b/neonView/DocumentWithIdFilter_view/DocumentWithIdFilter_view.aod
@@ -0,0 +1,47 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DocumentWithIdFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>documentsTable</name>
+ <favoriteActionGroup1>Document_actions</favoriteActionGroup1>
+ <iconField>PREVIEW_IMAGE</iconField>
+ <titleField>NAME</titleField>
+ <subtitleField>TYPE</subtitleField>
+ <descriptionField>SIZE</descriptionField>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>3c8f789e-f62f-4756-8ee4-347e77712ebe</name>
+ <entityField>UID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9138d75e-c7d1-4b49-8fd3-c67ef53d0e8b</name>
+ <entityField>NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3c8d2e5e-9db9-4a76-844e-85e84ea73078</name>
+ <entityField>TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1709dcf6-33ea-46ec-a2bc-e488289389bc</name>
+ <entityField>SIZE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>86ef02d8-ca90-44c8-9dc4-b8527016f3a5</name>
+ <entityField>DATE_EDIT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9b140660-1918-48dd-852b-d9802fef872e</name>
+ <entityField>IS_MAIN_DOCUMENT</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/Userhelp_FilterView/Userhelp_FilterView.aod b/neonView/Userhelp_FilterView/Userhelp_FilterView.aod
new file mode 100644
index 0000000000..88b815cc8a
--- /dev/null
+++ b/neonView/Userhelp_FilterView/Userhelp_FilterView.aod
@@ -0,0 +1,19 @@
+<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>Userhelp_FilterView</name>
+ <title>Userhelp Ressources</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>baf3ef50-4798-47b6-bb1a-f311cf4b3307</name>
+ <entityField>Documents</entityField>
+ <view>DocumentWithIdFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
--
GitLab