diff --git a/report/DSGVO_report/DSGVO_report.aod b/report/DSGVO_Auskunft_report/DSGVO_Auskunft_report.aod
similarity index 82%
rename from report/DSGVO_report/DSGVO_report.aod
rename to report/DSGVO_Auskunft_report/DSGVO_Auskunft_report.aod
index deca5c05ba467e17f71b94d9f480b9e89d594792..e6f5b16ec740d88b2ac2ece8dcecaaa4f181f06a 100644
--- a/report/DSGVO_report/DSGVO_report.aod
+++ b/report/DSGVO_Auskunft_report/DSGVO_Auskunft_report.aod
@@ -1,10 +1,10 @@
<?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>DSGVO_report</name>
+ <name>DSGVO_Auskunft_report</name>
<title>DSGVO Information</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<alias>Data_alias</alias>
- <reportData>%aditoprj%/report/DSGVO_report/reportData.jrxml</reportData>
+ <reportData>%aditoprj%/report/DSGVO_Auskunft_report/reportData.jrxml</reportData>
<reportType>JASPER</reportType>
<ribbon>
<name>ribbon</name>
diff --git a/report/DSGVO_Auskunft_report/reportData.jasper b/report/DSGVO_Auskunft_report/reportData.jasper
new file mode 100644
index 0000000000000000000000000000000000000000..a86c4e404eb6a9a39ef17b0d1877e2197e9ba389
Binary files /dev/null and b/report/DSGVO_Auskunft_report/reportData.jasper differ
diff --git a/report/DSGVO_report/reportData.jrxml b/report/DSGVO_Auskunft_report/reportData.jrxml
similarity index 84%
rename from report/DSGVO_report/reportData.jrxml
rename to report/DSGVO_Auskunft_report/reportData.jrxml
index 93db4189f8b2ae7007fc9284f3f43906d1d1490c..26f1f344972ced902d3268460349a9ef96698622 100644
--- a/report/DSGVO_report/reportData.jrxml
+++ b/report/DSGVO_Auskunft_report/reportData.jrxml
@@ -2,7 +2,7 @@
<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"/>
+ <property name="ireport.y" value="0"/>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="myAddress" class="java.lang.String"/>
<parameter name="address" class="java.lang.String"/>
@@ -10,6 +10,11 @@
<parameter name="dateSaveTill" class="java.lang.String"/>
<parameter name="transmission" class="java.lang.String"/>
<parameter name="fromOther" class="java.lang.String"/>
+ <field name="USE" class="java.lang.String"/>
+ <field name="RIGHT" class="java.lang.String"/>
+ <field name="VALID_TO" class="java.lang.String"/>
+ <field name="TYPE" class="java.lang.String"/>
+ <field name="VALUE" class="java.lang.String"/>
<background>
<band splitType="Stretch"/>
</background>
@@ -115,26 +120,47 @@ Muster-Datenschutzberatung]]></text>
</band>
</columnHeader>
<detail>
- <band height="20" splitType="Stretch"/>
+ <band height="20" splitType="Stretch">
+ <textField>
+ <reportElement x="356" y="0" width="115" height="20" uuid="1e24e549-83a7-4c9d-a395-678c6e345c39"/>
+ <textFieldExpression><![CDATA[$F{USE}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="100" y="0" width="140" height="20" uuid="dc4aa453-ca8a-428a-abe1-9053325d4676"/>
+ <textFieldExpression><![CDATA[$F{VALUE}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="0" y="0" width="100" height="20" uuid="ffb4d76b-b296-4d6e-a07f-438e2fd4849d"/>
+ <textFieldExpression><![CDATA[$F{TYPE}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="471" y="0" width="82" height="20" uuid="993f80b8-12c4-40a6-ae5b-fa8f05aa7316"/>
+ <textFieldExpression><![CDATA[$F{VALID_TO}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="240" y="0" width="116" height="20" uuid="c999f98a-80d7-4c70-9f83-5da274c0f647"/>
+ <textFieldExpression><![CDATA[$F{RIGHT}]]></textFieldExpression>
+ </textField>
+ </band>
</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"/>
+ <reportElement x="342" 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>
+ <reportElement x="433" y="0" width="80" height="20" forecolor="#999999" uuid="78f17e4d-0b60-4a11-a806-99d7e1629efd"/>
+ <textElement textAlignment="Right">
<font fontName="Segoe UI" size="8"/>
</textElement>
- <textFieldExpression><![CDATA[$R{Seite}+" "+$V{PAGE_NUMBER}+" "+$R{von}]]></textFieldExpression>
+ <textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
</textField>
<textField evaluationTime="Report">
- <reportElement x="518" y="0" width="37" height="20" forecolor="#999999" uuid="dbd61d68-623f-4610-964c-ad3ce1bef5d5"/>
+ <reportElement x="513" y="0" width="40" height="20" forecolor="#999999" uuid="75d436a1-d6e5-4661-bde9-8be99ea2ea43"/>
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
diff --git a/report/DSGVO_report/reportData.jasper b/report/DSGVO_report/reportData.jasper
deleted file mode 100644
index 62cb7ad949c6c6aa454241039cef8e37bb37f45c..0000000000000000000000000000000000000000
Binary files a/report/DSGVO_report/reportData.jasper and /dev/null differ