Skip to content
Snippets Groups Projects
Commit c951e21f authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

add DSGVOInfo entity for aditional Information for the reports

parent 34b0cb7d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 295 additions and 18 deletions
.liquibase/Data_alias/basic/2019.1.4/DSGVO/create_DSGVO.xml
+ 14
− 1
View file @ c951e21f
......@@ -6,7 +6,7 @@
<constraints primaryKey="true" primaryKeyName="PK_DSGVO_DSGVOID"/>
</column>
<column name="TYPE" type="CHAR(36)"/>
<column name="DSGVOTYPE" type="CHAR(36)"/>
<column name="ROW_ID" type="CHAR(36)" />
<column name="STATUORITYSOURCE" type="CHAR(36)" />
......@@ -27,5 +27,18 @@
<column name="USER_EDIT" type="NVARCHAR(50)" />
<column name="DATE_EDIT" type="TIMESTAMP" />
</createTable>
<createTable tableName="DSGVOINFO">
<column name="DSGVOINFOID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_DSGVOINFO_DSGVOINFOID"/>
</column>
<column name="CONTACT_ID" type="CHAR(36)"/>
<column name="DATASOURCE" type="NVARCHAR(100)" />
<column name="GARANTEE" type="NVARCHAR(100)" />
<column name="RECIPIENT" type="NVARCHAR(100)" />
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
aliasDefinition/Data_alias/Data_alias.aod
+ 91
− 1
View file @ c951e21f
......@@ -10158,7 +10158,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>TYPE</name>
<name>DSGVOTYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -10423,6 +10423,96 @@
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
<name>DSGVOINFO</name>
<dbName></dbName>
<idColumn>DSGVOINFOID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
<title></title>
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
<auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
<entityFieldDb>
<name>RECIPIENT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="100" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>GARANTEE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="100" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DSGVOINFOID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>DATASOURCE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="100" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
</entities>
</entityGroup>
</aliasDefDb>
......
entity/DSGVOInfo_entity/DSGVOInfo_entity.aod 0 → 100644
+ 82
− 0
View file @ c951e21f
<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>DSGVOInfo_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>RECIPIENT</name>
<title>Recipient, Country</title>
</entityField>
<entityField>
<name>GARANTEE</name>
<title>Garantees</title>
</entityField>
<entityField>
<name>DATASOURCE</name>
<title>External Datasource</title>
</entityField>
<entityField>
<name>CONTACT_ID</name>
<valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/contact_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DSGVOINFOID</name>
</entityField>
<entityParameter>
<name>ContactId_param</name>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
<entityParameter>
<name>ReportType_param</name>
<expose v="true" />
</entityParameter>
<entityProvider>
<name>DSGVOInfos</name>
</entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<onDBInsert>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>23dd4eb2-0ac4-406e-92e3-031f1342bd05</name>
<tableName>DSGVOINFO</tableName>
<primaryKey>DSGVOINFOID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>DSGVOINFO.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATASOURCE.value</name>
<recordfield>DSGVOINFO.DATASOURCE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RECIPIENT.value</name>
<recordfield>DSGVOINFO.RECIPIENT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DSGVOINFOID.value</name>
<recordfield>DSGVOINFO.DSGVOINFOID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GARANTEE.value</name>
<recordfield>DSGVOINFO.GARANTEE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
</entity>
entity/DSGVOInfo_entity/entityfields/contact_id/valueProcess.js 0 → 100644
+ 8
− 0
View file @ c951e21f
import("system.result");
import("system.vars");
import("system.neon");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.ContactId_param"))
{
result.string(vars.get("$param.ContactId_param"));
}
\ No newline at end of file
entity/DSGVOInfo_entity/recordcontainers/db/conditionProcess.js 0 → 100644
+ 9
− 0
View file @ c951e21f
import("system.db");
import("system.result");
import("Sql_lib");
result.string(db.translateCondition(
SqlCondition.begin()
.andPrepareVars("DSGVOINFO.CONTACT_ID", "$param.ContactId_param")
.build()))
\ No newline at end of file
entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js 0 → 100644
+ 5
− 0
View file @ c951e21f
import("system.vars");
import("DataPrivacy_lib");
if (vars.get("$param.ReportType_param"))
DataPrivacyUtils.openReport(vars.get("$field.CONTACT_ID"), vars.get("$param.ReportType_param"));
\ No newline at end of file
entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js 0 → 100644
+ 5
− 0
View file @ c951e21f
import("system.vars");
import("DataPrivacy_lib");
if (vars.get("$param.ReportType_param"))
DataPrivacyUtils.openReport(vars.get("$field.CONTACT_ID"), vars.get("$param.ReportType_param"));
\ No newline at end of file
entity/DSGVO_entity/DSGVO_entity.aod
+ 5
− 5
View file @ c951e21f
......@@ -90,7 +90,7 @@
<children>
<entityParameter>
<name>OrganisationId_param</name>
<valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/contactadresses/children/organisationid_param/valueProcess.js</valueProcess>
<valueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/organisationandcontactadresses/children/organisationid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
......@@ -132,12 +132,12 @@
</dependency>
</entityConsumer>
<entityField>
<name>TYPE</name>
<name>DSGVOTYPE</name>
<title>Type</title>
<description>What kind of data is being saved, e.g. Mail, Home address</description>
<consumer>KeywordDSGVOType</consumer>
<state>READONLY</state>
<displayValueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
<displayValueProcess>%aditoprj%/entity/DSGVO_entity/entityfields/dsgvotype/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>ContactId_param</name>
......@@ -225,7 +225,7 @@
<name>CONTACT_ID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>TYPE.value</name>
<name>DSGVOTYPE.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ROW_ID.value</name>
......@@ -255,7 +255,7 @@
<name>USER_EDIT.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>TYPE.displayValue</name>
<name>DSGVOTYPE.displayValue</name>
</jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
......
entity/DSGVO_entity/entityfields/reports/children/openinforeport/onActionProcess.js
+ 18
− 1
View file @ c951e21f
import("system.vars");
import("DataPrivacy_lib");
import("system.neon");
import("system.entities");
DataPrivacyUtils.openReport(vars.get("$param.ContactId_param"), "DSGVO_Information_report");
\ No newline at end of file
var conf = entities.createConfigForLoadingRows()
.entity("DSGVOInfo_entity")
.provider("DSGVOInfos")
.addParameter("ContactId_param", vars.get("$field.CONTACT_ID"));
var mode = neon.OPERATINGSTATE_NEW;
if (entities.getRowCount(conf) > 0)
{
mode = neon.OPERATINGSTATE_EDIT;
}
neon.openContext("DSGVOInfo", "DSGVOInfoEdit_view", null, mode,
{
ContactId_param: vars.get("$field.CONTACT_ID"),
ReportType_param: "DSGVO_Information_report"
});
\ No newline at end of file
entity/DSGVO_entity/entityfields/value/contentTypeProcess.js
+ 2
− 2
View file @ c951e21f
......@@ -5,8 +5,8 @@ import("system.vars");
import("system.neon");
// NOTE: If there are more cases added, consider adding this to DSGVOType keyword as attribute or adding it to DataPrivacy_lib to the Types.
logging.log(vars.get("$field.TYPE"));
switch (vars.get("$field.TYPE").trim())
logging.log(vars.get("$field.DSGVOTYPE"));
switch (vars.get("$field.DSGVOTYPE").trim())
{
case $KeywordRegistry.DSGVOType$birth().trim():
result.string("DATE");
......
entity/DSGVO_entity/recordcontainers/jdito/onInsert.js
+ 2
− 2
View file @ c951e21f
......@@ -7,7 +7,7 @@ var columns = [
"PURPOSE",
"ROW_ID",
"STATUORITYSOURCE",
"TYPE",
"DSGVOTYPE",
"DSGVOID",
"USER_NEW",
"VALID_TO"
......@@ -18,7 +18,7 @@ var values = [
vars.get("$field.PURPOSE"),
vars.get("$field.ROW_ID"),
vars.get("$field.STATUORITYSOURCE"),
vars.get("$field.TYPE"),
vars.get("$field.DSGVOTYPE"),
vars.get("$field.UID"),
vars.get("$field.USER_NEW"),
vars.get("$field.VALID_TO")
......
entity/DSGVO_entity/recordcontainers/jdito/onUpdate.js
+ 2
− 2
View file @ c951e21f
......@@ -9,7 +9,7 @@ var columns = [
"PURPOSE",
"ROW_ID",
"STATUORITYSOURCE",
"TYPE",
"DSGVOTYPE",
"USER_NEW",
"USER_EDIT",
"VALID_TO"
......@@ -21,7 +21,7 @@ var values = [
vars.get("$field.PURPOSE"),
vars.get("$field.ROW_ID"),
vars.get("$field.STATUORITYSOURCE"),
vars.get("$field.TYPE"),
vars.get("$field.DSGVOTYPE"),
vars.get("$field.USER_NEW"),
vars.get("$field.USER_EDIT"),
vars.get("$field.VALID_TO")
......
neonContext/DSGVOInfo/DSGVOInfo.aod 0 → 100644
+ 12
− 0
View file @ c951e21f
<?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>DSGVOInfo</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entity>DSGVOInfo_entity</entity>
<references>
<neonViewReference>
<name>36bb346d-7f9b-4fa7-848c-4674cd195e73</name>
<view>DSGVOInfoEdit_view</view>
</neonViewReference>
</references>
</neonContext>
neonView/DSGVOEdit_view/DSGVOEdit_view.aod
+ 1
− 1
View file @ c951e21f
......@@ -16,7 +16,7 @@
<fields>
<entityFieldLink>
<name>167afc20-3e2c-452d-9300-f5e105bc85e4</name>
<entityField>TYPE</entityField>
<entityField>DSGVOTYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>191e8712-abf8-42d8-89d5-649dd0164f56</name>
......
neonView/DSGVOFilter_view/DSGVOFilter_view.aod
+ 1
− 1
View file @ c951e21f
......@@ -17,7 +17,7 @@
<columns>
<neonTableColumn>
<name>a09fc7e3-15d9-4739-84df-71f511f4b758</name>
<entityField>TYPE</entityField>
<entityField>DSGVOTYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>1d329067-0959-4150-aaa4-ea7887a31ec2</name>
......
neonView/DSGVOInfoEdit_view/DSGVOInfoEdit_view.aod 0 → 100644
+ 36
− 0
View file @ c951e21f
<?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>DSGVOInfoEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<isSmall v="true" />
<layout>
<boxLayout>
<name>layout</name>
</boxLayout>
</layout>
<children>
<genericViewTemplate>
<name>Info</name>
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>f4ca0248-2945-4bf2-9255-999d5ae710cd</name>
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>c655e773-4d81-4d11-b014-52da00f54eba</name>
<entityField>DATASOURCE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>75fc7de5-9204-4102-8ecf-5975b1fcbe6a</name>
<entityField>GARANTEE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>0ce09906-6bfe-4f9c-a3d9-7aa76acda2fa</name>
<entityField>RECIPIENT</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
</neonView>
neonView/DSGVOPreviewAnonym_view/DSGVOPreviewAnonym_view.aod
+ 1
− 1
View file @ c951e21f
......@@ -21,7 +21,7 @@
</neonTableColumn>
<neonTableColumn>
<name>53d3702d-faa8-4b06-a50b-0e23e046ab9b</name>
<entityField>TYPE</entityField>
<entityField>DSGVOTYPE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>005e5b03-a3d8-478d-9a7c-7b68a314ffc1</name>
......
neonView/DSGVOPreview_view/DSGVOPreview_view.aod
+ 1
− 1
View file @ c951e21f
......@@ -16,7 +16,7 @@
<fields>
<entityFieldLink>
<name>bad933a4-c407-410d-989b-8970e95a035a</name>
<entityField>TYPE</entityField>
<entityField>DSGVOTYPE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>a66196f5-c136-493c-8b82-13cf629f4450</name>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment