From 8cb82a4465beb3d06652698de591d558f4ae72d4 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 21 Jan 2021 15:43:32 +0100
Subject: [PATCH] fix several Scanservices
---
entity/Analyses_entity/Analyses_entity.aod | 3 +++
.../MSTeamsMessage_entity.aod | 3 +++
.../SalesprojectAnalyses_entity.aod | 4 ++++
.../SalesprojectConversionRate_entity.aod | 4 ++++
.../VisitPlanEntry_entity.aod | 4 ++++
.../entityfields/contact_id/valueProcess.js | 19 -------------------
.../VisitRecommendation_entity.aod | 2 ++
7 files changed, 20 insertions(+), 19 deletions(-)
delete mode 100644 entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 185dc5dacb..7d49b0bd6a 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -31,14 +31,17 @@
<entityActionField>
<name>openCalendar</name>
<onActionProcess>%aditoprj%/entity/Analyses_entity/entityfields/opencalendar/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CALENDAR</iconId>
</entityActionField>
<entityActionField>
<name>openNewTasks</name>
<onActionProcess>%aditoprj%/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
</entityActionField>
<entityActionField>
<name>openOverdueTasks</name>
<onActionProcess>%aditoprj%/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TIME_FORWARD</iconId>
</entityActionField>
<entityField>
<name>TURNOVER_FORECAST</name>
diff --git a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
index d389e9c6ef..eb9b4954de 100644
--- a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
+++ b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
@@ -61,14 +61,17 @@
<name>importMessages</name>
<title>Import</title>
<onActionProcess>%aditoprj%/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js</onActionProcess>
+ <iconId>NEON:IMPORT</iconId>
</entityActionField>
<entityActionField>
<name>loadNext</name>
<title>Next</title>
+ <iconId>VAADIN:ARROWS_LONG_RIGHT</iconId>
</entityActionField>
<entityActionField>
<name>loadPrevious</name>
<title>Prev</title>
+ <iconId>VAADIN:ARROW_LONG_LEFT</iconId>
</entityActionField>
</entityFields>
<recordContainers>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 027b027c5f..153d97d730 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -56,18 +56,22 @@
<entityActionField>
<name>openSalesprojects</name>
<onActionProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/opensalesprojects/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:BOOK_DOLLAR</iconId>
</entityActionField>
<entityActionField>
<name>sentOffers</name>
<onActionProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sentoffers/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
</entityActionField>
<entityActionField>
<name>openForecast</name>
<onActionProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/openforecast/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:BAR_CHART_H</iconId>
</entityActionField>
<entityActionField>
<name>openTurnover</name>
<onActionProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/openturnover/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CHART</iconId>
</entityActionField>
<entityField>
<name>MY_FORECAST</name>
diff --git a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
index b680e9ca07..834661f182 100644
--- a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
+++ b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod
@@ -23,18 +23,22 @@
<entityActionField>
<name>openSalesprojects</name>
<onActionProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/opensalesprojects/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:BOOK_DOLLAR</iconId>
</entityActionField>
<entityActionField>
<name>sentOffers</name>
<onActionProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/sentoffers/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
</entityActionField>
<entityActionField>
<name>openForecast</name>
<onActionProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/openforecast/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:BAR_CHART_H</iconId>
</entityActionField>
<entityActionField>
<name>openTurnover</name>
<onActionProcess>%aditoprj%/entity/SalesprojectConversionRate_entity/entityfields/openturnover/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CHART</iconId>
</entityActionField>
<entityField>
<name>AB_KEYWORD_ENTRYID_KEYID</name>
diff --git a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index 2884ac2165..754652a4c4 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
@@ -224,6 +224,10 @@
<valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/orgid_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OnlyShowContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityParameter>
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
deleted file mode 100644
index 5219318029..0000000000
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("Sql_lib");
-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && (vars.get("$this.value") == null || vars.get("$this.value") == undefined))
-{
- var isPersonContact = newSelect("PERSON.PERSONID").from("PERSON")
- .join("CONTACT", "PERSON.PERSONID = CONTACT.PERSON_ID")
- .whereIfSet("CONTACT.CONTACTID", vars.get("$param.ContactId_param")).cell()
-
- if(isPersonContact)
- result.string(vars.get("$param.ContactId_param"));
-}
-
-
diff --git a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
index 2158990f7d..150a4ab576 100644
--- a/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
+++ b/entity/VisitRecommendation_entity/VisitRecommendation_entity.aod
@@ -6,6 +6,8 @@
<documentation>%aditoprj%/entity/VisitRecommendation_entity/documentation.adoc</documentation>
<iconProcess>%aditoprj%/entity/VisitRecommendation_entity/iconProcess.js</iconProcess>
<grantCreate v="true" />
+ <grantUpdateProcess>%aditoprj%/entity/VisitRecommendation_entity/grantUpdateProcess.js</grantUpdateProcess>
+ <grantDeleteProcess>%aditoprj%/entity/VisitRecommendation_entity/grantDeleteProcess.js</grantDeleteProcess>
<initFilterProcess>%aditoprj%/entity/VisitRecommendation_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:BRIEFCASE</iconId>
<image>VAADIN:BRIEFCASE</image>
--
GitLab