From d048f48aab59aa4187cbd3f99789f08f33a87c35 Mon Sep 17 00:00:00 2001
From: "A.Voegl" <A.Voegl@avoegl.aditosoftware.local>
Date: Thu, 28 Feb 2019 13:31:44 +0100
Subject: [PATCH] Keyword PossibleItemProcess
---
entity/Activity_entity/Activity_entity.aod | 1 -
.../category/possibleItemsProcess.js | 5 ---
entity/Address_entity/Address_entity.aod | 1 -
.../addr_type/possibleItemsProcess.js | 35 -------------------
.../Communication_entity.aod | 1 -
.../medium_id/possibleItemsProcess.js | 7 ----
entity/Offer_entity/Offer_entity.aod | 1 -
.../probability/possibleItemsProcess.js | 4 ---
.../Organisation_entity.aod | 3 --
.../price_politics/possibleItemsProcess.js | 4 ---
.../strength/possibleItemsProcess.js | 4 ---
.../weakness/possibleItemsProcess.js | 4 ---
.../Salesproject_entity.aod | 3 --
.../estimation/possibleItemsProcess.js | 7 ----
.../phase/possibleItemsProcess.js | 4 ---
.../state/possibleItemsProcess.js | 7 ----
entity/Task_entity/Task_entity.aod | 1 -
.../priority/possibleItemsProcess.js | 7 ----
.../data_alias/basic/2019.2/changelog.xml | 1 +
report/RPTJ_OFFER/reportData.jrxml | 4 +--
20 files changed, 3 insertions(+), 101 deletions(-)
delete mode 100644 entity/Activity_entity/entityfields/category/possibleItemsProcess.js
delete mode 100644 entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
delete mode 100644 entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js
delete mode 100644 entity/Offer_entity/entityfields/probability/possibleItemsProcess.js
delete mode 100644 entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js
delete mode 100644 entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js
delete mode 100644 entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js
delete mode 100644 entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
delete mode 100644 entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js
delete mode 100644 entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js
delete mode 100644 entity/Task_entity/entityfields/priority/possibleItemsProcess.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 828a597ae73..4794363e2cf 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -37,7 +37,6 @@
<name>CATEGORY</name>
<title>Category</title>
<mandatory v="false" />
- <possibleItemsProcess>%aditoprj%/entity/Activity_entity/entityfields/category/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
</entityField>
<entityField>
diff --git a/entity/Activity_entity/entityfields/category/possibleItemsProcess.js b/entity/Activity_entity/entityfields/category/possibleItemsProcess.js
deleted file mode 100644
index 921a43cb394..00000000000
--- a/entity/Activity_entity/entityfields/category/possibleItemsProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items = LegacyKeywordUtils.getStandardArray("ACTIVITY.CATEGORY");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 2bbdb1138f4..70147ab1638 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -26,7 +26,6 @@
<name>ADDR_TYPE</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
<title>Addresstype</title>
- <possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>BUILDINGNO</name>
diff --git a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
deleted file mode 100644
index f65e4812fc2..00000000000
--- a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("Keyword_lib");
-import("Contact_lib");
-
-if (vars.exists("$param.ContactType_param") && parseInt(vars.get("$param.ContactType_param"))) {
- var type = parseInt(vars.get("$param.ContactType_param"));
- var fields = [];
- //logging.log(type)
- switch (type) {
- case 1:
- fields = ["org"];
- break;
- case 2:
- fields = ["person"];
- case 3:
- fields = ["person"];
- break;
- }
-
- var resultKeywords = [];
- LegacyKeywordUtils.getStandardArrayProps("ADDRESS.TYPE").forEach(function(pKeyword) {
- for (let i = 0; i < fields.length; i++) {
- if (pKeyword[2][fields[i]]) {
- resultKeywords.push([pKeyword[0], pKeyword[1]]);
- break;
- }
- }
- });
-
- result.object(resultKeywords);
-}
-
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index ec2b11927e9..9f02ddbc74d 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -22,7 +22,6 @@
<name>MEDIUM_ID</name>
<title>Medium</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>CONTACT_ID</name>
diff --git a/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js b/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js
deleted file mode 100644
index c92cbb25494..00000000000
--- a/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.text");
-import("system.vars");
-import("system.result");
-import("Keyword_lib");
-
-var items = LegacyKeywordUtils.getStandardArray("COMMUNICATION.MEDIUM");
-result.object(items);
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 253537e5a0a..ed4ee9cf145 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -42,7 +42,6 @@
<entityField>
<name>PROBABILITY</name>
<title>Probability</title>
- <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>CONTACT_ID</name>
diff --git a/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js b/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js
deleted file mode 100644
index 55d36f47860..00000000000
--- a/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("OFFER.PROBABILITY"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1408247f3f4..2d057cb987b 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -305,19 +305,16 @@
<entityField>
<name>PRICE_POLITICS</name>
<title>Price politics</title>
- <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
<name>STRENGTH</name>
<title>Strength</title>
- <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
<name>WEAKNESS</name>
<title>Weakness</title>
- <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
diff --git a/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js
deleted file mode 100644
index 0a795d357bb..00000000000
--- a/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.PRICE_POLITICS"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js
deleted file mode 100644
index 75aef701340..00000000000
--- a/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.STRENGTH"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js
deleted file mode 100644
index cf8185dc33c..00000000000
--- a/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.WEAKNESS"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index fbdf0e7d1ea..cf7568a176c 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -34,7 +34,6 @@
<entityField>
<name>ESTIMATION</name>
<title>Estimation</title>
- <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js</possibleItemsProcess>
<selectionMode>MULTI</selectionMode>
</entityField>
<entityField>
@@ -49,7 +48,6 @@
<name>PHASE</name>
<title>Phase</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>PROJECTCODE</name>
@@ -87,7 +85,6 @@
<name>STATE</name>
<title>Status</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>VOLUME</name>
diff --git a/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
deleted file mode 100644
index f527f159dc2..00000000000
--- a/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = LegacyKeywordUtils.getStandardArray("SALESPROJECT.ESTIMATION");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js
deleted file mode 100644
index b539741cfe6..00000000000
--- a/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.PHASE"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js
deleted file mode 100644
index 904fa16280f..00000000000
--- a/entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = LegacyKeywordUtils.getStandardArray("SALESPROJECT.STATE");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 57761954d1b..8ebd30b7110 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -38,7 +38,6 @@
<name>PRIORITY</name>
<title>priority</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/priority/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Task_entity/entityfields/priority/possibleItemsProcess.js b/entity/Task_entity/entityfields/priority/possibleItemsProcess.js
deleted file mode 100644
index 83efeb09de4..00000000000
--- a/entity/Task_entity/entityfields/priority/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = LegacyKeywordUtils.getStandardArray("TASK.PRIORITY");
-result.object(items);
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index c120f58de5d..47c3a82e404 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -43,6 +43,7 @@
<include relativeToChangelogFile="true" file="AddressType.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectEstimation.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectStrength.xml"/>
+ <include relativeToChangelogFile="true" file="SalesProjectPhase.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectState.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectWeakness.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectPricePolitics.xml"/>
diff --git a/report/RPTJ_OFFER/reportData.jrxml b/report/RPTJ_OFFER/reportData.jrxml
index cc52933641c..5ec99598ff7 100644
--- a/report/RPTJ_OFFER/reportData.jrxml
+++ b/report/RPTJ_OFFER/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="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="1.771561000000001"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="113"/>
+ <property name="ireport.y" value="0"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Pos" class="java.lang.String"/>
<parameter name="Artikelbezeichnung" class="java.lang.String"/>
@@ -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-Basic2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\Users\\a.voegl\\Documents\\AditoProjects\\xRM-Basic 2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
--
GitLab