From c7dcf2d25b41c7e4a4f97a5b72a356111e97d589 Mon Sep 17 00:00:00 2001 From: "j.goderbauer" <j.goderbauer@adito.de> Date: Mon, 11 Feb 2019 21:30:30 +0100 Subject: [PATCH] ORG -> ORGANISATION COMM -> COMMUNICATION --- .../Communication_entity.aod | 2 +- .../entityfields/addr/onValidation.js | 2 +- .../entityfields/commmediumids_param/code.js | 2 +- .../recordcontainers/db/onDBUpdate.js | 2 +- .../expression.js | 2 +- .../expression.js | 2 +- .../entityfields/image/valueProcess.js | 2 +- .../entityfields/orgreport/onActionProcess.js | 2 +- .../recordcontainers/db/onDBUpdate.js | 4 +- .../expression.js | 2 +- .../expression.js | 2 +- .../entityfields/image/valueProcess.js | 2 +- .../standard_email_comm.value/expression.js | 2 +- .../standard_phone_comm.value/expression.js | 2 +- .../Communication_lib.aod} | 4 +- .../process.js | 2 +- .../Organisation_lib.aod} | 4 +- .../{Org_lib => Organisation_lib}/process.js | 2 +- .../Aufgaben.jrxml | 0 .../Historien.jrxml | 0 .../Kommunikationsdaten.jrxml | 0 .../Kontaktpersonen.jrxml | 0 .../RPTJ_ORGANISATION.aod} | 122 +++++++++--------- .../{RPTJ_ORG => RPTJ_ORGANISATION}/icon.png | Bin .../iconInactive.png | Bin .../myLogo.png | Bin .../reportData.jrxml | 2 +- 27 files changed, 83 insertions(+), 83 deletions(-) rename process/{Comm_lib/Comm_lib.aod => Communication_lib/Communication_lib.aod} (78%) rename process/{Comm_lib => Communication_lib}/process.js (98%) rename process/{Org_lib/Org_lib.aod => Organisation_lib/Organisation_lib.aod} (79%) rename process/{Org_lib => Organisation_lib}/process.js (99%) rename report/{RPTJ_ORG => RPTJ_ORGANISATION}/Aufgaben.jrxml (100%) rename report/{RPTJ_ORG => RPTJ_ORGANISATION}/Historien.jrxml (100%) rename report/{RPTJ_ORG => RPTJ_ORGANISATION}/Kommunikationsdaten.jrxml (100%) rename report/{RPTJ_ORG => RPTJ_ORGANISATION}/Kontaktpersonen.jrxml (100%) rename report/{RPTJ_ORG/RPTJ_ORG.aod => RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod} (63%) rename report/{RPTJ_ORG => RPTJ_ORGANISATION}/icon.png (100%) rename report/{RPTJ_ORG => RPTJ_ORGANISATION}/iconInactive.png (100%) rename report/{RPTJ_ORG => RPTJ_ORGANISATION}/myLogo.png (100%) rename report/{RPTJ_ORG => RPTJ_ORGANISATION}/reportData.jrxml (99%) diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod index b611eab194..a1548f7d85 100644 --- a/entity/Communication_entity/Communication_entity.aod +++ b/entity/Communication_entity/Communication_entity.aod @@ -15,7 +15,7 @@ </entityField> <entityField> <name>COMMUNICATIONID</name> - <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commid/valueProcess.js</valueProcess> + <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/communicationid/valueProcess.js</valueProcess> </entityField> <entityField> <name>MEDIUM_ID</name> diff --git a/entity/Communication_entity/entityfields/addr/onValidation.js b/entity/Communication_entity/entityfields/addr/onValidation.js index 2a4456424e..9a76546b12 100644 --- a/entity/Communication_entity/entityfields/addr/onValidation.js +++ b/entity/Communication_entity/entityfields/addr/onValidation.js @@ -4,7 +4,7 @@ import("system.net"); import("system.result"); import("system.mail"); import("Keyword_lib"); -import("Comm_lib"); +import("Communication_lib"); import("Util_lib"); import("Entity_lib"); diff --git a/entity/Communication_entity/entityfields/commmediumids_param/code.js b/entity/Communication_entity/entityfields/commmediumids_param/code.js index fd6b104be9..6c37c4e368 100644 --- a/entity/Communication_entity/entityfields/commmediumids_param/code.js +++ b/entity/Communication_entity/entityfields/commmediumids_param/code.js @@ -1,6 +1,6 @@ import("system.result"); import("system.vars"); -import("Comm_lib") +import("Communication_lib") var commCategory = vars.exists("$param.CommCategory_param") ? vars.get("$param.CommCategory_param") : null; diff --git a/entity/Contact_entity/recordcontainers/db/onDBUpdate.js b/entity/Contact_entity/recordcontainers/db/onDBUpdate.js index a48732960f..2205c50893 100644 --- a/entity/Contact_entity/recordcontainers/db/onDBUpdate.js +++ b/entity/Contact_entity/recordcontainers/db/onDBUpdate.js @@ -1,6 +1,6 @@ import("system.vars"); import("Pers_lib"); -import("Comm_lib"); +import("Communication_lib"); import("Entity_lib"); // TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js index a371c71fba..41ef07ff58 100644 --- a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js +++ b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js @@ -1,5 +1,5 @@ import("system.result"); -import("Comm_lib"); +import("Communication_lib"); var res = CommUtil.getStandardSubSqlMail(); result.string(res); \ No newline at end of file diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js index 9b0174b05e..320ae40ad1 100644 --- a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js +++ b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js @@ -1,5 +1,5 @@ import("system.result"); -import("Comm_lib"); +import("Communication_lib"); var res = CommUtil.getStandardSubSqlPhone(); result.string(res); \ No newline at end of file diff --git a/entity/Organisation_entity/entityfields/image/valueProcess.js b/entity/Organisation_entity/entityfields/image/valueProcess.js index 8b7a8d6292..ff2e70283d 100644 --- a/entity/Organisation_entity/entityfields/image/valueProcess.js +++ b/entity/Organisation_entity/entityfields/image/valueProcess.js @@ -1,7 +1,7 @@ import("system.result"); import("system.neon"); import("system.vars"); -import("Org_lib"); +import("Organisation_lib"); if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW) { diff --git a/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js b/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js index 11e0912356..1e5bcbc94c 100644 --- a/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js +++ b/entity/Organisation_entity/entityfields/orgreport/onActionProcess.js @@ -1,4 +1,4 @@ import("system.vars"); -import("Org_lib"); +import("Organisation_lib"); OrgUtils.openOrgReport(vars.get("$field.ORGANISATIONID")); \ No newline at end of file diff --git a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js index 4716b81b24..38981a5ca0 100644 --- a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js +++ b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js @@ -1,6 +1,6 @@ import("system.vars"); -import("Org_lib"); -import("Comm_lib"); +import("Organisation_lib"); +import("Communication_lib"); import("Entity_lib"); // TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Container diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js index a371c71fba..41ef07ff58 100644 --- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js +++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.displayvalue/expression.js @@ -1,5 +1,5 @@ import("system.result"); -import("Comm_lib"); +import("Communication_lib"); var res = CommUtil.getStandardSubSqlMail(); result.string(res); \ No newline at end of file diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js index 9b0174b05e..320ae40ad1 100644 --- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js +++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.displayvalue/expression.js @@ -1,5 +1,5 @@ import("system.result"); -import("Comm_lib"); +import("Communication_lib"); var res = CommUtil.getStandardSubSqlPhone(); result.string(res); \ No newline at end of file diff --git a/entity/Relation_entity/entityfields/image/valueProcess.js b/entity/Relation_entity/entityfields/image/valueProcess.js index 899580f391..bcd36563dc 100644 --- a/entity/Relation_entity/entityfields/image/valueProcess.js +++ b/entity/Relation_entity/entityfields/image/valueProcess.js @@ -2,7 +2,7 @@ import("system.result"); import("system.neon"); import("system.vars"); import("Pers_lib"); -import("Org_lib"); +import("Organisation_lib"); import("Relation_lib"); if (vars.get("$field.relationType") == 1) // 1 == org, 2 == pers, 3 == pers diff --git a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js b/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js index a371c71fba..41ef07ff58 100644 --- a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js +++ b/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_email_comm.value/expression.js @@ -1,5 +1,5 @@ import("system.result"); -import("Comm_lib"); +import("Communication_lib"); var res = CommUtil.getStandardSubSqlMail(); result.string(res); \ No newline at end of file diff --git a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js b/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js index 9b0174b05e..320ae40ad1 100644 --- a/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js +++ b/entity/Relation_entity/recordcontainers/db/recordfieldmappings/standard_phone_comm.value/expression.js @@ -1,5 +1,5 @@ import("system.result"); -import("Comm_lib"); +import("Communication_lib"); var res = CommUtil.getStandardSubSqlPhone(); result.string(res); \ No newline at end of file diff --git a/process/Comm_lib/Comm_lib.aod b/process/Communication_lib/Communication_lib.aod similarity index 78% rename from process/Comm_lib/Comm_lib.aod rename to process/Communication_lib/Communication_lib.aod index f48c5917e1..ca86639430 100644 --- a/process/Comm_lib/Comm_lib.aod +++ b/process/Communication_lib/Communication_lib.aod @@ -1,8 +1,8 @@ <?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.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7"> - <name>Comm_lib</name> + <name>Communication_lib</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <process>%aditoprj%/process/Comm_lib/process.js</process> + <process>%aditoprj%/process/Communication_lib/process.js</process> <variants> <element>LIBRARY</element> </variants> diff --git a/process/Comm_lib/process.js b/process/Communication_lib/process.js similarity index 98% rename from process/Comm_lib/process.js rename to process/Communication_lib/process.js index a7f379a4d5..8be0346dc3 100644 --- a/process/Comm_lib/process.js +++ b/process/Communication_lib/process.js @@ -62,7 +62,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p { //set the new standard comm-record cond.clear(); - //check commid, relId and medium to prevent data-inconsistency when bad function params are passed by (e.g commid of a different category) + //check communicationid, relId and medium to prevent data-inconsistency when bad function params are passed by (e.g communicationid of a different category) cond.andPrepare("COMMUNICATION.COMMUNICATIONID", pNewStandardCommId).andPrepare("COMMUNICATION.RELATION_ID", pAffectedRowId); cond.and("MEDIUM_ID in (" + mediumIds.join(", ") + ")"); statements.push(["COMMUNICATION", cols, types, ["1"], cond.build()]); diff --git a/process/Org_lib/Org_lib.aod b/process/Organisation_lib/Organisation_lib.aod similarity index 79% rename from process/Org_lib/Org_lib.aod rename to process/Organisation_lib/Organisation_lib.aod index fbe4265479..5000efd97b 100644 --- a/process/Org_lib/Org_lib.aod +++ b/process/Organisation_lib/Organisation_lib.aod @@ -1,8 +1,8 @@ <?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.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7"> - <name>Org_lib</name> + <name>Organisation_lib</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <process>%aditoprj%/process/Org_lib/process.js</process> + <process>%aditoprj%/process/Organisation_lib/process.js</process> <alias>Data_alias</alias> <variants> <element>LIBRARY</element> diff --git a/process/Org_lib/process.js b/process/Organisation_lib/process.js similarity index 99% rename from process/Org_lib/process.js rename to process/Organisation_lib/process.js index 05f9696d81..661626657f 100644 --- a/process/Org_lib/process.js +++ b/process/Organisation_lib/process.js @@ -162,7 +162,7 @@ OrgUtils.openOrgReport = function(pOrgId) "INFO" : info }; - var orgReport = new Report("RPTJ_ORG", params); + var orgReport = new Report("RPTJ_ORGANISATION", params); //add subreport data orgReport.addSubReportData("subdataComm", commData); diff --git a/report/RPTJ_ORG/Aufgaben.jrxml b/report/RPTJ_ORGANISATION/Aufgaben.jrxml similarity index 100% rename from report/RPTJ_ORG/Aufgaben.jrxml rename to report/RPTJ_ORGANISATION/Aufgaben.jrxml diff --git a/report/RPTJ_ORG/Historien.jrxml b/report/RPTJ_ORGANISATION/Historien.jrxml similarity index 100% rename from report/RPTJ_ORG/Historien.jrxml rename to report/RPTJ_ORGANISATION/Historien.jrxml diff --git a/report/RPTJ_ORG/Kommunikationsdaten.jrxml b/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml similarity index 100% rename from report/RPTJ_ORG/Kommunikationsdaten.jrxml rename to report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml diff --git a/report/RPTJ_ORG/Kontaktpersonen.jrxml b/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml similarity index 100% rename from report/RPTJ_ORG/Kontaktpersonen.jrxml rename to report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml diff --git a/report/RPTJ_ORG/RPTJ_ORG.aod b/report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod similarity index 63% rename from report/RPTJ_ORG/RPTJ_ORG.aod rename to report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod index abf4c1b374..5bb351fd24 100644 --- a/report/RPTJ_ORG/RPTJ_ORG.aod +++ b/report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod @@ -1,61 +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> +<?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_ORGANISATION</name> + <title>Kundenstammblatt</title> + <description></description> + <majorModelMode>DISTRIBUTED</majorModelMode> + <icon>%aditoprj%/report/RPTJ_ORGANISATION/icon.png</icon> + <iconInactive>%aditoprj%/report/RPTJ_ORGANISATION/iconInactive.png</iconInactive> + <reportData>%aditoprj%/report/RPTJ_ORGANISATION/reportData.jrxml</reportData> + <reportType>JASPER</reportType> + <subReports> + <subreport> + <name>Kontaktpersonen</name> + <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Kontaktpersonen.jrxml</reportData> + </subreport> + <subreport> + <name>Historien</name> + <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Historien.jrxml</reportData> + </subreport> + <subreport> + <name>Aufgaben</name> + <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Aufgaben.jrxml</reportData> + </subreport> + <subreport> + <name>Kommunikationsdaten</name> + <reportData>%aditoprj%/report/RPTJ_ORGANISATION/Kommunikationsdaten.jrxml</reportData> + </subreport> + </subReports> + <images> + <image> + <name>myLogo</name> + <fileName>myLogo.png</fileName> + <imageData>%aditoprj%/report/RPTJ_ORGANISATION/myLogo.png</imageData> + </image> + <image> + <name>icon</name> + <fileName>icon.png</fileName> + <imageData>%aditoprj%/report/RPTJ_ORGANISATION/icon.png</imageData> + </image> + <image> + <name>iconInactive</name> + <fileName>iconInactive.png</fileName> + <imageData>%aditoprj%/report/RPTJ_ORGANISATION/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_ORGANISATION/icon.png similarity index 100% rename from report/RPTJ_ORG/icon.png rename to report/RPTJ_ORGANISATION/icon.png diff --git a/report/RPTJ_ORG/iconInactive.png b/report/RPTJ_ORGANISATION/iconInactive.png similarity index 100% rename from report/RPTJ_ORG/iconInactive.png rename to report/RPTJ_ORGANISATION/iconInactive.png diff --git a/report/RPTJ_ORG/myLogo.png b/report/RPTJ_ORGANISATION/myLogo.png similarity index 100% rename from report/RPTJ_ORG/myLogo.png rename to report/RPTJ_ORGANISATION/myLogo.png diff --git a/report/RPTJ_ORG/reportData.jrxml b/report/RPTJ_ORGANISATION/reportData.jrxml similarity index 99% rename from report/RPTJ_ORG/reportData.jrxml rename to report/RPTJ_ORGANISATION/reportData.jrxml index 680bfe72fe..d6b03f1398 100644 --- a/report/RPTJ_ORG/reportData.jrxml +++ b/report/RPTJ_ORGANISATION/reportData.jrxml @@ -14,7 +14,7 @@ <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> + <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_ORGANISATION\\"]]></defaultValueExpression> </parameter> <parameter name="adito.image.myLogo" class="java.lang.String"/> <parameter name="adito.datasource.subdataHist" class="java.lang.Object"/> -- GitLab