From 5c5f558879a7340899b92f16361a685079c4322f Mon Sep 17 00:00:00 2001
From: Maria Hofmann <m.hofmann@adito.de>
Date: Mon, 1 Jul 2019 13:00:21 +0200
Subject: [PATCH] fixes
---
.../2019.1.4/DSGVO/insert_example_DSGVO.xml | 22 -------------------
.../Data_alias/basic/2019.1.4/changelog.xml | 1 -
process/DSGVO_lib/process.js | 4 +---
3 files changed, 1 insertion(+), 26 deletions(-)
delete mode 100644 .liquibase/Data_alias/basic/2019.1.4/DSGVO/insert_example_DSGVO.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/DSGVO/insert_example_DSGVO.xml b/.liquibase/Data_alias/basic/2019.1.4/DSGVO/insert_example_DSGVO.xml
deleted file mode 100644
index 616e1cc2d2..0000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/DSGVO/insert_example_DSGVO.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.hofmann" id="e6b32d7d-298c-44a3-901f-88baa77cb6c3">
- <insert tableName="DSGVO">
- <column name="DSGVOID" value="59e2ac8e-d565-49e9-8fb8-d7e809fa0fab"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" value="2019-06-03 06:57:51.882"/>
- <column name="USER_EDIT" value="null"/>
- <column name="DATE_EDIT" value="null"/>
- <column name="ROW_ID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
- <column name="STATUORITYSOURCE" value="b3f7038b-622b-45e4-8c5c-4b0c7aed6300"/>
- <column name="PURPOSE" value="56762dd8-cfe8-4551-a758-0fd0fa4f7e76"/>
-
- <column name="TABLENAME" value="c9032b73-63ec-4a22-aff6-317ec3a4dbf6"/>
- <column name="TYPE" value="HOMEADDR"/>
-
- <column name="VALID_TO" value="2019-10-10 06:57:51.882"/>
- <column name="CONTACT_ID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
-
- </insert>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
index 977434f5ef..23c6c4ac27 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -154,7 +154,6 @@
<include relativeToChangelogFile="true" file="add_objectRelationIcon.xml"/>
<include relativeToChangelogFile="true" file="DSGVO/create_DSGVO.xml"/>
- <include relativeToChangelogFile="true" file="DSGVO/insert_example_DSGVO.xml"/>
<include relativeToChangelogFile="true" file="DSGVO/init_statuoritysource_keyword.xml"/>
<include relativeToChangelogFile="true" file="DSGVO/init_purpose_keyword.xml"/>
<include relativeToChangelogFile="true" file="DSGVO/init_dsgvotablename_keyword.xml"/>
diff --git a/process/DSGVO_lib/process.js b/process/DSGVO_lib/process.js
index b227756a16..dd393e582e 100644
--- a/process/DSGVO_lib/process.js
+++ b/process/DSGVO_lib/process.js
@@ -24,9 +24,7 @@ function getDSGVOTypes (pPerson, pTablename)
{
// TODO liefert aktuell nur eine Privatadresse, wenn mehrere Vorhanden und keine Firmenadresse
// Bsp Birgit Leicht
- // TODO in FilterView
- // nur bei Neuerstellung angezeigt und nur KeyId
- // sonst leer
+
var addr = db.table(SqlCondition.begin()
.andPrepare("CONTACT.PERSON_ID", pPerson)
.buildSql("select ADDR_TYPE from ADDRESS join CONTACT on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID ",
--
GitLab