diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index ee806f8318c881f78c7b116ea398c3d1a048e568..81074d22266cdc38386a956d9373c0b46a74c6ad 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -1,20 +1,22 @@
<?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.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
<name>Pers_entity</name>
- <title>Personen</title>
+ <title>Kontakte</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess>
<recordContainerType>DB</recordContainerType>
- <caption>Personen</caption>
+ <caption>Kontakte</caption>
<captionProcess>%aditoprj%/entity/Pers_entity/captionProcess.js</captionProcess>
- <iconId>VAADIN:MALE</iconId>
+ <iconId>VAADIN:USERS</iconId>
+ <imageProcess>%aditoprj%/entity/Pers_entity/imageProcess.js</imageProcess>
<entityFields>
<entityField>
<name>DATEOFBIRTH</name>
<tableName>PERS</tableName>
<columnName>DATEOFBIRTH</columnName>
+ <caption>Geburtsdatum</caption>
<contentType>DATE</contentType>
<outputFormat>dd.MM.yyyy</outputFormat>
</entityField>
@@ -36,22 +38,26 @@
<name>FIRSTNAME</name>
<tableName>PERS</tableName>
<columnName>FIRSTNAME</columnName>
+ <caption>Vorname</caption>
</entityField>
<entityField>
<name>GENDER</name>
<tableName>PERS</tableName>
<columnName>GENDER</columnName>
+ <caption>Geschlecht</caption>
<possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>LASTNAME</name>
<tableName>PERS</tableName>
<columnName>LASTNAME</columnName>
+ <caption>Nachname</caption>
</entityField>
<entityField>
<name>MIDDLENAME</name>
<tableName>PERS</tableName>
<columnName>MIDDLENAME</columnName>
+ <caption>Zwischenname</caption>
</entityField>
<entityField>
<name>PERSID</name>
@@ -62,11 +68,13 @@
<name>SALUTATION</name>
<tableName>PERS</tableName>
<columnName>SALUTATION</columnName>
+ <caption>Anrede</caption>
</entityField>
<entityField>
<name>TITLE</name>
<tableName>PERS</tableName>
<columnName>TITLE</columnName>
+ <caption>Titel</caption>
</entityField>
<entityField>
<name>TITLESUFFIX</name>
@@ -85,6 +93,7 @@
</entityField>
<entityField>
<name>PREVIEWTITLE</name>
+ <caption>Vorschautitel</caption>
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
@@ -93,6 +102,20 @@
<triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityFieldGroup>
+ <name>NAME</name>
+ <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/name/valueProcess.js</valueProcess>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>FIRSTNAME</element>
+ <element>LASTNAME</element>
+ </fields>
+ </entityFieldGroup>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Pers_entity/conditionProcess.js b/entity/Pers_entity/conditionProcess.js
index e3289362d982e85d7a10c4a5bed9bbed2b55fc1b..4d5030165d9dd0a370020f02a707e4fcf9cdda64 100644
--- a/entity/Pers_entity/conditionProcess.js
+++ b/entity/Pers_entity/conditionProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
+/*import("system.vars");
import("system.result");
import("Pers_lib");
@@ -12,4 +12,4 @@ var paramObject = {
var generator = persWhereClauseGenerator(paramObject);
-result.string(generator.generate());
\ No newline at end of file
+result.string(generator.generate());*/
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/image/valueProcess.js b/entity/Pers_entity/entityfields/image/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d2df8e196653490095b85181e8c898278870419
--- /dev/null
+++ b/entity/Pers_entity/entityfields/image/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME"));
+
+
diff --git a/entity/Pers_entity/entityfields/name/valueProcess.js b/entity/Pers_entity/entityfields/name/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c2324874401ddad22716417f220710e3bcca13bd
--- /dev/null
+++ b/entity/Pers_entity/entityfields/name/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME") );
\ No newline at end of file
diff --git a/entity/Pers_entity/fromClauseProcess.js b/entity/Pers_entity/fromClauseProcess.js
index 8e82dd82b558027a5036c5d55dea18c8a9d9b8be..2f15eb375f299edd4e01c1b7a92eb4fa40ae0fae 100644
--- a/entity/Pers_entity/fromClauseProcess.js
+++ b/entity/Pers_entity/fromClauseProcess.js
@@ -12,11 +12,4 @@ var paramObject = {
var generator = persFromClauseGenerator(paramObject);
-
-Person.say();
-
-var pers = new Person();
-
-pers.say();
-
result.string(generator.generate());
\ No newline at end of file
diff --git a/entity/Pers_entity/imageProcess.js b/entity/Pers_entity/imageProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d30ec1ce2a58d9eb87207bef231889d3878863f
--- /dev/null
+++ b/entity/Pers_entity/imageProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME"));
\ No newline at end of file
diff --git a/neonContext/Pers_context/Pers_context.aod b/neonContext/Pers_context/Pers_context.aod
index 6416e611b6b29cc63ccc6c5b68288c9913403fa0..e267f456664dd9682dfa205c51fbe30c99979fe4 100644
--- a/neonContext/Pers_context/Pers_context.aod
+++ b/neonContext/Pers_context/Pers_context.aod
@@ -5,6 +5,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<mainview>PersMain_view</mainview>
<filterview>PersFilter_view</filterview>
+ <editview>PersEdit_view</editview>
<preview>PersPreview_view</preview>
<entity>Pers_entity</entity>
<references>
@@ -20,5 +21,9 @@
<name>aa2fef1f-796c-4d00-b37c-0d91e55957a0</name>
<view>PersPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ab08dc45-8021-4b9c-8f95-5a515441973f</name>
+ <view>PersEdit_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/PersEdit_view/PersEdit_view.aod b/neonView/PersEdit_view/PersEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ba19141990de09e90ff0a223b19cbd5c9f6165a9
--- /dev/null
+++ b/neonView/PersEdit_view/PersEdit_view.aod
@@ -0,0 +1,48 @@
+<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>PersEdit_view</name>
+ <title>Kontakte</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <quickAdd v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>PersEdit_generic</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>35861eb9-59c3-4317-8164-ee7c53ce397e</name>
+ <entityField>GENDER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8f7b95e8-e15e-4d9b-960a-ecd142c71c9e</name>
+ <entityField>SALUTATION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>413db0e9-00e8-4fd0-9bdc-8100509e622f</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ac32ab06-5b8f-460d-b136-384e879dd5c1</name>
+ <entityField>FIRSTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7222d731-80e0-4ef1-9761-e31dce4ed782</name>
+ <entityField>MIDDLENAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a5ad1cc7-8e97-4828-8eaa-02d0876af35b</name>
+ <entityField>LASTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>74de507e-75e0-4957-a4fb-7070fa3c5a4a</name>
+ <entityField>DATEOFBIRTH</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/PersFilter_view/PersFilter_view.aod b/neonView/PersFilter_view/PersFilter_view.aod
index 8ef59717029dc88858f2420a9a8b5a96dee69a54..616c4e146ff28c7bc0190c78d4d3016ae2650ba9 100644
--- a/neonView/PersFilter_view/PersFilter_view.aod
+++ b/neonView/PersFilter_view/PersFilter_view.aod
@@ -14,36 +14,28 @@
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>210cc6ab-5023-4d8a-8f2e-a6cd91d994ef</name>
- <entityField>FIRSTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>7be2b4ef-0efd-4266-b66f-6c8d745a8c41</name>
- <entityField>MIDDLENAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>187bcb25-db19-4e35-8723-34764166b7bd</name>
- <entityField>LASTNAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>54e0869e-fff0-4d28-8e6a-cbedcc7e3f34</name>
- <entityField>DATEOFBIRTH</entityField>
+ <name>210cc6ab-5123-4d8a-8f2e-a6cd91d494ef</name>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>125d04cc-5c7a-4c38-bd0f-b5d02d21067d</name>
<entityField>SALUTATION</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>22ccabed-a43b-4bf7-ad4c-0e8c55d04e99</name>
+ <name>2cdfaf73-d3ee-4ad8-83ea-f50acba0335a</name>
<entityField>TITLE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>0b90a505-cc5b-4e42-b764-15b5433240f9</name>
- <entityField>TITLESUFFIX</entityField>
+ <name>210cc6ab-5023-4d8a-8f2e-a6cd91d994ef</name>
+ <entityField>FIRSTNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>187bcb25-db19-4e35-8723-34764166b7bd</name>
+ <entityField>LASTNAME</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>d7df805e-2a77-4ae0-8c02-7930ab784702</name>
- <entityField>PREVIEWTITLE</entityField>
+ <name>54e0869e-fff0-4d28-8e6a-cbedcc7e3f34</name>
+ <entityField>DATEOFBIRTH</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/PersPreview_view/PersPreview_view.aod
index b7e98b0c2a5aec2f66fe88960cebedf1e183e26f..cd90dfdf582dd1ccc5e859d8b7b462e1bae2efb8 100644
--- a/neonView/PersPreview_view/PersPreview_view.aod
+++ b/neonView/PersPreview_view/PersPreview_view.aod
@@ -10,27 +10,10 @@
<children>
<cardViewTemplate>
<name>PersHeader_template</name>
- <titleField>PREVIEWTITLE</titleField>
- <descriptionField>DATEOFBIRTH</descriptionField>
+ <iconField>IMAGE</iconField>
+ <titleField>NAME</titleField>
+ <descriptionField>SALUTATION</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
- <titledListViewTemplate>
- <name>PersData_template</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>ca4df056-7f14-472a-8d25-0ce35c54c552</name>
- <entityField>SALUTATION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4188fc57-32ef-461a-9240-3935276c37e9</name>
- <entityField>TITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>c41983ab-828e-4bd3-bd38-b720175eeaa4</name>
- <entityField>TITLESUFFIX</entityField>
- </neonTableColumn>
- </columns>
- </titledListViewTemplate>
</children>
</neonView>