From ace7d86c85d1d00bcd1ec766cda93a9f89872324 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Thu, 27 Aug 2020 09:56:19 +0200
Subject: [PATCH] Scan Service fixes
---
.../entityfields/date_new/valueProcess.js | 7 +------
.../ActivityDetail_view.aod | 2 +-
.../TurnoverChart_view/TurnoverChart_view.aod | 19 +++++++++++++++++++
process/AI_lib/process.js | 16 ++++++++--------
process/Placeholder_lib/process.js | 2 --
process/Sql_lib/process.js | 8 ++++++--
6 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/entity/Person_entity/entityfields/date_new/valueProcess.js b/entity/Person_entity/entityfields/date_new/valueProcess.js
index 9cf1e32dd7..a72892783b 100644
--- a/entity/Person_entity/entityfields/date_new/valueProcess.js
+++ b/entity/Person_entity/entityfields/date_new/valueProcess.js
@@ -1,12 +1,7 @@
-import("Entity_lib");
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.get("$sys.date"));
-
- "$field.Attributes.deletedRows";
-
- EntityConsumerRowsHelper.getCurrentConsumerRows("Attributes", ["VALUE"])
\ No newline at end of file
+ result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 2d9626e9c3..870b77975c 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -19,7 +19,7 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>ca781b9b-9e93-41c3-9373-cb559c347194</name>
+ <name>041a6ded-06b3-4d84-be29-d89d01df6dec</name>
<entityField>INFO</entityField>
</entityFieldLink>
</fields>
diff --git a/neonView/TurnoverChart_view/TurnoverChart_view.aod b/neonView/TurnoverChart_view/TurnoverChart_view.aod
index 48b21c537b..09c915ae24 100644
--- a/neonView/TurnoverChart_view/TurnoverChart_view.aod
+++ b/neonView/TurnoverChart_view/TurnoverChart_view.aod
@@ -3,6 +3,25 @@
<name>TurnoverChart_view</name>
<title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>TurnoverDashlet</name>
+ <title>Turnover</title>
+ <fragment>Turnover/full</fragment>
+ <singleton v="true" />
+ <storeRoles>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+ </storeRoles>
+ <icon>VAADIN:CHART</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>turnover</name>
+ <title>Turnover</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
<layout>
<groupLayout>
<name>layout</name>
diff --git a/process/AI_lib/process.js b/process/AI_lib/process.js
index b0f8c0f063..0709d3aeef 100644
--- a/process/AI_lib/process.js
+++ b/process/AI_lib/process.js
@@ -11,14 +11,14 @@ import("AI_lib");
function AIUtil(){}
-function NBClassifier(options) {
- options = options || {};
- this.applyInverse = options.applyInverse || false;
- this.probabilityThreshold = options.probabilityThreshold || 0.5;
- this.defaultCategory = options.defaultCategory || null;
- this.tokens = options.tokens || {};
- this.categoryCounts = options.categoryCounts || {};
- this.probabilities = options.probabilities || {};
+function NBClassifier(pOptions) {
+ pOptions = pOptions || {};
+ this.applyInverse = pOptions.applyInverse || false;
+ this.probabilityThreshold = pOptions.probabilityThreshold || 0.5;
+ this.defaultCategory = pOptions.defaultCategory || null;
+ this.tokens = pOptions.tokens || {};
+ this.categoryCounts = pOptions.categoryCounts || {};
+ this.probabilities = pOptions.probabilities || {};
}
diff --git a/process/Placeholder_lib/process.js b/process/Placeholder_lib/process.js
index 4f271fa114..2c1cb9d821 100644
--- a/process/Placeholder_lib/process.js
+++ b/process/Placeholder_lib/process.js
@@ -106,8 +106,6 @@ PlaceholderUtils.getPlaceholders = function (pLocale, pIsExportTemplateField)
/**
* Returns the placeholder with the required prefix and postfix added.
- *
- * @deprecated
*/
PlaceholderUtils.formatPlaceholder = function (pPlaceholder)
{
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index dda96f2019..16f855efb7 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -621,9 +621,11 @@ SqlCondition.prototype._init = function() {
* @param {String} [pAlias=the current alias] the database alias where the condition shall be executed later (important for column types of preparedStatements)
*
* @return {Array[][][]} Prepared condition with [condition, [[field, type]]]
+ *
+ * @deprecated
*/
SqlCondition.equals = function(pField, pValue, pAlternativeCond, pAlias) {
- return SqlCondition.begin(pAlias).andPrepare(pField, pValue).build(pAlternativeCond);
+ return SqlCondition["begin"](pAlias).andPrepare(pField, pValue).build(pAlternativeCond);
}
/**
@@ -634,9 +636,11 @@ SqlCondition.equals = function(pField, pValue, pAlternativeCond, pAlias) {
* @param {String} [pAlias=the current alias] the database alias where the condition shall be executed later (important for column types of preparedStatements)
*
* @return {Array[][][]} Prepared condition with [condition, [[field, type]]]
+ *
+ * @deprecated
*/
SqlCondition.equalsNot = function(pField, pValue, pAlternativeCond, pAlias) {
- return SqlCondition.begin(pAlias).andPrepare(pField, pValue, "# <> ?").build(pAlternativeCond);
+ return SqlCondition["begin"](pAlias).andPrepare(pField, pValue, "# <> ?").build(pAlternativeCond);
}
// see Documentation property of this lib for further explanation
--
GitLab