Skip to content
Snippets Groups Projects
Commit 20f0de5d authored by Maximilian Hofmann's avatar Maximilian Hofmann
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1037814][Anforderungsdefinition /... 

[Projekt: Entwicklung - Neon][TicketNr.: 1037814][Anforderungsdefinition / Konzeption:  Kontaktmanagement - Datenschutz]
Umbenennung
Report
parent bb632011
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 269 additions and 56 deletions
.liquibase/Data_alias/basic/2019.2/changelog.xml
+ 1
− 1
View file @ 20f0de5d
......@@ -163,5 +163,5 @@
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignCostCategory.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml"/>
<include relativeToChangelogFile="true" file="create_DataPrivacy"/>
<include relativeToChangelogFile="true" file="create_DSGVO"/>
</databaseChangeLog>
.liquibase/Data_alias/basic/2019.2/create_DataPrivacy.xml → .liquibase/Data_alias/basic/2019.2/create_DSGVO.xml
+ 17
− 21
View file @ 20f0de5d
<?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="">
<createTable tableName="DATA_PRIVACY">
<changeSet author="m.hofmann" id="e6b32d7d-298c-44a3-901f-88baa77cb6c3">
<createTable tableName="DSGVO">
<column name="ROW_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="RIGHT" type="NVARCHAR(200)">
<constraints nullable="false"/>
</column>
<column name="USE" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="TABLENAME" type="NVARCHAR(%=)">
<constraints nullable="false"/>
</column>
<column name="VALID_TO" type="TIMESTAMP">
<column name="DSGVOID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_DSGVO_DSGVOID"/>
</column>
<!--
eigene id?, contact?
-->
<column name="USER_NEW" type="NVARCHAR(50)">
<constraints nullable="false"/>
</column>
......@@ -31,6 +14,19 @@
</column>
<column name="USER_EDIT" type="NVARCHAR(50)" />
<column name="DATE_EDIT" type="TIMESTAMP" />
<column name="ROW_ID" type="CHAR(36)" />
<column name="RIGHT" type="INTEGER" />
<column name="USE" type="INTEGER" />
<column name="TABLENAME" type="NVARCHAR(30)" />
<column name="VALID_TO" type="TIMESTAMP" />
<column name="CONTACT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
entity/DataPrivacy_entity/DataPrivacy_entity.aod → entity/DSGVO_entity/DSGVO_entity.aod
+ 48
− 0
View file @ 20f0de5d
<?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.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.4">
<name>DataPrivacy_entity</name>
<name>DSGVO_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>DataPrivacy</title>
<title>Data Privacy</title>
<image>VAADIN:BOOK</image>
<titlePlural>DataPrivacies</titlePlural>
<titlePlural>Data Privacies</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityParameter>
<name>aditoimagemyLogo</name>
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>myAddr</name>
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>addr</name>
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>salutation</name>
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>date_save_till</name>
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>transmission</name>
<description>PARAMETER</description>
</entityParameter>
<entityParameter>
<name>from_other</name>
<description>PARAMETER</description>
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 1
− 1
View file @ 20f0de5d
......@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<projectName>basic</projectName>
<projectName>xRM-Basic2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
......
process/DataPrivacy_lib/DataPrivacy_lib.aod → process/DSGVO_lib/DSGVO_lib.aod
+ 2
− 2
View file @ 20f0de5d
<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
<name>DataPrivacy_lib</name>
<name>DSGVO_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/DataPrivacy_lib/process.js</process>
<process>%aditoprj%/process/DSGVO_lib/process.js</process>
<variants>
<element>LIBRARY</element>
</variants>
......
process/DataPrivacy_lib/process.js → process/DSGVO_lib/process.js
+ 0
− 0
View file @ 20f0de5d
File moved
report/DataPrivacy_report/DataPrivacy_report.aod → report/DSGVO_report/DSGVO_report.aod
+ 3
− 2
View file @ 20f0de5d
<?xml version="1.0" encoding="UTF-8"?>
<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
<name>DataPrivacy_report</name>
<name>DSGVO_report</name>
<title>DSGVO Information</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
<reportData>%aditoprj%/report/DataPrivacy_report/reportData.jrxml</reportData>
<reportData>%aditoprj%/report/DSGVO_report/reportData.jrxml</reportData>
<reportType>JASPER</reportType>
<ribbon>
<name>ribbon</name>
......
report/DSGVO_report/reportData.jasper 0 → 100644
NaN GiB (NaN%)
View file @ 20f0de5d
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
report/DSGVO_report/reportData.jrxml 0 → 100644
+ 195
− 0
View file @ 20f0de5d
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="DSGVO Information" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="228"/>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="myAddress" class="java.lang.String"/>
<parameter name="address" class="java.lang.String"/>
<parameter name="salutation" class="java.lang.String"/>
<parameter name="dateSaveTill" class="java.lang.String"/>
<parameter name="transmission" class="java.lang.String"/>
<parameter name="fromOther" class="java.lang.String"/>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="379" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement x="0" y="87" width="555" height="20" isRemoveLineWhenBlank="true" uuid="14274be0-0468-4c95-ad10-2a8a9d543b17"/>
<textElement textAlignment="Center"/>
<textFieldExpression><![CDATA[$P{myAddress}]]></textFieldExpression>
</textField>
<image hAlign="Center">
<reportElement x="186" y="11" width="175" height="50" isRemoveLineWhenBlank="true" uuid="c619618a-77ea-4de9-b66b-7c2255f68868"/>
<imageExpression><![CDATA[$P{adito.image.myLogo}]]></imageExpression>
</image>
<textField isBlankWhenNull="true">
<reportElement x="0" y="107" width="555" height="77" isRemoveLineWhenBlank="true" uuid="99c3eddc-1385-4691-a4a3-fd69a19714be"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{address}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="184" width="555" height="30" uuid="b840456d-93dc-4fe0-b503-89d6608ddcaf"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Betreff: Informationspflichten nach Art. 13 DSGVO]]></text>
</staticText>
<textField isStretchWithOverflow="true">
<reportElement x="0" y="214" width="555" height="30" uuid="ade72176-6179-49b1-8d1f-27cfc3ff8da5"/>
<textFieldExpression><![CDATA[$P{salutation} + "\n" + "wir erheben und verarbeiten Ihre personenbezogenen Daten unter den nachfolgend aufgeführten Maßgaben." + $P{fromOther}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="244" width="555" height="20" uuid="d4bc5d80-1493-42cc-9d69-e21891f38780"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Name und Kontaktdaten des Verantwortlichen]]></text>
</staticText>
<textField isStretchWithOverflow="true">
<reportElement x="0" y="264" width="555" height="20" uuid="b03943bb-ca99-430c-8973-3a5a278694a1"/>
<textFieldExpression><![CDATA["Verantwortlich für die Datenerhebung ist " + $P{myAddress} + "."]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="284" width="555" height="20" uuid="b1aaa6c1-cfa2-4f89-8ec9-f80b374365d4"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Kontaktdaten des Datenschutzbeauftragten]]></text>
</staticText>
<staticText>
<reportElement x="0" y="304" width="555" height="55" uuid="ec06f2de-4b14-4a18-b00f-597a9c0ff4c5"/>
<textElement verticalAlignment="Top"/>
<text><![CDATA[Herr Max Mustermann
Musterstr. 3
12345 Musterstadt
Muster-Datenschutzberatung]]></text>
</staticText>
<staticText>
<reportElement x="0" y="359" width="555" height="20" uuid="fab9ee98-4994-4370-8d4f-543b15cf9335"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Zweck und Rechtsgrundlagen der Verarbeitung:]]></text>
</staticText>
</band>
</title>
<columnHeader>
<band height="20" splitType="Stretch">
<staticText>
<reportElement x="0" y="0" width="100" height="20" isRemoveLineWhenBlank="true" uuid="95ad0ddf-bb2a-48c3-a2d7-a7b36f4a850d"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Art]]></text>
</staticText>
<staticText>
<reportElement x="100" y="0" width="140" height="20" isRemoveLineWhenBlank="true" uuid="2fe6c5ec-c16c-4596-a51d-0b3cdb9acf45"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Wert]]></text>
</staticText>
<staticText>
<reportElement x="240" y="0" width="116" height="20" isRemoveLineWhenBlank="true" uuid="2812d866-436e-42fd-836d-4925715d25cf"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Rechtsgrundlage]]></text>
</staticText>
<staticText>
<reportElement x="356" y="0" width="115" height="20" isRemoveLineWhenBlank="true" uuid="03d3044d-8ca6-4ff0-b95f-23d9b6a44f15"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Verwendungszweck]]></text>
</staticText>
<staticText>
<reportElement x="471" y="0" width="85" height="20" isRemoveLineWhenBlank="true" uuid="d413c02f-393c-40bb-ad1b-04dac7a3b2d9"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[gültig bis]]></text>
</staticText>
</band>
</columnHeader>
<detail>
<band height="20" splitType="Stretch"/>
</detail>
<pageFooter>
<band height="20">
<textField pattern="EEEEE dd MMMMM yyyy">
<reportElement x="356" y="0" width="91" height="20" forecolor="#999999" uuid="b19e0510-3fb5-482f-a16f-b51a4dc88771"/>
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement x="447" y="0" width="71" height="20" forecolor="#999999" uuid="18ebdd03-c789-4a28-b401-0ecf014f5e93"/>
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
<textFieldExpression><![CDATA[$R{Seite}+" "+$V{PAGE_NUMBER}+" "+$R{von}]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
<reportElement x="518" y="0" width="37" height="20" forecolor="#999999" uuid="dbd61d68-623f-4610-964c-ad3ce1bef5d5"/>
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField>
</band>
</pageFooter>
<summary>
<band height="200" splitType="Stretch">
<staticText>
<reportElement x="0" y="0" width="555" height="20" isRemoveLineWhenBlank="true" uuid="2436a637-b898-4bc0-9d34-9b03b6b9cd34"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Empfänger oder Kategorien von Empfängern der personenbezogenen Daten / Übermittlung an ein Drittland]]></text>
</staticText>
<staticText>
<reportElement x="0" y="20" width="555" height="20" uuid="56982baa-a975-4ecc-8bb2-53deb057d995">
<printWhenExpression><![CDATA[$P{transmission} == ""]]></printWhenExpression>
</reportElement>
<text><![CDATA[Es erfolgt keine Weitergabe von Daten.]]></text>
</staticText>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="0" y="40" width="555" height="20" isRemoveLineWhenBlank="true" uuid="1d3d6165-19c4-4f2e-84e4-8cb2eaf47bc8">
<printWhenExpression><![CDATA[$P{transmission} != ""]]></printWhenExpression>
</reportElement>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{transmission}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="60" width="555" height="20" isRemoveLineWhenBlank="true" uuid="f582a5fb-9ab0-4fd8-b1c7-37715c3528bf"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Dauer der Speicherung der personenbezogenen Daten]]></text>
</staticText>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="0" y="80" width="555" height="20" isRemoveLineWhenBlank="true" uuid="e6088505-bb72-42a2-8d77-9566752aadfd"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$P{dateSaveTill}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="100" width="555" height="20" isRemoveLineWhenBlank="true" uuid="419ebea3-f766-48b9-a0e9-f858e9ac71af"/>
<textElement verticalAlignment="Middle">
<font isBold="true"/>
</textElement>
<text><![CDATA[Betroffenenrechte]]></text>
</staticText>
<staticText>
<reportElement x="0" y="120" width="555" height="80" isRemoveLineWhenBlank="true" uuid="79e7965b-75cc-4282-985c-fdedd4953383"/>
<text><![CDATA[Nach der Datenschutz-Grundverordnung stehen Ihnen folgende Rechte zu:
Werden Ihre personenbezogenen Daten verarbeitet, so haben Sie das Recht Auskunft über die zu Ihrer Person gespeicherten Daten zu erhalten (Art. 15 DSGVO). Sollten unrichtige personenbezogene Daten verarbeitet werden, steht Ihnen ein Recht auf Berichtigung zu (Art. 16 DSGVO). Liegen die gesetzlichen Voraussetzungen vor, so können Sie die Löschung oder Einschränkung der Verarbeitung verlangen sowie Widerspruch gegen die Verarbeitung einlegen (Art. 17, 18 und 21 DSGVO).
Wenn Sie in die Datenverarbeitung eingewilligt haben oder ein Vertrag zur Datenverarbeitung besteht und die Datenverarbeitung mithilfe automatisierter Verfahren durchgeführt wird, steht Ihnen gegebenenfalls ein Recht auf Datenübertragbarkeit zu (Art. 20 DSGVO).
Sollten Sie von Ihren oben genannten Rechten Gebrauch machen, prüft die öffentliche Stelle, ob die gesetzlichen Voraussetzungen hierfür erfüllt sind. Weiterhin besteht ein Beschwerderecht beim Bayerischen Landesbeauftragten für den Datenschutz. ]]></text>
</staticText>
</band>
</summary>
</jasperReport>
report/DataPrivacy_report/reportData.jrxml deleted 100644 → 0
+ 0
− 27
View file @ bb632011
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" language="groovy" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="79" splitType="Stretch"/>
</title>
<pageHeader>
<band height="35" splitType="Stretch"/>
</pageHeader>
<columnHeader>
<band height="61" splitType="Stretch"/>
</columnHeader>
<detail>
<band height="125" splitType="Stretch"/>
</detail>
<columnFooter>
<band height="45" splitType="Stretch"/>
</columnFooter>
<pageFooter>
<band height="54" splitType="Stretch"/>
</pageFooter>
<summary>
<band height="42" splitType="Stretch"/>
</summary>
</jasperReport>
report/Offer_report/reportData.jrxml
+ 2
− 2
View file @ 20f0de5d
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
<property name="ireport.zoom" value="2.1435888100000016"/>
<property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<parameter name="myAddr" class="java.lang.String"/>
......@@ -24,7 +24,7 @@
<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
<parameter name="responsible" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["C:\\adito\\0.0\\project\\basic 2019\\report\\Offer_report\\"]]></defaultValueExpression>
<defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\Offer_report\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
......
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