diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index b7276f8a0cb5896a80b45c89cb135e041c1e0707..5681d8f103272b58898effd64ed46c0bd4cf34ba 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -9,6 +9,50 @@
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
+ <entityField>
+ <name>DSGVOID</name>
+ <valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/dsgvoid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ROW_ID</name>
+ </entityField>
+ <entityField>
+ <name>RIGHT</name>
+ <title>DataPrivacy Right</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>USE</name>
+ <title>DataPrivacy Use</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>TABLENAME</name>
+ </entityField>
+ <entityField>
+ <name>VALID_TO</name>
+ <title>Valid to</title>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <linkedContext>Default_context</linkedContext>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -20,34 +64,59 @@
<fromClauseProcess>%aditoprj%/entity/DSGVO_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<linkInformation>
<linkInformation>
- <name>19492a6a-0237-4e52-a084-30ee856107cb</name>
+ <name>32dd6b4a-8fd0-48ed-b39a-b1bd222b7e88</name>
<tableName>DSGVO</tableName>
<primaryKey>DSGVOID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
- <linkInformation>
- <name>02f589ab-e542-4c37-a305-10b458c88380</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>404928e9-d53f-4b09-bf15-9d68886d73ff</name>
- <tableName>COMMUNICATION</tableName>
- <primaryKey>COMMUNICATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>22e52f2a-c5dc-45d3-9f76-4b0c5ba42fd6</name>
- <tableName>ADDRESS</tableName>
- <primaryKey>ADDRESSID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
</linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ <recordfield>DSGVO.CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>DSGVO.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>DSGVO.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DSGVOID.value</name>
+ <recordfield>DSGVO.DSGVOID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RIGHT.value</name>
+ <recordfield>DSGVO.RIGHT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ROW_ID.value</name>
+ <recordfield>DSGVO.ROW_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TABLENAME.value</name>
+ <recordfield>DSGVO.TABLENAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USE.value</name>
+ <recordfield>DSGVO.USE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>DSGVO.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>DSGVO.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VALID_TO.value</name>
+ <recordfield>DSGVO.VALID_TO</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
</dbRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/DSGVO_entity/entityfields/date_edit/valueProcess.js b/entity/DSGVO_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5e6ef059738e0c724a468685333a5e257ac228ce
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/date_new/valueProcess.js b/entity/DSGVO_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a72892783bf2bd04fe353c47f1be0cb570bbb323
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/dsgvoid/valueProcess.js b/entity/DSGVO_entity/entityfields/dsgvoid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef478411d7874351e0a92618a5bc9e0533bd7c68
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/dsgvoid/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.result");
+import("system.util");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW){
+ result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/user_edit/valueProcess.js b/entity/DSGVO_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6af880ae3e0e2b89b4eee8327ed49f1eefe458af
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/DSGVO_entity/entityfields/user_new/valueProcess.js b/entity/DSGVO_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e518bc75a9494e53a83613dedd943106e74fc00a
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/neonContext/DSGVO/DSGVO.aod b/neonContext/DSGVO/DSGVO.aod
new file mode 100644
index 0000000000000000000000000000000000000000..605b9fa14c2cf9963eb424eca311e3c2bb2d2f49
--- /dev/null
+++ b/neonContext/DSGVO/DSGVO.aod
@@ -0,0 +1,22 @@
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>DSGVO</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>DSGVOFilter_view</filterview>
+ <editview>DSGVOEdit_view</editview>
+ <entity>DSGVO_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>aacec0e0-816b-4075-bc45-a0fea73f2c62</name>
+ <view>DSGVOFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6632d226-6b4a-4497-bafe-10f36e54c90f</name>
+ <view>DSGVOEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ed1cb100-0801-4280-a1a2-57ad858de187</name>
+ <view>DSGVOPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/DSGVOEdit_view/DSGVOEdit_view.aod b/neonView/DSGVOEdit_view/DSGVOEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7ffda7078f83439db2084ad928f18c4cf284ac4f
--- /dev/null
+++ b/neonView/DSGVOEdit_view/DSGVOEdit_view.aod
@@ -0,0 +1,31 @@
+<?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>DSGVOEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>c3923993-98fa-484d-bd74-607040917611</name>
+ <entityField>RIGHT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4108c82d-0359-44d5-bf76-6632f96852a5</name>
+ <entityField>USE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a9e1245c-7798-4170-9f2f-2e33f61cd6aa</name>
+ <entityField>VALID_TO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DSGVOFilter_view/DSGVOFilter_view.aod b/neonView/DSGVOFilter_view/DSGVOFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cf36b04ef2be8201f85284db0189302ce794b5c7
--- /dev/null
+++ b/neonView/DSGVOFilter_view/DSGVOFilter_view.aod
@@ -0,0 +1,43 @@
+<?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>DSGVOFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>76d31355-bdff-4b4c-a61c-285ed96c6721</name>
+ <entityField>ROW_ID</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b9a96821-ed98-44e8-b1d9-c5577c53bf72</name>
+ <entityField>USE</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ad9e414f-4f0f-4efb-887a-468e7a9fefb5</name>
+ <entityField>RIGHT</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ae9f07de-c29e-4d14-97a1-a01e47c84cbd</name>
+ <entityField>VALID_TO</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DSGVOPreview_view/DSGVOPreview_view.aod b/neonView/DSGVOPreview_view/DSGVOPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..046014dee08357c73b34d5a112b26dda10be7f4f
--- /dev/null
+++ b/neonView/DSGVOPreview_view/DSGVOPreview_view.aod
@@ -0,0 +1,31 @@
+<?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>DSGVOPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>ea829487-d4a6-45e5-a5af-c8af2eb696e2</name>
+ <entityField>RIGHT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f702234f-edab-46d4-9c1b-f20e36fd29b8</name>
+ <entityField>USE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>23c39671-0aea-4b58-b726-96d0b7f5384e</name>
+ <entityField>VALID_TO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/report/DSGVO_report/reportData.jasper b/report/DSGVO_report/reportData.jasper
index 33f416115211e24b4b78144ae30c00bb58aeeda5..62cb7ad949c6c6aa454241039cef8e37bb37f45c 100644
Binary files a/report/DSGVO_report/reportData.jasper and b/report/DSGVO_report/reportData.jasper differ