diff --git a/entity/Person_entity/entityfields/date_new/valueProcess.js b/entity/Person_entity/entityfields/date_new/valueProcess.js index 9cf1e32dd7589343d75e9bb383ee1566973f3484..a72892783bf2bd04fe353c47f1be0cb570bbb323 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 2d9626e9c380c820c6e26c3ff4da7ae521eba0b7..870b77975c3fde5e3c371ff98ac417bc4d57b598 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 48b21c537b37eb6f43e25a9bcdaf52c082fd1513..09c915ae244fe4d5a1f755ef287ef850ef2cd3c4 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 b0f8c0f06354aee7dd7718887cafa97f7f92b2d6..0709d3aeef15fdbc0ef317561c794e49d94acc35 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 4f271fa114efc53ff3bb909ea0d4692436e8cead..2c1cb9d8214a5b5ca9d0698a3d7dc14d345cdf64 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 dda96f201905fe2446a76abec33a8521c3019a76..16f855efb71eeb30018874ca1755cf21d2f89a79 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