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

reports, fixes

parent e580dd43
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
entity/DSGVO_entity/DSGVO_entity.aod
+ 6
− 0
View file @ 4b67e545
......@@ -152,6 +152,7 @@
</entityParameter>
<entityActionGroup>
<name>Reports</name>
<iconId>VAADIN:FILE_TEXT</iconId>
<children>
<entityActionField>
<name>openDisclosureReport</name>
......@@ -160,13 +161,16 @@
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:INFO_CIRCLE_O</iconId>
<state>AUTO</state>
</entityActionField>
<entityActionField>
<name>openInfoReport</name>
<title>Information Report</title>
<onActionProcess>%aditoprj%/entity/DSGVO_entity/entityfields/reports/children/openinforeport/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:INFO_CIRCLE</iconId>
<state>AUTO</state>
</entityActionField>
</children>
</entityActionGroup>
......@@ -178,6 +182,7 @@
<title>Anonymization</title>
<onActionProcess>%aditoprj%/entity/DSGVO_entity/entityfields/dsgvoactions/children/anonymperson/onActionProcess.js</onActionProcess>
<actionOrder v="0" />
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:ASTERISK</iconId>
<stateProcess>%aditoprj%/entity/DSGVO_entity/entityfields/dsgvoactions/children/anonymperson/stateProcess.js</stateProcess>
......@@ -211,6 +216,7 @@
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/DSGVO_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/DSGVO_entity/recordcontainers/jdito/onInsert.js</onInsert>
<recordFieldMappings>
<jDitoRecordFieldMapping>
<name>UID.value</name>
......
entity/Organisation_entity/Organisation_entity.aod
+ 1
− 0
View file @ 4b67e545
......@@ -765,6 +765,7 @@
<entityActionField>
<name>addToBulkMailFromTable</name>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId>
</entityActionField>
......
entity/Person_entity/Person_entity.aod
+ 1
− 0
View file @ 4b67e545
......@@ -827,6 +827,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityActionField>
<name>addToBulkMailFromTable</name>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId>
</entityActionField>
......
process/DSGVO_lib/process.js
+ 25
− 15
View file @ 4b67e545
......@@ -125,32 +125,42 @@ function getDSGVOValues(pPerson, pTablename, pType)
function openDSGVOReport(pPerson, pReportName)
{
var discReport = new Report(pReportName);
var DSGVOReport = new Report(pReportName);
// TODO: get Images implementieren
var imgData = ["meineFirma | Konrad-Zuse-Straße 4 | DE 84144 Geisenhausen",
"base64:iVBORw0KGgoAAAANSUhEUgAAAM4AAABRCAYAAACaL5lSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDA4QzAyM0IwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDA4QzAyM0MwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMDhDMDIzOTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowMDhDMDIzQTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhF3nYoAAAlvSURBVHja7J1fjBXVHcfPJQJRoe1urQYJRBYlMUJisqwvGNjY3WgEUtN2CeWBIGb3Ju6LElsW+gA8AHe1UfuwTcBASB/Q7CZNG0tjw2pWU15kNzEBJFnLqmvQBNEbU0pbX+jve+9vlrOzM/fOnTtz78zs95P8cv/MOTPnzJzvnN/5zZ+Tu3XrliGE1MYC7gJCKBxCKBxCKBxCKBxCKBxCCIVDCIVDCIVDCIVDyDzmDq8/d+1/PY5trRB7VGyt2BqxVWLLxe4RW6JpbohdF7sq9qnYpNhFsY/Evoi6QKeOvMAWQKITToQ8LPaEWKfYBrFlVdL/SO1BsU3W/1+JnRMbE3tP7DIPHcmicLrFfia2VWxlBOuD4H6pNi32tthfxM7yEJIsCAc9yw6x7WJLYyozhNgvtlPsLbHT2hMRkjrhYPzynNhu/d4IIMxesafEToqdiGMcREhcwnlKe4AtTaoDhHpArF1sSOwdHlYSN/WGo/Niv2+iaGy2aFnyPKwkqT1OTmyf2pIE1Qdh7t+J/VjsqBgfbyWJEU5OXaMDCa0ThHxYbJHYIYqHJMVV25dg0dgc0LIS0nTh5FPWGPdxzEOaLRxEz/YkbEwTxG3bo2UnpOHCQci3XwffaWONln0FDzdptHBwcXNLiuu5RetASMOE02nKdwSknd1aF0IaIpwdGXFzVmhdCIldOLjLeXuG6rtd60RIrMLBowFLM1TfpVonQmITDh5C25rBOm/VuhESi3Dw5ObKDNZ5pdaNkFiE05nhenfy0JM4hIMI1IYM13uD4QVREoNw8DaaZRmu9zKtIyGh8HusYG3UG/pJ6w/NKy89O/P70j+nzSsn/zTz+5EHV5oHlt9rep58fFa+sQ8vmEtXps35C5/4+12PrTMP3H9v6dMGeZAX6/Cp49tsAiRK4TTsnrS771xsdj3TZTrWPeQrCtiljmnzhzfPmH//538zyyC0/l9tLonSC6wT1tmxzgxJ3q+//a4pdSTzx1Vb1SjR/Hr3L3xFY4MeCWnt3wf7d/iKxgYC+83un7vTruLhJ1H3OMsbsfHnpbdAo0Yv8rcPzpsz74/P6i3QU0AgtgA2b1pvPhQXDHltd+7MB+MzPQrSIa/tukE0mzeuN6f+/O6cOuZyubrr0tvb12bK73nDZ/cbbxwfzWKD2Tnw2l75KIiN/rHwYibvwggyobSfcO6Ju3COINDYX5axjsuNKo1PYLue+eksATy9scN0rF1T6q0AxkkYL9l8dvWaOXX1XfPZl9dK+W23zxJY1HXsUtEANK7RBDf+s1reakyJOFa7/utz6ivr6ZLlmTxBhHXVGvawmsfYYxYjf//HrHENBIMexVnmFs2cwIJr+WO33cKo64gGNKXfBzPcZo479Z2voqnU4zQENGz0DpWAaJAOLpoNxGa7dn6cv/jJbHfv/vtiqYu4ZhDN6pQd/5rdLUk/mPETQ109zo2GCOf8hUDpPr4yHTqvu8exAgQ3DCERC+d63BtGT1Ktt3G45uHK+VybmYPbDbSEc52Hn0QtnKtxb7jSuKZaWojOHvfUkt8JKjSijmT+jXEwqdOmeHuc/4bOe7OOvK46etLb24eoWI8pv4/aHhSP+IWZNRx9RX/mJd3xasvlP2wDUSo7wlUaQ8jyYrUKhClnvewceO2Yltkr4maHq0vLEXkz5SijU8duJ6jgXpf8btPfe937Q5YXNU+LpilYaSY0zUiVsrdrObD+FmsR8o1Uyx+kx5mcByeNSa/GLzauB6XdtRgH66w21rqR9aDRDJu5YWGsf1yF5pe3YeWsU2QoW6DQt6a94hLNzP6AYFRY4y7RGN0Hwypav/UXrLwtrsU91fIHFc7FeSCci67G2KIHGQehqL1CDmbK0TLnbFSQtH11brtPbdDaRqu5Hept82hAzShnveDEgN5ltZzNc2pePaFTJ5S9Fel89sewfs876zPlR+GdywAFFZcX7VYPtj5E/kCuGubcxPSBWb1D+iuto01BDwp2YreGl0vo923SEIf17LTXOqhhaHe7c+qa5VUYJRdOvg94uGxRlhMXMStdJu+u41oNyjgRMNzdoq7SNucPdc3y2pC7rBPJNtulQvkkTd7cnp2vx3iHyydUcFP2nzXkD9TjYIKmcxnubc4ZaxIqbazO2XnQbowunB0KV6m9ju2PusdALn/bfZZsVjnrZTCCtPZ+8hyHqLinLMEajzQDbtG48hcr5Q/a44AxU55zM4uMefi4Xg13FtJQJ6Qh2o16IqxwAi5ri7mcsd5vVsNguyhp/co44fPdzZTur7aQxZ0wwW5DqioczO6Mq4dZfO/Aex5uhcO3VqOr5l6EpVih0RcrbL/R5ayHqSj2RwURhdqeFZWzx5s1i62ScDAlOh706s+gcC4npHHVSoshoRDB9Fjjw7qpdq8apkTH7M5LM75fnTNeUc74rSxn5kTjXFtyGLDHUAhE1HDHeCDhYGWYEr13nginBQPwIBcfWc5UsdcKLmyLYoVB3h192mR/GvRRnwE4y5n+3qbdcnErBSvaoxbOmNjJLO9cRKGsgWehylX7rmZdlU9LOdM2RtS7ClqiFg44IfbXtO6thQvvuBkgWd7auePuRqcN8Zi5faGsWaSlnIlAw9yOS1vQIIEjmDb7frkogwMOcNWGTPnNMGl7O8zknYsX/UA+76p2NpcGB/93WBslzugFn+QTzapMWsqZMPLW/sI9ae7l3ToOChxxq2UO0HfEXjXpegAMZX118aKFNwM2SvjAqzXqUvRohPi/tdkv4khLORPU64yoONxjHNyVsD7MbUU5rzd67Nr/eqU8+8UOp2Sf/VbsiN/CU0deYKsioVgQIs9RsUMpqNshLSshkRPmZR23tFF+L7bPJG/69hsqmKNaVkISIRxHPHCBvhHbk6CAwaSOw47x0JIkCscBDfRzU76frdnTuSNcPqRBDEISLRyjDfWSKUdzMCV6o+edQagcF2hPmOzf4UAyJByn8R405bsMMCU6ZneO+8bQf5nyfXSnzdznawhJhXAcxtQQL8fszpioNurnefCMEB53wJ3bvDpOMiEch7NqGHNgotpOU54+MOw7DPCOgHMqSjyEdpmHjmRROA6X1YZ07IPpAzETGqJwmJ8GU21g1gAnpI1QMt6wiZcF4r1niJLhbTQfcfxCkkQuyFwghJDZLOAuIITCIYTCIYTCIYTCIYTCIYRQOIRQOIRQOIRQOIRQOISQWvi/AAMA9UczDEaG0p8AAAAASUVORK5CYII="]
var dsgvo = "select DSGVOID, ROW_ID, STATUORITYSOURCE, PURPOSE, TABLENAME, VALID_TO, CONTACT_ID from DSGVO"
var dsgvo = SQLCondition.begin().andPrepareValue("DSGVO.CONTACT_ID", pPerson)
.buildSql("select DSGVOID, ROW_ID, STATUORITYSOURCE, PURPOSE, TABLENAME, VALID_TO, CONTACT_ID from DSGVO", "1 = 1")
// getDSGVOTypes / -Values
var params = {};
/*
var params = {
"PaymentConditions" : translate.text("Conditions of payment", language),
"Articledescription" : translate.text("Articledescription", language),
"DeliveryConditions" : translate.text("Deliveryspecification", language),
"Salutation" : letterSalutation}*/
// TODO Parameter und Felder
// params: adito.image.myLogo, myAddress, address, salutation, dateRequest, deadline, dateSaveTill, transmission, fromOther
// Felder PURPOSE, STATUORITYSOURCE, VALID_TO, TYPE, VALUE
discReport.setReportData(ReportData.begin([
var params = {
"adito.image.myLogo" : "",
"myAddress" : "",
"address" : "",
"salutation" : "", // ggf. lettersalutation -> Contact
"dateRequest" : "",
"deadline" : "",
"dateSaveTill" : "",
"transmission" : "",
"fromOther" : ""
};
DSGVOReport.setReportData(ReportData.begin([
"PURPOSE",
"STATUORITYSOURCE",
"VALID_TO",
"TYPE", // Type
"VALUE" // Value
"TYPE",
"VALUE"
]));
discReport.addImage("myLogo", imgData[1]);
discReport.addReportParams(params);
discReport.openReport(); // pCondition, pVariables
DSGVOReport.addImage("myLogo", imgData[1]);
DSGVOReport.addReportParams(params);
DSGVOReport.openReport(); // pCondition, pVariables
}
......
report/DSGVO_Disclosure_Report/reportData.jrxml
+ 10
− 10
View file @ 4b67e545
......@@ -12,8 +12,8 @@
<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="PURPOSE" class="java.lang.String"/>
<field name="STATUORITYSOURCE" 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"/>
......@@ -113,20 +113,20 @@
<reportElement x="100" y="0" width="140" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="ec714c33-cd92-47d0-81f4-3b71f907b99a"/>
<textFieldExpression><![CDATA[$F{VALUE}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="240" y="0" width="116" height="20" isRemoveLineWhenBlank="true" uuid="12740baa-61dd-41a7-bddd-981a6e87d0dc"/>
<textFieldExpression><![CDATA[$F{RIGHT}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="true">
<reportElement x="356" y="0" width="115" height="20" isRemoveLineWhenBlank="true" uuid="8e87105e-8e40-47a8-9375-12f8c01cb0d3"/>
<textFieldExpression><![CDATA[$F{USE}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy" isBlankWhenNull="true">
<reportElement x="471" y="0" width="84" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="cb2c9f24-8e6d-4ab7-a535-ff44224d2c0b">
<printWhenExpression><![CDATA[$F{VALIDTO} != ""]]></printWhenExpression>
</reportElement>
<textFieldExpression><![CDATA[$F{VALID_TO}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="240" y="0" width="116" height="20" uuid="9f8e78c8-e881-4da3-8793-d7fd94760317"/>
<textFieldExpression><![CDATA[$F{STATUORITYSOURCE}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="356" y="0" width="115" height="20" uuid="818694fc-f790-4294-8bb1-1bb803b4770b"/>
<textFieldExpression><![CDATA[$F{PURPOSE}]]></textFieldExpression>
</textField>
</band>
</detail>
<summary>
......
report/DSGVO_Information_report/reportData.jrxml
+ 10
− 10
View file @ 4b67e545
......@@ -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="0"/>
<property name="ireport.y" value="238"/>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="myAddress" class="java.lang.String"/>
<parameter name="address" class="java.lang.String"/>
......@@ -10,8 +10,8 @@
<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="PURPOSE" class="java.lang.String"/>
<field name="STATUORITYSOURCE" 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"/>
......@@ -121,10 +121,6 @@ Muster-Datenschutzberatung]]></text>
</columnHeader>
<detail>
<band height="20" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement x="356" y="0" width="115" height="20" isRemoveLineWhenBlank="true" uuid="1e24e549-83a7-4c9d-a395-678c6e345c39"/>
<textFieldExpression><![CDATA[$F{USE}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement x="100" y="0" width="140" height="20" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="dc4aa453-ca8a-428a-abe1-9053325d4676"/>
<textFieldExpression><![CDATA[$F{VALUE}]]></textFieldExpression>
......@@ -139,9 +135,13 @@ Muster-Datenschutzberatung]]></text>
</reportElement>
<textFieldExpression><![CDATA[$F{VALID_TO}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="240" y="0" width="116" height="20" isRemoveLineWhenBlank="true" uuid="c999f98a-80d7-4c70-9f83-5da274c0f647"/>
<textFieldExpression><![CDATA[$F{RIGHT}]]></textFieldExpression>
<textField>
<reportElement x="240" y="0" width="116" height="20" uuid="511e9391-71d1-40cb-8872-a2fcb16d6e47"/>
<textFieldExpression><![CDATA[$F{STATUORITYSOURCE}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="356" y="0" width="115" height="20" uuid="0fa18e2e-2a00-4143-a19f-14998f3c26bf"/>
<textFieldExpression><![CDATA[$F{PURPOSE}]]></textFieldExpression>
</textField>
</band>
</detail>
......
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