diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 8700abafd4650353c8782fc1de41ff2a0d90d1f2..0530657e991ad5e006b0c65b85b9820d8e834bef 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -449,6 +449,13 @@
<onActionProcess>%aditoprj%/entity/Org_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
+ <entityActionField>
+ <name>orgReport</name>
+ <fieldType>ACTION</fieldType>
+ <title>Customer Base Sheet</title>
+ <onActionProcess>%aditoprj%/entity/Org_entity/entityfields/orgreport/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FILE_TEXT_O</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Org_entity/entityfields/orgreport/onActionProcess.js b/entity/Org_entity/entityfields/orgreport/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..63d6aafc0495c1f6e8d2e4dfa2ac0d8c79501af3
--- /dev/null
+++ b/entity/Org_entity/entityfields/orgreport/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Org_lib");
+
+OrgUtils.openOrgReport(vars.get("$field.ORGID"));
\ No newline at end of file
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index d5854ec8bea302412390deefe3d9dbd1d344a51d..1ff1fe9806afb209ff3d03e7f217b67733b28220 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -211,7 +211,7 @@
</children>
</entityOutgoingField>
<entityOutgoingField>
- <name>PersComm_dfod</name>
+ <name>PersComm_dfo</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -400,6 +400,7 @@
<entityField>
<name>REL_RELATIONSHIP</name>
<title>Relationship</title>
+ <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
<contentType>NUMBER</contentType>
<mandatory v="false" />
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
diff --git a/entity/Relation_entity/Relation_entity.aod b/entity/Relation_entity/Relation_entity.aod
index 1d5751c905b33d584299c2e191256b4c8bf8dea0..35b7755a51ab45b2d1772416cc3ba51857086257 100644
--- a/entity/Relation_entity/Relation_entity.aod
+++ b/entity/Relation_entity/Relation_entity.aod
@@ -192,6 +192,10 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<name>STANDARD_PHONE_COMM</name>
<title>Phone</title>
</entityField>
+ <entityField>
+ <name>RELATIONSHIP</name>
+ <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -289,6 +293,10 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<name>STANDARD_PHONE_COMM.value</name>
<expression>%aditoprj%/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RELATIONSHIP.value</name>
+ <recordfield>RELATION.RELATIONSHIP</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 82e4c6930d4b17ea81cb2d85d0ef8da964355139..796d7ef2e640db676bd117f1e8638118d5a57fba 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -119,6 +119,7 @@
</entityField>
<entityField>
<name>RELATION_RELATIONSHIP</name>
+ <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
</entityField>
<entityFieldGroup>
<name>resultingRelation_fieldGroup</name>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f65f9bc5d3010d1e3d7871ccbdf7f7505fd58d39..b5285eef306cb95635f50305a96ac23e675726f3 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -1279,7 +1279,10 @@
<key>Plus Salestax</key>
</entry>
<entry>
- <key>maturity date</key>
+ <key>Choose address</key>
+ </entry>
+ <entry>
+ <key>Customer Base Sheet</key>
</entry>
<entry>
<key>{$TASK_STATUS}</key>
@@ -1308,9 +1311,6 @@
<entry>
<key>priority</key>
</entry>
- <entry>
- <key>Choose address</key>
- </entry>
<entry>
<key>zusagen</key>
</entry>
@@ -1413,6 +1413,30 @@
<entry>
<key>Angebot</key>
</entry>
+ <entry>
+ <key>responsible</key>
+ </entry>
+ <entry>
+ <key>maturity date</key>
+ </entry>
+ <entry>
+ <key>Contact type</key>
+ </entry>
+ <entry>
+ <key>Communication data</key>
+ </entry>
+ <entry>
+ <key>Remark</key>
+ </entry>
+ <entry>
+ <key>Department</key>
+ </entry>
+ <entry>
+ <key>Tasks</key>
+ </entry>
+ <entry>
+ <key>Employee</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 228867bb989cff1d3ff3e55f84b6e726713cebdf..bd9a6523dbc222728f1b701dc14195fd024d023d 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -38,6 +38,10 @@
<key>Show all contracts</key>
<value>Alle Verträge anzeigen</value>
</entry>
+ <entry>
+ <key>Communication data</key>
+ <value>Kommunikationsdaten</value>
+ </entry>
<entry>
<key>Male</key>
<value>Männlich</value>
@@ -210,6 +214,10 @@
<key>Addresses</key>
<value>Adressen</value>
</entry>
+ <entry>
+ <key>Contact type</key>
+ <value>Kontaktart</value>
+ </entry>
<entry>
<key>${COMM_ADDRESS}</key>
<value>Adresse</value>
@@ -400,6 +408,10 @@
<key>Valid until</key>
<value>gültig bis</value>
</entry>
+ <entry>
+ <key>Department</key>
+ <value>Abteilung</value>
+ </entry>
<entry>
<key>Price list</key>
<value>Preisliste</value>
@@ -512,6 +524,10 @@
<key>Kgs</key>
<value>Kg</value>
</entry>
+ <entry>
+ <key>Employee</key>
+ <value>Mitarbeiter</value>
+ </entry>
<entry>
<key>CHF</key>
<value>CHF</value>
@@ -1104,6 +1120,10 @@
<key>Document</key>
<value>Dokument</value>
</entry>
+ <entry>
+ <key>Remark</key>
+ <value>Anmerkung</value>
+ </entry>
<entry>
<key>Competition</key>
<value>Mitbewerber</value>
@@ -1221,6 +1241,10 @@
<entry>
<key>Budget (Project)</key>
</entry>
+ <entry>
+ <key>responsible</key>
+ <value>verantwortlich</value>
+ </entry>
<entry>
<key>Show all Facebook posts of a user</key>
<value>Alle Facebook Beiträge eines Benutzers anzeigen</value>
@@ -1375,6 +1399,7 @@
</entry>
<entry>
<key>Relationship</key>
+ <value></value>
</entry>
<entry>
<key>${BINARY_LIB_TOO_MANY_BINARIES}</key>
@@ -1416,6 +1441,10 @@
<key>Offer report</key>
<value>Angebotsbericht</value>
</entry>
+ <entry>
+ <key>Tasks</key>
+ <value>Aufgaben</value>
+ </entry>
<entry>
<key>New offer</key>
<value>Angebot erstellen</value>
@@ -1585,6 +1614,10 @@
<key>Take price</key>
<value>Preis übernehmen</value>
</entry>
+ <entry>
+ <key>Customer Base Sheet</key>
+ <value>Kundenstammblatt</value>
+ </entry>
<entry>
<key>Twitter Feed</key>
</entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 5ccb7ed13ceb02b7e5aa165a8d8135cf17508b57..709fb0f20feaeb680c673bb55de1c0541f53f869 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1296,7 +1296,10 @@
<key>Plus Salestax</key>
</entry>
<entry>
- <key>maturity date</key>
+ <key>Choose address</key>
+ </entry>
+ <entry>
+ <key>Customer Base Sheet</key>
</entry>
<entry>
<key>{$TASK_STATUS}</key>
@@ -1325,9 +1328,6 @@
<entry>
<key>priority</key>
</entry>
- <entry>
- <key>Choose address</key>
- </entry>
<entry>
<key>zusagen</key>
</entry>
@@ -1430,6 +1430,30 @@
<entry>
<key>Angebot</key>
</entry>
+ <entry>
+ <key>responsible</key>
+ </entry>
+ <entry>
+ <key>maturity date</key>
+ </entry>
+ <entry>
+ <key>Contact type</key>
+ </entry>
+ <entry>
+ <key>Communication data</key>
+ </entry>
+ <entry>
+ <key>Remark</key>
+ </entry>
+ <entry>
+ <key>Department</key>
+ </entry>
+ <entry>
+ <key>Tasks</key>
+ </entry>
+ <entry>
+ <key>Employee</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/process/Org_lib/Org_lib.aod b/process/Org_lib/Org_lib.aod
index b0911d1b9c72de148801ed46d2a28671cb986813..fbe42654791359361804d14c98f0c740f6f9c4e6 100644
--- a/process/Org_lib/Org_lib.aod
+++ b/process/Org_lib/Org_lib.aod
@@ -3,7 +3,7 @@
<name>Org_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Org_lib/process.js</process>
- <alias>_____SYSTEMALIAS</alias>
+ <alias>Data_alias</alias>
<variants>
<element>LIBRARY</element>
</variants>
diff --git a/process/Org_lib/process.js b/process/Org_lib/process.js
index 2bc4452b08ebeff29dbd0a0dbbef6964c1551222..b9c5d9e734bd63542d3e8e09cb211804b72c9e17 100644
--- a/process/Org_lib/process.js
+++ b/process/Org_lib/process.js
@@ -1,4 +1,11 @@
+import("system.datetime");
+import("system.translate");
+import("system.db");
import("Binary_lib");
+import("Report_lib");
+import("Sql_lib");
+import("Keyword_lib");
+import("PostalAddress_lib");
/**
* a static Utility class for the Org context.
@@ -42,3 +49,145 @@ OrgUtils.removeImage = function(pOrgId)
{
return ImageUtils.remove("ORG", "IMAGE", pOrgId);
}
+
+/**
+ * opens the org-report
+ *
+ * @param {String} pOrgId the id of the organization
+ */
+OrgUtils.openOrgReport = function(pOrgId)
+{
+ var relationId = pOrgId;
+
+ //org info
+ var info = db.cell(SqlCondition.begin()
+ .andPrepare("ORG.ORGID", pOrgId)
+ .buildSelect("select ORG.INFO from ORG"));
+
+ //communication data of the organization
+ var commSql = "select MEDIUM_ID, ADDR from COMM";
+ commSql = SqlCondition.begin()
+ .andPrepare("COMM.RELATION_ID", relationId)
+ .and("STANDARD = 1")
+ .buildSelect(commSql);
+ var commData = db.table(commSql);
+
+ //resolve keyword
+ commData.forEach(function (row)
+ {
+ row[0] = KeywordUtils.getViewValue("COMM.MEDIUM", row[0]);
+ });
+ commData = ReportData.begin(["KINDOFCOMM", "COMMVALUE"]).add(commData);
+
+ //select people from the organization
+ //TODO: Position und Abteilung fehlen noch
+ var persSql = "select SALUTATION, TITLE, FIRSTNAME, LASTNAME, '', '', '', ORG_ID, RELATIONID"
+ + " from PERS join RELATION on PERSID = PERS_ID";
+ persSql = SqlCondition.begin()
+ .andPrepare("RELATION.ORG_ID", pOrgId)
+ .and("RELATION.STATUS = 1")
+ .buildSelect(persSql, "", " order by PERS.LASTNAME asc");
+ var persData = db.table(persSql);
+
+ //TODO: get the keywords in another way when keywords are entitys
+ var mediumIds = [];
+ var mediums = KeywordUtils.getStandardArrayProps("COMM.MEDIUM");
+ for (let i = 0; i < mediums.length; i++)
+ if ("category" in mediums[i][2] && (mediums[i][2].category == "PHONE" || mediums[i][2].category == "EMAIL"))
+ mediumIds.push(mediums[i][0]);
+ mediums = mediumIds.join(", ");
+
+ for (let i = 0; i < persData.length; i++)
+ {
+ _joinArrayVals(persData[i], 0, 4); //join the full name together
+
+ //select the contact info for every person for phone and mail
+ var persCommSql = "select MEDIUM_ID, ADDR from COMM";
+ persCommSql = SqlCondition.begin()
+ .andPrepare("COMM.RELATION_ID", persData[i][5])
+ .and("MEDIUM_ID in (" + mediumIds + ")")
+ .and("STANDARD = 1")
+ .buildSelect(persCommSql);
+ var persDataComm = db.table(persCommSql);
+
+ //resolve keyword
+ persData[i][3] = persDataComm.map(function (row)
+ {
+ return KeywordUtils.getViewValue("COMM.MEDIUM", row[0]) + ": " + row[1];
+ }
+ ).join("\n");
+ }
+ persData = ReportData.begin(["PERSNAMECOMPLETE", "PERSFUNCTION", "PERSDEPARTMENT", "PERSCOMM", "ORG_ID", "RELATION_ID"]).add(persData);
+
+ var histSql = "select ENTRYDATE, CATEGORY, FIRSTNAME, LASTNAME, INFO from ACTIVITY "
+ + " join ACTIVITYLINK on ACTIVITYLINK.ACTIVITY_ID = ACTIVITYID "
+ + " join RELATION on ACTIVITYLINK.ROW_ID = RELATIONID"
+ + " left join PERS on RELATION.PERS_ID = PERSID";
+ histSql = SqlCondition.begin()
+ .andPrepare("RELATION.ORG_ID", pOrgId) //= all activities linked to the organization or an employee
+ .buildSelect(histSql, "", "order by ENTRYDATE desc");
+ var histData = db.table(histSql);
+
+ var dateFormat = translate.text("dd.MM.yyyy");
+ histData.forEach(function (row)
+ {
+ row[0] = datetime.toDate(row[0], dateFormat);
+ row[1] = KeywordUtils.getViewValue("ACTIVITY.CATEGORY", row[1]);
+ _joinArrayVals(row, 2, 2);
+ });
+ histData = ReportData.begin(["ENTRYDATE", "MEDIUM", "LOGIN", "INFO"]).add(histData);
+
+ var attr = ""; //TODO: this should be a string with the attributes
+
+
+ //tasks
+ var taskSql = "select TASK.SUBJECT, TASK.DESCRIPTION, TASK.STATUS, FIRSTNAME, LASTNAME from TASK"
+ + " join RELATION on EDITOR_RELATION_ID = RELATIONID"
+ + " left join PERS on RELATION.PERS_ID = PERSID";
+ taskSql = SqlCondition.begin()
+ .andPrepare("RELATION.ORG_ID", pOrgId)
+ .buildSelect(taskSql);
+ var taskData = db.table(taskSql);
+
+ taskData.forEach(function (row)
+ {
+ row[2] = KeywordUtils.getViewValue("TASK.STATUS", row[2]);
+ _joinArrayVals(row, 3, 2); //join FIRSTNAME and LASTNAME together
+ });
+ taskData = ReportData.begin(["SUBJECT", "INFOTEXT", "STATUS", "RESPONSIBLE"]).add(taskData);
+
+ var params = {
+ "ORGAddr" : AddressUtils.getAddress(relationId).toString(), //TODO: use new address logic when available
+ "ORGAttr" : attr,
+ "INFO" : info
+ };
+
+ var orgReport = new Report("RPTJ_ORG", params);
+
+ //add subreport data
+ orgReport.addSubReportData("subdataComm", commData);
+ orgReport.addSubReportData("subdataPers", persData);
+ orgReport.addSubReportData("subdataHist", histData);
+ orgReport.addSubReportData("subdataTask", taskData);
+
+ //add logo
+ //TODO: use an function to get the image when available
+ var imgData = [
+ "meineFirma | Konrad-Zuse-Straße 4 | DE 84144 Geisenhausen",
+ "base64:iVBORw0KGgoAAAANSUhEUgAAAM4AAABRCAYAAACaL5lSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDA4QzAyM0IwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDA4QzAyM0MwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMDhDMDIzOTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowMDhDMDIzQTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhF3nYoAAAlvSURBVHja7J1fjBXV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"
+ ];
+ params["myAddr"] = imgData[0];
+ orgReport.addImage("myLogo", imgData[1]);
+
+ orgReport.openReport();
+
+ /*
+ * merges multiple columns in an two-dimensional array into one
+ */
+ function _joinArrayVals (pArr, pIndex, pHowMany)
+ {
+ pArr.splice(pIndex, pHowMany,
+ pArr.slice(pIndex, pIndex + pHowMany)
+ .filter(function (val) {return val;}).join(" "));
+ }
+}
\ No newline at end of file
diff --git a/process/Report_lib/process.js b/process/Report_lib/process.js
index 8d958e29747d9b1f29697e022b291a14dd63b2f1..d1f68a387e970ef771d0896861221c0576bcc52d 100644
--- a/process/Report_lib/process.js
+++ b/process/Report_lib/process.js
@@ -19,16 +19,17 @@ import("system.vars");
* logging.log(reportData.getReportData().toSource());<br>
*
* @class
+ * @param {Array} [pFieldNames=[]] the report fieldnames as an array
*/
function ReportData(pFieldNames)
{
- this._reportFields = pFieldNames;
+ this._reportFields = pFieldNames || [];
this._reportValues = [];
}
/**
* create a new ReportData instance.
- * @param {String[]} pFieldNames the names of all fields as array
+ * @param {String[]} [pFieldNames=[]] the names of all fields as array
*
* @return {ReportData} this
*/
@@ -83,14 +84,16 @@ ReportData.prototype.getReportValues = function()
/**
* create a Report
* @param {String} pReportName
+* @param {Object} [pReportParams=null] the params for the report
+* @param {ReportData} [pReportData=null] the data for the report
*
* @class
*/
-function Report(pReportName)
+function Report(pReportName, pReportParams, pReportData)
{
this.reportName = pReportName;
- this.reportParams = null;
- this.reportData = new ReportData();
+ this.reportParams = pReportParams || null;
+ this.reportData = pReportData || null;
}
/**
@@ -186,7 +189,7 @@ Report.prototype.exportReport = function(pFilename, pCondition, pExportFormat, p
if (pCondition == undefined) pCondition = "";
if (pWhereOrder == undefined) pWhereOrder = null;
- var doc = [pFilename, report.exportToBytes(this.reportName, pCondition, pExportFormat, pWhereOrder, this.reportParams, this.reportData.getReportFields(), this.reportData.getReportValues(), pLanguage)];
+ var doc = [pFilename, report.exportToBytes(this.reportName, pCondition, pExportFormat, pWhereOrder, this.reportParams, this._getReportDataFields(), this._getReportDataValues(), pLanguage)];
return doc;
}
@@ -198,10 +201,10 @@ Report.prototype.exportReport = function(pFilename, pCondition, pExportFormat, p
* @return {Array} [filename, data_bytes]
*/
Report.prototype.openReport = function(pCondition, pVariables) {
- if (pCondition == undefined) pCondition = "";
+ if (pCondition == undefined) pCondition = null;
if (pVariables == undefined) pVariables = null;
- neon.openReport(this.reportName, pCondition, this.reportParams, this.reportData.getReportFields(), this.reportData.getReportValues(), pVariables);
+ neon.openReport(this.reportName, pCondition, this.reportParams, this._getReportDataFields(), this._getReportDataValues(), pVariables);
return this;
}
@@ -231,4 +234,28 @@ Report.prototype._getSubReportMap = function(pFieldNames, pData)
}
return data;
}
+}
+
+/**
+ * gets the fields of the reportData of this report or null if reportData is null
+ *
+ * @return {Array} report fields or null
+ */
+Report.prototype._getReportDataFields = function()
+{
+ if (this.reportData != null)
+ return this.reportData.getReportFields();
+ return null;
+}
+
+/**
+ * gets the values of the reportData of this report or null if reportData is null
+ *
+ * @return {Array} report values or null
+ */
+Report.prototype._getReportDataValues = function()
+{
+ if (this.reportData != null)
+ return this.reportData.getReportValues();
+ return null;
}
\ No newline at end of file
diff --git a/report/RPTJ_OFFER/reportData.jrxml b/report/RPTJ_OFFER/reportData.jrxml
index 89e47eafda47286a7704ab88cde4d276a7cddb24..51ae16ea29c0b68791b93241b235896e09b760de 100644
--- a/report/RPTJ_OFFER/reportData.jrxml
+++ b/report/RPTJ_OFFER/reportData.jrxml
@@ -24,7 +24,7 @@
<parameter name="OFFERDel" class="java.lang.String"/>
<parameter name="AD_Name" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic5.1\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
diff --git a/report/RPTJ_ORG/Aufgaben.jrxml b/report/RPTJ_ORG/Aufgaben.jrxml
new file mode 100644
index 0000000000000000000000000000000000000000..83ca1ab940627da958832b848609bab57c4d182b
--- /dev/null
+++ b/report/RPTJ_ORG/Aufgaben.jrxml
@@ -0,0 +1,54 @@
+<?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="Aufgaben" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="85abee76-0173-491f-84c2-385ecdce25bb">
+ <property name="ireport.zoom" value="1.6105100000000008"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
+ <field name="STATUS" class="java.lang.String"/>
+ <field name="SUBJECT" class="java.lang.String"/>
+ <field name="CREATEDBY" class="java.lang.String"/>
+ <field name="RESPONSIBLE" class="java.lang.String"/>
+ <field name="INFOTEXT" class="java.lang.String"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <detail>
+ <band height="16" splitType="Stretch">
+ <textField>
+ <reportElement x="3" y="0" width="102" height="15" uuid="f4c173de-6106-4330-87c2-b2ce021394ed"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{SUBJECT}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement x="118" y="0" width="168" height="15" uuid="389fc04e-a659-4ef9-923c-3ff73f5bfd18"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{INFOTEXT}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="296" y="0" width="104" height="15" uuid="e8c8b469-8f88-47f0-8056-4a3fe23fd6e5"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{STATUS}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="445" y="0" width="100" height="15" uuid="fd1db5d1-8dc3-43ba-a723-da731405325c"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{RESPONSIBLE}]]></textFieldExpression>
+ </textField>
+ </band>
+ <band height="5">
+ <line>
+ <reportElement x="0" y="1" width="555" height="1" uuid="1259315f-6fe1-4e0c-bc4a-81208ef427c6"/>
+ <graphicElement>
+ <pen lineWidth="0.75" lineStyle="Dotted"/>
+ </graphicElement>
+ </line>
+ </band>
+ </detail>
+</jasperReport>
diff --git a/report/RPTJ_ORG/Historien.jrxml b/report/RPTJ_ORG/Historien.jrxml
new file mode 100644
index 0000000000000000000000000000000000000000..a01c78815fc330905a94fc6f796d4df8bf2cc6b5
--- /dev/null
+++ b/report/RPTJ_ORG/Historien.jrxml
@@ -0,0 +1,53 @@
+<?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="Historien" pageWidth="555" pageHeight="572" orientation="Landscape" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="4066531c-fd6e-4cc9-a763-20a1023e8349">
+ <property name="ireport.zoom" value="1.2100000000000004"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
+ <field name="ENTRYDATE" class="java.lang.String"/>
+ <field name="MEDIUM" class="java.lang.String"/>
+ <field name="LOGIN" class="java.lang.String"/>
+ <field name="INFO" class="java.lang.String"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <detail>
+ <band height="17" splitType="Stretch">
+ <textField>
+ <reportElement x="0" y="1" width="100" height="15" uuid="fc8f2d06-0eb7-4fd0-a91c-cda7a85dd06e"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{ENTRYDATE}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="103" y="1" width="100" height="15" uuid="d76859d9-0766-497e-9187-33ce879dc4f3"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{MEDIUM}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="222" y="1" width="91" height="15" uuid="df383fa6-a716-4f3c-ac97-d2beb7c329ac"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{LOGIN}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement x="345" y="1" width="116" height="15" uuid="dd8ad103-b2e2-4fad-afea-81854bf12e47"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{INFO}]]></textFieldExpression>
+ </textField>
+ </band>
+ <band height="4">
+ <line>
+ <reportElement x="0" y="2" width="555" height="1" uuid="f895ff04-ead0-48c3-85c1-5f6772d79ab3"/>
+ <graphicElement>
+ <pen lineWidth="0.75" lineStyle="Dotted"/>
+ </graphicElement>
+ </line>
+ </band>
+ </detail>
+</jasperReport>
diff --git a/report/RPTJ_ORG/Kommunikationsdaten.jrxml b/report/RPTJ_ORG/Kommunikationsdaten.jrxml
new file mode 100644
index 0000000000000000000000000000000000000000..e94f3d722ee52520ca7caeac16d670be2c4a2241
--- /dev/null
+++ b/report/RPTJ_ORG/Kommunikationsdaten.jrxml
@@ -0,0 +1,41 @@
+<?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="Kommunikationsdaten" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="c659b407-943a-4427-8fa5-032bff204ff4">
+ <property name="ireport.zoom" value="1.6105100000000008"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
+ <field name="KINDOFCOMM" class="java.lang.String"/>
+ <field name="COMMVALUE" class="java.lang.String"/>
+ <field name="CLIENTID" class="java.lang.String"/>
+ <field name="ORG_ID" class="java.lang.String"/>
+ <field name="RELATION_ID" class="java.lang.String"/>
+ <field name="COMMDATA" class="java.lang.String"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <detail>
+ <band height="16" splitType="Stretch">
+ <textField>
+ <reportElement x="0" y="1" width="100" height="15" uuid="c356083f-2a5e-4a3e-9b08-c7baf2b1381e"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{KINDOFCOMM}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="103" y="1" width="100" height="15" uuid="48bf1f6b-953a-44b6-9ebf-504203afa70d"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{COMMVALUE}]]></textFieldExpression>
+ </textField>
+ </band>
+ <band height="6">
+ <line>
+ <reportElement x="0" y="2" width="555" height="1" uuid="632ccf1b-5e1c-49b6-9332-e9992b53e878"/>
+ <graphicElement>
+ <pen lineWidth="0.75" lineStyle="Dotted"/>
+ </graphicElement>
+ </line>
+ </band>
+ </detail>
+</jasperReport>
diff --git a/report/RPTJ_ORG/Kontaktpersonen.jrxml b/report/RPTJ_ORG/Kontaktpersonen.jrxml
new file mode 100644
index 0000000000000000000000000000000000000000..1908bb801676be188d41858560befe8790e502cf
--- /dev/null
+++ b/report/RPTJ_ORG/Kontaktpersonen.jrxml
@@ -0,0 +1,57 @@
+<?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="Kommunikationsdaten" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="c659b407-943a-4427-8fa5-032bff204ff4">
+ <property name="ireport.zoom" value="1.6105100000000008"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
+ <field name="PERSNAMECOMPLETE" class="java.lang.String"/>
+ <field name="PERSFUNCTION" class="java.lang.String"/>
+ <field name="PERSDEPARTMENT" class="java.lang.String"/>
+ <field name="PERSCOMM" class="java.lang.String"/>
+ <field name="CLIENTID" class="java.lang.String"/>
+ <field name="ORG_ID" class="java.lang.String"/>
+ <field name="RELATION_ID" class="java.lang.String"/>
+ <field name="COMMDATA" class="java.lang.String"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <detail>
+ <band height="16" splitType="Stretch">
+ <textField isStretchWithOverflow="true">
+ <reportElement x="345" y="1" width="116" height="15" uuid="4186db31-3a25-43f2-ae39-abca90ded430"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{PERSCOMM}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="0" y="1" width="100" height="15" uuid="c356083f-2a5e-4a3e-9b08-c7baf2b1381e"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{PERSNAMECOMPLETE}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="222" y="1" width="91" height="15" uuid="03d2241a-2aa6-4dbf-bad7-94c48837eae6"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{PERSDEPARTMENT}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="103" y="1" width="100" height="15" uuid="48bf1f6b-953a-44b6-9ebf-504203afa70d"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$F{PERSFUNCTION}]]></textFieldExpression>
+ </textField>
+ </band>
+ <band height="6">
+ <line>
+ <reportElement x="0" y="2" width="555" height="1" uuid="632ccf1b-5e1c-49b6-9332-e9992b53e878"/>
+ <graphicElement>
+ <pen lineWidth="0.75" lineStyle="Dotted"/>
+ </graphicElement>
+ </line>
+ </band>
+ </detail>
+</jasperReport>
diff --git a/report/RPTJ_ORG/RPTJ_ORG.aod b/report/RPTJ_ORG/RPTJ_ORG.aod
new file mode 100644
index 0000000000000000000000000000000000000000..abf4c1b3743719d08ac6ddcfaa28b31ec6fff056
--- /dev/null
+++ b/report/RPTJ_ORG/RPTJ_ORG.aod
@@ -0,0 +1,61 @@
+<?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.1.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.1.5">
+ <name>RPTJ_ORG</name>
+ <title>Kundenstammblatt</title>
+ <description></description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>%aditoprj%/report/RPTJ_ORG/icon.png</icon>
+ <iconInactive>%aditoprj%/report/RPTJ_ORG/iconInactive.png</iconInactive>
+ <reportData>%aditoprj%/report/RPTJ_ORG/reportData.jrxml</reportData>
+ <reportType>JASPER</reportType>
+ <subReports>
+ <subreport>
+ <name>Kontaktpersonen</name>
+ <reportData>%aditoprj%/report/RPTJ_ORG/Kontaktpersonen.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Historien</name>
+ <reportData>%aditoprj%/report/RPTJ_ORG/Historien.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Aufgaben</name>
+ <reportData>%aditoprj%/report/RPTJ_ORG/Aufgaben.jrxml</reportData>
+ </subreport>
+ <subreport>
+ <name>Kommunikationsdaten</name>
+ <reportData>%aditoprj%/report/RPTJ_ORG/Kommunikationsdaten.jrxml</reportData>
+ </subreport>
+ </subReports>
+ <images>
+ <image>
+ <name>myLogo</name>
+ <fileName>myLogo.png</fileName>
+ <imageData>%aditoprj%/report/RPTJ_ORG/myLogo.png</imageData>
+ </image>
+ <image>
+ <name>icon</name>
+ <fileName>icon.png</fileName>
+ <imageData>%aditoprj%/report/RPTJ_ORG/icon.png</imageData>
+ </image>
+ <image>
+ <name>iconInactive</name>
+ <fileName>iconInactive.png</fileName>
+ <imageData>%aditoprj%/report/RPTJ_ORG/iconInactive.png</imageData>
+ </image>
+ </images>
+ <ribbon>
+ <name>ribbon</name>
+ <ribbonTasks>
+ <ribbonTask>
+ <name>TASK_REPORT</name>
+ <showNavigationBar v="true" />
+ <showZoom v="true" />
+ <showExport v="true" />
+ <showAux v="true" />
+ <icon>REPORT_24</icon>
+ <enabled v="true" />
+ <layoutPosition>POSITION_TOP</layoutPosition>
+ </ribbonTask>
+ </ribbonTasks>
+ </ribbon>
+</report>
diff --git a/report/RPTJ_ORG/icon.png b/report/RPTJ_ORG/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb2c020b8ea6942ed59355159cff09c47b04f859
Binary files /dev/null and b/report/RPTJ_ORG/icon.png differ
diff --git a/report/RPTJ_ORG/iconInactive.png b/report/RPTJ_ORG/iconInactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d700eef9e1815add48d2ca9b986888ae0c0d3dd
Binary files /dev/null and b/report/RPTJ_ORG/iconInactive.png differ
diff --git a/report/RPTJ_ORG/myLogo.png b/report/RPTJ_ORG/myLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..1378cecbb3519bf289edcc469e43f76c3eca6f83
Binary files /dev/null and b/report/RPTJ_ORG/myLogo.png differ
diff --git a/report/RPTJ_ORG/reportData.jrxml b/report/RPTJ_ORG/reportData.jrxml
new file mode 100644
index 0000000000000000000000000000000000000000..e6431c7828decca43d1ff20aad3a6af79491092f
--- /dev/null
+++ b/report/RPTJ_ORG/reportData.jrxml
@@ -0,0 +1,315 @@
+<?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="Kundenstammblatt" 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="1.9487171000000014"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="0"/>
+ <parameter name="myAddr" class="java.lang.String"/>
+ <parameter name="ORGAddr" class="java.lang.String"/>
+ <parameter name="ORGAttr" class="java.lang.String"/>
+ <parameter name="ORGComm" class="java.lang.String"/>
+ <parameter name="ORGID" class="java.lang.String"/>
+ <parameter name="RELID" class="java.lang.String"/>
+ <parameter name="CLIENTID" class="java.lang.String"/>
+ <parameter name="adito.datasource.subdataTask" class="java.lang.Object"/>
+ <parameter name="adito.datasource.subdataComm" class="java.lang.Object"/>
+ <parameter name="adito.datasource.subdataPers" class="java.lang.Object"/>
+ <parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
+ <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_ORG\\"]]></defaultValueExpression>
+ </parameter>
+ <parameter name="adito.image.myLogo" class="java.lang.String"/>
+ <parameter name="adito.datasource.subdataHist" class="java.lang.Object"/>
+ <parameter name="INFO" class="java.lang.String"/>
+ <background>
+ <band splitType="Stretch"/>
+ </background>
+ <pageHeader>
+ <band height="106" splitType="Stretch">
+ <printWhenExpression><![CDATA[true]]></printWhenExpression>
+ <image scaleImage="RetainShape" hAlign="Center">
+ <reportElement x="182" y="0" width="174" height="50" uuid="3a34d632-09a6-44c2-b8e4-38d8138af87d"/>
+ <imageExpression><![CDATA[$P{adito.image.myLogo}]]></imageExpression>
+ </image>
+ <textField>
+ <reportElement x="0" y="70" width="555" height="20" forecolor="#999999" uuid="d8a7a770-46d6-4bd7-bc79-a98285ded43e"/>
+ <textElement textAlignment="Center" verticalAlignment="Middle">
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{myAddr}]]></textFieldExpression>
+ </textField>
+ <frame>
+ <reportElement x="0" y="70" width="555" height="20" uuid="53d00eed-675d-4f66-87c0-d945bfd92889"/>
+ <box>
+ <pen lineWidth="1.0" lineColor="#666666"/>
+ <topPen lineWidth="1.0" lineColor="#666666"/>
+ <leftPen lineWidth="1.0" lineColor="#666666"/>
+ <bottomPen lineWidth="1.0" lineColor="#666666"/>
+ <rightPen lineWidth="1.0" lineColor="#666666"/>
+ </box>
+ </frame>
+ </band>
+ </pageHeader>
+ <columnHeader>
+ <band height="80" splitType="Stretch">
+ <textField>
+ <reportElement x="0" y="14" width="167" height="20" forecolor="#999999" uuid="db320a72-fac5-477a-8c9e-19d15a8d250f"/>
+ <textElement>
+ <font fontName="Segoe UI" size="14"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Customer Base Sheet}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement x="0" y="46" width="100" height="15" uuid="cbc5f584-e9ee-4062-b6f5-7fd3a6e918f4"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{ORGAddr}]]></textFieldExpression>
+ </textField>
+ <textField isStretchWithOverflow="true">
+ <reportElement x="344" y="61" width="200" height="15" uuid="8d54ea3a-8c35-48a5-a3da-b77ff53591b7"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{INFO}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="344" y="46" width="92" height="15" uuid="a73a7562-7435-412e-b987-b8ba0980a7b7"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8" isBold="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Information}]]></textFieldExpression>
+ </textField>
+ </band>
+ </columnHeader>
+ <detail>
+ <band height="39">
+ <line>
+ <reportElement x="0" y="32" width="555" height="1" uuid="7a549c9f-9902-4f32-97eb-297a794d3498"/>
+ </line>
+ <textField>
+ <reportElement x="0" y="15" width="100" height="15" uuid="ef198107-4f82-49ad-96f6-8afb09be58f1"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Type}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="103" y="15" width="100" height="15" uuid="b42a9c7d-fd06-4e16-a32e-61aa3ffcf299"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Value}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="0" y="0" width="103" height="15" forecolor="#0033FF" uuid="7c9e61d7-c823-4fbc-85ee-5a5a73a7999c"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Communication data}]]></textFieldExpression>
+ </textField>
+ </band>
+ <band height="21">
+ <subreport>
+ <reportElement x="0" y="0" width="544" height="21" uuid="d1da0bc7-7a62-4ceb-886b-dba0ebbef275"/>
+ <dataSourceExpression><![CDATA[$P{adito.datasource.subdataComm}]]></dataSourceExpression>
+ <subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "Kommunikationsdaten.jasper"]]></subreportExpression>
+ </subreport>
+ </band>
+ <band height="42" splitType="Stretch">
+ <textField>
+ <reportElement x="0" y="0" width="100" height="15" forecolor="#0033FF" uuid="9e3a2dda-7b73-41c5-a840-f356a2373e23"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Contacts}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="0" y="15" width="100" height="15" uuid="f7f6caee-b1f5-487e-8d1a-738c533b214d"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Name}]]></textFieldExpression>
+ </textField>
+ <line>
+ <reportElement x="0" y="35" width="555" height="1" uuid="4b698800-cc36-4830-8bbf-d040f890ddbf"/>
+ </line>
+ <textField>
+ <reportElement x="103" y="15" width="100" height="15" uuid="e12cde69-8455-4dca-a760-c1eecb9a8034"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Position}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="221" y="15" width="100" height="15" uuid="0a43120b-40f3-4c5a-a7c9-15540fda5ff6"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Department}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="344" y="15" width="160" height="15" uuid="72c93546-9005-4051-9f52-28e10f8f54a5"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Communication data}]]></textFieldExpression>
+ </textField>
+ </band>
+ <band height="21">
+ <subreport>
+ <reportElement x="0" y="0" width="555" height="21" uuid="f08ee4f5-2a1c-49c4-bed3-cb7d377afcd3"/>
+ <dataSourceExpression><![CDATA[$P{adito.datasource.subdataPers}]]></dataSourceExpression>
+ <subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "Kontaktpersonen.jasper"]]></subreportExpression>
+ </subreport>
+ </band>
+ <band height="40">
+ <textField>
+ <reportElement x="0" y="2" width="100" height="15" forecolor="#0033FF" uuid="60192885-ecfd-46cd-9de1-67cd2e285d1b"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Activity}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="0" y="19" width="100" height="15" uuid="fbf2402f-6b63-48b9-814d-22d7f49d81db"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Date}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="103" y="19" width="100" height="15" uuid="652de0c2-220e-4bfc-a983-7335638307a5"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Contact type}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="221" y="19" width="100" height="15" uuid="eca234d8-ad5c-4b2e-aecd-81a9adff5f9d"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Employee}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="344" y="19" width="100" height="15" uuid="310e6639-fae6-4724-b353-d793069819b7"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Remark}]]></textFieldExpression>
+ </textField>
+ <line>
+ <reportElement x="0" y="36" width="555" height="1" uuid="419b9760-399c-4478-9a82-c1fd11d72994"/>
+ </line>
+ </band>
+ <band height="24">
+ <subreport>
+ <reportElement x="0" y="0" width="555" height="22" uuid="a47de115-bd5f-4a9f-95a5-2cb170fa0b9a"/>
+ <dataSourceExpression><![CDATA[$P{adito.datasource.subdataHist}]]></dataSourceExpression>
+ <subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "Historien.jasper"]]></subreportExpression>
+ </subreport>
+ </band>
+ <band height="19">
+ <textField>
+ <reportElement x="0" y="2" width="100" height="15" forecolor="#0033FF" uuid="4b8833cc-3fda-4a75-ae61-83fbfe995f72"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Attributes}]]></textFieldExpression>
+ </textField>
+ </band>
+ <band height="18">
+ <textField isStretchWithOverflow="true">
+ <reportElement x="10" y="5" width="534" height="13" uuid="1ef0e703-9180-4540-b094-e1bcc9983001"/>
+ <textElement textAlignment="Left" verticalAlignment="Middle">
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{ORGAttr}]]></textFieldExpression>
+ </textField>
+ <frame>
+ <reportElement stretchType="RelativeToBandHeight" x="0" y="2" width="555" height="16" uuid="62244829-371e-4972-b91d-cca3c857b15e"/>
+ <box>
+ <pen lineWidth="1.0"/>
+ <topPen lineWidth="1.0"/>
+ <leftPen lineWidth="1.0"/>
+ <bottomPen lineWidth="1.0"/>
+ <rightPen lineWidth="1.0"/>
+ </box>
+ </frame>
+ </band>
+ <band height="42">
+ <textField>
+ <reportElement x="0" y="20" width="100" height="15" uuid="ea868aed-1495-42b8-a398-b0a62ac0de80"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Subject}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="117" y="20" width="161" height="15" uuid="a2509776-a2f4-465d-851b-617468e91c3c"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Description}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="295" y="20" width="100" height="15" uuid="b3260378-eced-4883-ad0b-8692a3f83547"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Status}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="444" y="20" width="100" height="15" uuid="653a5cd5-4209-4570-b6c5-037285921d1a"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{responsible}]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="0" y="4" width="100" height="15" forecolor="#0033FF" uuid="41f65e5b-23a5-4d39-8f9a-267ccab96c76"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8" isUnderline="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Tasks}]]></textFieldExpression>
+ </textField>
+ <line>
+ <reportElement x="0" y="38" width="555" height="1" uuid="a3b5c9fc-f1a8-41bf-a3a7-efaab215acb8"/>
+ </line>
+ </band>
+ <band height="26">
+ <subreport>
+ <reportElement x="0" y="0" width="555" height="24" uuid="f39de822-874b-4624-89ae-d7300649f0fd"/>
+ <dataSourceExpression><![CDATA[$P{adito.datasource.subdataTask}]]></dataSourceExpression>
+ <subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "Aufgaben.jasper"]]></subreportExpression>
+ </subreport>
+ </band>
+ </detail>
+ <pageFooter>
+ <band height="38" splitType="Stretch">
+ <textField pattern="EEEEE dd MMMMM yyyy">
+ <reportElement x="378" y="17" width="102" height="20" forecolor="#999999" uuid="84480a49-acb2-48cd-9885-540b816d74f1"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
+ </textField>
+ <textField>
+ <reportElement x="480" y="17" width="45" height="20" forecolor="#999999" uuid="047a5366-fd18-439d-847d-8a20efb74d34"/>
+ <textElement textAlignment="Right">
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$R{Seite}+" "+$V{PAGE_NUMBER}+" "+$R{von}]]></textFieldExpression>
+ </textField>
+ <textField evaluationTime="Report">
+ <reportElement x="525" y="17" width="30" height="20" forecolor="#999999" uuid="fa23c12f-1e58-45d6-962d-0bbf70bc0032"/>
+ <textElement>
+ <font fontName="Segoe UI" size="8"/>
+ </textElement>
+ <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
+ </textField>
+ <line>
+ <reportElement x="0" y="9" width="555" height="1" forecolor="#999999" uuid="b45a4621-34b5-4c70-85e6-4fda980647ce"/>
+ </line>
+ </band>
+ </pageFooter>
+</jasperReport>