From 2b3ce20c185c0fe48a7c1716138c355f66f99deb Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 24 May 2019 14:47:38 +0200
Subject: [PATCH] Refactor classification: Renameable scoretype
---
.../create_classification_tables.xml | 2 +-
.../insert_classification_scores.xml | 118 +++++++++---------
aliasDefinition/Data_alias/Data_alias.aod | 28 ++---
.../_____SYSTEM_APPLICATION_NEON.aod | 1 -
.../ClassificationAdmin_entity.aod | 8 --
.../ClassificationScore_entity.aod | 22 ++--
.../displayValueProcess.js | 7 ++
.../valueProcess.js | 2 +-
.../entityfields/maxvalue/valueProcess.js | 6 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../expression.js | 3 +
.../Classification_entity.aod | 34 ++---
.../valueProcess.js | 4 +
.../children/scoretype_param/valueProcess.js | 4 -
.../entityfields/info/valueProcess.js | 4 +-
.../scoretype/displayValueProcess.js | 4 +-
.../scoretype/mandatoryProcess.js | 5 -
.../entityfields/scoretype/onValidation.js | 21 ----
.../entityfields/scoretype/stateProcess.js | 12 --
.../recordcontainers/jdito/onDelete.js | 8 +-
.../recordcontainers/jdito/onUpdate.js | 8 +-
.../ClassificationAdmin.aod | 2 +
.../ClassificationAdmin/documentation.adoc | 1 +
process/Classification_lib/process.js | 12 +-
24 files changed, 136 insertions(+), 182 deletions(-)
create mode 100644 entity/ClassificationScore_entity/entityfields/classificationtype_id/displayValueProcess.js
rename entity/ClassificationScore_entity/entityfields/{scoretype => classificationtype_id}/valueProcess.js (67%)
create mode 100644 entity/ClassificationScore_entity/recordcontainers/db/recordfieldmappings/classificationtype_id.displayvalue/expression.js
create mode 100644 entity/Classification_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
delete mode 100644 entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js
delete mode 100644 entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js
delete mode 100644 entity/Classification_entity/entityfields/scoretype/onValidation.js
delete mode 100644 entity/Classification_entity/entityfields/scoretype/stateProcess.js
create mode 100644 neonContext/ClassificationAdmin/documentation.adoc
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml b/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml
index 682fc8de2e5..e026fa59c7f 100644
--- a/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/create_classification_tables.xml
@@ -23,7 +23,7 @@
<column name="CLASSIFICATIONSCOREID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_CLASSIFICATIONSCORE_CLASSIFICATIONSCOREID"/>
</column>
- <column name="SCORETYPE" type="VARCHAR(80)"/>
+ <column name="CLASSIFICATIONTYPE_ID" type="CHAR(36)"/>
<column name="TITLE" type="NVARCHAR(50)"/>
<column name="SCORE" type="NUMERIC(10,2)"/>
<column name="SORT" type="INTEGER"/>
diff --git a/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml
index c3fa2cdbcd1..208aa9425a0 100644
--- a/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml
+++ b/.liquibase/Data_alias/basic/2019.2/Classification/insert_classification_scores.xml
@@ -2,413 +2,413 @@
<changeSet author="j.hoermann" id="286d5a05-7618-414b-9e96-81b1c407b473">
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="01840c9d-2856-4882-a12a-303e58fd9d30"/>
- <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
<column name="TITLE" value="Purchasing"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="50"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="0803779b-73d8-47b3-9705-f5771c01e6a3"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Automotive"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="140"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="10419ecc-335b-43c3-a1e3-8ecfbeda6f2b"/>
- <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
<column name="TITLE" value="Project management"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="60"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="11418754-1667-437b-816b-adec4b9291f3"/>
- <column name="SCORETYPE" value="ScoreProjectStart"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
<column name="TITLE" value="No project planned"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="40"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="1bc2b2aa-2582-4b0c-a2f8-04125b82ba33"/>
- <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
<column name="TITLE" value="Service"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="40"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="1f924d71-c500-4cdd-bc52-4718a6b88e45"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Consultation"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="70"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="2a516661-537d-473e-864a-c2f721b96a42"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Service"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="180"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="2f3b6088-d78f-4fba-998d-b18a6b981485"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Environment"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="170"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="2f4fddd2-be83-4190-99c3-6de8a7e328c5"/>
- <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
<column name="TITLE" value="0 to 49T"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="50"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="2fdb4d7e-24d5-4eb1-a130-3a0aaeebd8db"/>
- <column name="SCORETYPE" value="ScoreBased"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
<column name="TITLE" value="Germany"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="3035e36e-ee6a-45d1-9d68-920cd3666362"/>
- <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
<column name="TITLE" value="Student/Internship"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="70"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="35d8ae15-8993-4ab2-99f6-e57c2ebf0bb3"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Food"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="80"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="39547328-ccc6-47ad-b31a-d6a149081c44"/>
- <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
<column name="TITLE" value="0 to 49"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="50"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="3c9ceefa-5c98-4629-9c6d-d46b6cad8b78"/>
- <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
<column name="TITLE" value="251 to 1,000"/>
<column name="SCORE" valueNumeric="30.00"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="3dc5fc76-d2d5-4911-891a-3aacc5a9c925"/>
- <column name="SCORETYPE" value="ScoreCustomizing"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
<column name="TITLE" value="Yes"/>
<column name="SCORE" valueNumeric="25.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="3e1e21b0-c10d-4bcb-882c-ac1b239b9cb2"/>
- <column name="SCORETYPE" value="ScoreStandard"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
<column name="TITLE" value="Standard"/>
<column name="SCORE" valueNumeric="12.50"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="3fe9f04b-6a85-4a73-a138-ca90b6d8e61c"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Public"/>
<column name="SCORE" valueNumeric="50.00"/>
<column name="SORT" valueNumeric="190"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="41300a6c-8dc7-4b5a-9fb1-cecd3d5cbb8c"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Electric"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="160"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="41d43723-7d19-4a7e-936a-df9013db7dfb"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Logistics"/>
<column name="SCORE" valueNumeric="50.00"/>
<column name="SORT" valueNumeric="30"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="47ec3dbf-f8f6-4418-8dc2-0062510c1a28"/>
- <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
<column name="TITLE" value="Sales"/>
<column name="SCORE" valueNumeric="7.50"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="56a56ec0-34c1-419f-81c2-1c1310d685d2"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Education"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="120"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="5ca391a5-9de8-41e6-9792-17cf8deaa7e7"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Energy"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="90"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="61fe4e4f-e64d-4195-87b5-658f36ce1736"/>
- <column name="SCORETYPE" value="ScoreStandard"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
<column name="TITLE" value="Individual"/>
<column name="SCORE" valueNumeric="25.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="636af750-fcd3-4480-bfe7-ead42bf85280"/>
- <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
<column name="TITLE" value="Choice"/>
<column name="SCORE" valueNumeric="30.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="6bd19de4-691b-4e78-84dc-cf6f41231978"/>
- <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
<column name="TITLE" value="Management/Sales Manager"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="6d6653ae-024e-444c-aeae-561874d55569"/>
- <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
<column name="TITLE" value="50 to 99T"/>
<column name="SCORE" valueNumeric="10.00"/>
<column name="SORT" valueNumeric="40"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="77a0088c-a665-4feb-9f60-99c1eb710015"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Lifesience"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="50"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="7d6f716a-97c7-417b-a8c0-3cb71e403dde"/>
- <column name="SCORETYPE" value="ScoreBased"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
<column name="TITLE" value="Other"/>
<column name="SCORE" valueNumeric="0.00"/>
<column name="SORT" valueNumeric="30"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="7e569319-5885-452e-9331-a507f3365236"/>
- <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
<column name="TITLE" value="Overarching"/>
<column name="SCORE" valueNumeric="10.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="90361317-d80e-4466-a45b-3021bf02e2f9"/>
- <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
<column name="TITLE" value="101 to 250"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="30"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="9a3183db-8a38-4cf1-a234-3e2cf20a4f77"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="IT"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="40"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="a0c55ee2-0d15-4779-a5a6-93774d5bc393"/>
- <column name="SCORETYPE" value="ScoreCloud"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
<column name="TITLE" value="OnPremise"/>
<column name="SCORE" valueNumeric="10.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="a0fcd2e2-40c8-40b8-8a5b-e591154c248a"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Lottery"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="110"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="a177b155-4665-4af1-b50e-0b59e8ac2752"/>
- <column name="SCORETYPE" value="ScoreBased"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
<column name="TITLE" value="Switzerland"/>
<column name="SCORE" valueNumeric="7.50"/>
<column name="SORT" valueNumeric="40"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="a61e3451-296b-4812-a7b2-425963176f80"/>
- <column name="SCORETYPE" value="ScoreCloud"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
<column name="TITLE" value="Cloud"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="a7e70abc-4d98-467d-a475-66bbd101de1d"/>
- <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
<column name="TITLE" value="Head of IT"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="b1c55bcd-16c6-4b2f-8f73-e16397b40e93"/>
- <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
<column name="TITLE" value="from 1,000"/>
<column name="SCORE" valueNumeric="30.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="b3792b08-4b07-4ed2-9bee-4673182b7349"/>
- <column name="SCORETYPE" value="ScoreProjectStart"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
<column name="TITLE" value="Within 6 months"/>
<column name="SCORE" valueNumeric="30.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="ba5d70c3-e77a-45ff-828b-7b3e0a61eec2"/>
- <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
<column name="TITLE" value="200 to 349T"/>
<column name="SCORE" valueNumeric="30.00"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="bf44ae05-a4c4-4ee9-ad6e-7d64474afeff"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Finance"/>
<column name="SCORE" valueNumeric="16.60"/>
<column name="SORT" valueNumeric="60"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="bf6b1757-11da-49a9-a02c-8340139968ee"/>
- <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
<column name="TITLE" value="Service Manager"/>
<column name="SCORE" valueNumeric="15.00"/>
<column name="SORT" valueNumeric="40"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="c328cb9e-5cef-4052-a3c1-98e1898eeb63"/>
- <column name="SCORETYPE" value="ScoreProjectStart"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
<column name="TITLE" value="No date yet"/>
<column name="SCORE" valueNumeric="10.00"/>
<column name="SORT" valueNumeric="30"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="c6300eeb-0494-4eba-89b1-23afdbb397e9"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Publishing house"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="150"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="c9d4e28d-7935-42c5-9da5-5ce0b51b425a"/>
- <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
<column name="TITLE" value="CRM Manager"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="30"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="d032f425-5739-4f0c-8103-e102fe0d3ccf"/>
- <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
<column name="TITLE" value="Skilled workers"/>
<column name="SCORE" valueNumeric="15.00"/>
<column name="SORT" valueNumeric="50"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="d5beb18f-c53e-438d-8b0b-7699aa20fba7"/>
- <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
<column name="TITLE" value="Rate"/>
<column name="SCORE" valueNumeric="15.00"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="d7d807a2-8a97-4a0e-9d1c-fb8c7a703599"/>
- <column name="SCORETYPE" value="ScoreUsers"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
<column name="TITLE" value="50 to 100"/>
<column name="SCORE" valueNumeric="10.00"/>
<column name="SORT" valueNumeric="40"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="e6ab210e-6a26-4a12-9d50-ff8bd392c590"/>
- <column name="SCORETYPE" value="ScoreDecisionPhase"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
<column name="TITLE" value="Search"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="30"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="e70a23b4-f2a9-4438-8ba6-742c6c17e5cc"/>
- <column name="SCORETYPE" value="ScoreCustomizing"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
<column name="TITLE" value="No"/>
<column name="SCORE" valueNumeric="12.50"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="e824d7e3-dfbe-4f34-a5c7-8f2226aade7e"/>
- <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
<column name="TITLE" value="100 to 199T"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="30"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="e8741cb0-9ada-48dd-89d1-f00a1a755c38"/>
- <column name="SCORETYPE" value="ScorePosition"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
<column name="TITLE" value="Counsellor"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="60"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="ec51d975-bda6-415e-9b91-32f0e981ecd8"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Building and construction suppliers"/>
<column name="SCORE" valueNumeric="50.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="ecf421ef-66b2-4f9f-98c6-ee8a73e753da"/>
- <column name="SCORETYPE" value="ScoreBased"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
<column name="TITLE" value="Austria"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="ed6a38f7-97bf-4e3d-a34c-4a1e636fa6a7"/>
- <column name="SCORETYPE" value="ScoreBudget"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
<column name="TITLE" value="from 350T"/>
<column name="SCORE" valueNumeric="50.00"/>
<column name="SORT" valueNumeric="10"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="efec90bd-c99f-49d9-bd52-df0ae6f938a3"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Machinery and equipment"/>
<column name="SCORE" valueNumeric="50.00"/>
<column name="SORT" valueNumeric="20"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="f1534026-34cc-4898-8711-41cbe4accb60"/>
- <column name="SCORETYPE" value="ScoreDepartment"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
<column name="TITLE" value="Marketing"/>
<column name="SCORE" valueNumeric="5.00"/>
<column name="SORT" valueNumeric="30"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="f678b3e0-72c4-4b48-90c0-054bf3612dc2"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Trade"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="130"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="fae1ef0a-5d07-4725-907f-4b2ac5814328"/>
- <column name="SCORETYPE" value="ScoreBranch"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
<column name="TITLE" value="Industry"/>
<column name="SCORE" valueNumeric="33.30"/>
<column name="SORT" valueNumeric="100"/>
</insert>
<insert tableName="CLASSIFICATIONSCORE">
<column name="CLASSIFICATIONSCOREID" value="fb8cb769-d95b-468a-ac64-7ee0cefd46a7"/>
- <column name="SCORETYPE" value="ScoreProjectStart"/>
+ <column name="CLASSIFICATIONTYPE_ID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
<column name="TITLE" value="Within 12 months"/>
<column name="SCORE" valueNumeric="20.00"/>
<column name="SORT" valueNumeric="20"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index f55c414e839..6392c1a5eb0 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -9621,20 +9621,6 @@
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
- <entityFieldDb>
- <name>SCORETYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="80" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>SCORE</name>
<dbName></dbName>
@@ -9691,6 +9677,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CLASSIFICATIONTYPE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
</entities>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index dabfc60a3fc..3ff69433612 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -44,7 +44,6 @@
<node name="KeywordAttribute" kind="10077" />
<node name="ObjectRelationType" kind="10077" />
<node name="ClassificationAdmin" kind="10077" />
- <node name="Classification" kind="10077" />
<node name="Salutation" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index c8b013c522f..2ec7e06fdc3 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -15,14 +15,6 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>75825cca-fbff-45a0-9a46-b1b0f639ae6a</name>
- <entityName>Classification_entity</entityName>
- <fieldName>ClassificationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 08820c53f27..3bd2db1f821 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -2,8 +2,9 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
<name>ClassificationScore_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Possible Values</title>
+ <title>Possible Value</title>
<contentTitleProcess>%aditoprj%/entity/ClassificationScore_entity/contentTitleProcess.js</contentTitleProcess>
+ <titlePlural>Possible Values</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -19,8 +20,9 @@
<mandatory v="true" />
</entityField>
<entityField>
- <name>SCORETYPE</name>
- <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js</valueProcess>
+ <name>CLASSIFICATIONTYPE_ID</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationtype_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>SORT</name>
@@ -49,19 +51,19 @@
</dependencies>
<children>
<entityParameter>
- <name>Scoretype_param</name>
+ <name>ClassificationGroup_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
- <name>ClassificationGroup_param</name>
+ <name>ClassificationTypeId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
- <name>Scoretype_param</name>
+ <name>ClassificationTypeId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<description>PARAMETER</description>
@@ -111,8 +113,12 @@
<recordfield>CLASSIFICATIONSCORE.TITLE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>SCORETYPE.value</name>
- <recordfield>CLASSIFICATIONSCORE.SCORETYPE</recordfield>
+ <name>CLASSIFICATIONTYPE_ID.value</name>
+ <recordfield>CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONTYPE_ID.displayValue</name>
+ <expression>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/recordfieldmappings/classificationtype_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/ClassificationScore_entity/entityfields/classificationtype_id/displayValueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationtype_id/displayValueProcess.js
new file mode 100644
index 00000000000..72ba8be2912
--- /dev/null
+++ b/entity/ClassificationScore_entity/entityfields/classificationtype_id/displayValueProcess.js
@@ -0,0 +1,7 @@
+import("Sql_lib");
+import("system.db");
+import("system.result");
+
+result.string(db.cell(SqlCondition.begin()
+ .andPrepareVars("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", "$field.CLASSIFICATIONTYPE_ID")
+ .buildSql("select CLASSIFICATIONTYPE.SCORETYPE from CLASSIFICATIONTYPE", "1=2")));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js b/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
similarity index 67%
rename from entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js
rename to entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
index bf842a1c590..419fe78a30d 100644
--- a/entity/ClassificationScore_entity/entityfields/scoretype/valueProcess.js
+++ b/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js
@@ -4,5 +4,5 @@ import("system.vars");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- result.string(vars.get("$param.Scoretype_param"));
+ result.string(vars.get("$param.ClassificationTypeId_param"));
}
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
index 6c23e5187e4..f8c6c86bc47 100644
--- a/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
+++ b/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js
@@ -5,14 +5,14 @@ import("Sql_lib");
if (!vars.get("$this.value"))
{
- var scoreType = vars.get("$param.Scoretype_param");
+ var classificationTypeId = vars.get("$param.ClassificationTypeId_param");
var maxValue = db.cell(
SqlCondition.begin()
- .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", scoreType, "# <> ?")
+ .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId, "# <> ?")
.andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", vars.get("$param.ClassificationGroup_param"))
.buildSql("select 100.0 - sum(maxScore) from ( \n\
select max(SCORE) maxScore from CLASSIFICATIONTYPE \n\
- join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE.scoretype = CLASSIFICATIONTYPE.scoretype", "1=2", "group by CLASSIFICATIONTYPE.scoretype) maxScores"));
+ join CLASSIFICATIONSCORE on CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID = CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", "1=2", "group by CLASSIFICATIONTYPE.SCORETYPE) maxScores"));
if (maxValue == "")
maxValue = 100;
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js b/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js
index 811e28aa9ae..0bb207b74cc 100644
--- a/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js
@@ -4,5 +4,5 @@ import("system.db");
import("system.result");
result.string(db.translateCondition(SqlCondition.begin()
- .andPrepareVars("CLASSIFICATIONSCORE.SCORETYPE", "$param.Scoretype_param")
+ .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", "$param.ClassificationTypeId_param")
.build("1=2")));
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/recordcontainers/db/recordfieldmappings/classificationtype_id.displayvalue/expression.js b/entity/ClassificationScore_entity/recordcontainers/db/recordfieldmappings/classificationtype_id.displayvalue/expression.js
new file mode 100644
index 00000000000..5752b7e1589
--- /dev/null
+++ b/entity/ClassificationScore_entity/recordcontainers/db/recordfieldmappings/classificationtype_id.displayvalue/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("(select CLASSIFICATIONTYPE.SCORETYPE from CLASSIFICATIONTYPE where CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID = CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID)");
\ No newline at end of file
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index a4abf0e4464..e827da07cfa 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -71,16 +71,6 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>SCORETYPE</name>
- <title>Scoretype</title>
- <mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js</mandatoryProcess>
- <searchable v="false" />
- <groupable v="true" />
- <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/Classification_entity/entityfields/scoretype/onValidation.js</onValidation>
- </entityField>
<entityField>
<name>CLASSIFICATIONGROUP</name>
<contentType>TEXT</contentType>
@@ -123,16 +113,14 @@
<fieldName>ClassificationScores</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>Scoretype_param</name>
- <title></title>
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
<entityParameter>
<name>ClassificationGroup_param</name>
<valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityActionField>
@@ -196,15 +184,6 @@
<name>SCORE_RESULTS</name>
<searchable v="false" />
</entityField>
- <entityConsumer>
- <name>ClassificationTypes</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationAdmin_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
<entityConsumer>
<name>KeywordClassificationTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -220,6 +199,11 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>SCORETYPE</name>
+ <title>Score type</title>
+ <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Classification_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
new file mode 100644
index 00000000000..b11d099579d
--- /dev/null
+++ b/entity/Classification_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CLASSIFICATIONTYPEID"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js b/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js
deleted file mode 100644
index 5b4133d6169..00000000000
--- a/entity/Classification_entity/entityfields/classificationscores/children/scoretype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.SCORETYPE"));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/info/valueProcess.js b/entity/Classification_entity/entityfields/info/valueProcess.js
index b581132ae69..1ee256fc478 100644
--- a/entity/Classification_entity/entityfields/info/valueProcess.js
+++ b/entity/Classification_entity/entityfields/info/valueProcess.js
@@ -6,14 +6,14 @@ import("system.text");
import("Sql_lib");
var data = db.table(SqlCondition.begin()
- .andPrepare("CLASSIFICATIONSCORE.SCORETYPE", vars.get("$field.SCORETYPE"))
+ .andPrepare("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", vars.get("$field.CLASSIFICATIONTYPEID"))
.buildSql("select TITLE, SCORE from CLASSIFICATIONSCORE", "1=2", "order by SORT"))
var resultText = "";
data.forEach(function(pScore)
{
- resultText += translate.text(pScore[0]) + " = " + text.formatDouble(pScore[1], "#,##0.00") + "<br>"
+ resultText += translate.text(pScore[0]) + " = " + text.formatDouble(pScore[1], translate.text("#,##0.00")) + "<br>"
});
result.string(resultText);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js b/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js
index 002fb0103bf..a5717eabb76 100644
--- a/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js
+++ b/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js
@@ -1,5 +1,5 @@
-import("system.translate");
import("system.vars");
+import("system.translate");
import("system.result");
-result.string(translate.text(vars.get("$this.value")))
\ No newline at end of file
+result.string(translate.text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js b/entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js
deleted file mode 100644
index 52b7a0751a5..00000000000
--- a/entity/Classification_entity/entityfields/scoretype/mandatoryProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-result.object(vars.get("$param.IsAdminMode_param") == 1 && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW);
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/onValidation.js b/entity/Classification_entity/entityfields/scoretype/onValidation.js
deleted file mode 100644
index 6206ed379e0..00000000000
--- a/entity/Classification_entity/entityfields/scoretype/onValidation.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import("system.neon");
-import("system.translate");
-import("system.result");
-import("system.db");
-import("Entity_lib");
-import("Sql_lib");
-import("system.vars");
-
-if (vars.get("$param.IsAdminMode_param") == "1" && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- // do not allow the same name a second time
- var type = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.SCORETYPE"));
- var count = db.cell(SqlCondition.begin()
- .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", type)
- .buildSql("select count(*) from CLASSIFICATIONTYPE"));
-
- if (count != 0)
- {
- result.string(translate.text("${SCORETYPE_ALREADY_EXISTS}"));
- }
-}
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/scoretype/stateProcess.js b/entity/Classification_entity/entityfields/scoretype/stateProcess.js
deleted file mode 100644
index 626da788b03..00000000000
--- a/entity/Classification_entity/entityfields/scoretype/stateProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- result.string(neon.COMPONENTSTATE_AUTO);
-}
-else
-{
- result.string(neon.COMPONENTSTATE_DISABLED);
-}
\ No newline at end of file
diff --git a/entity/Classification_entity/recordcontainers/jdito/onDelete.js b/entity/Classification_entity/recordcontainers/jdito/onDelete.js
index 5e02ce7e27b..40b75f026eb 100644
--- a/entity/Classification_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Classification_entity/recordcontainers/jdito/onDelete.js
@@ -5,7 +5,7 @@ import("system.db");
import("system.util");
import("system.vars");
-var type = vars.get("$field.SCORETYPE");
+var classificationTypeId = vars.get("$field.CLASSIFICATIONTYPEID");
if (1 < db.cell(SqlCondition.begin()
.andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", vars.get("$field.CLASSIFICATIONTYPE"))
@@ -13,10 +13,10 @@ if (1 < db.cell(SqlCondition.begin()
{
db.deleteData("CLASSIFICATION", "CLASSIFICATION.CLASSIFICATIONTYPE_ID in (" + db.translateStatement(
SqlCondition.begin()
- .andPrepare("CLASSIFICATIONTYPE.SCORETYPE", type)
+ .andPrepare("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId)
.buildSql("select CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID from CLASSIFICATIONTYPE", "1=2")) + ")");
- db.deleteData("CLASSIFICATIONTYPE", SqlCondition.equals("CLASSIFICATIONTYPE.SCORETYPE", type, "1=2"));
- db.deleteData("CLASSIFICATIONSCORE", SqlCondition.equals("CLASSIFICATIONSCORE.SCORETYPE", type, "1=2"));
+ db.deleteData("CLASSIFICATIONTYPE", SqlCondition.equals("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", classificationTypeId, "1=2"));
+ db.deleteData("CLASSIFICATIONSCORE", SqlCondition.equals("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", classificationTypeId, "1=2"));
}
neon.refreshAll();
//else
diff --git a/entity/Classification_entity/recordcontainers/jdito/onUpdate.js b/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
index 3040fd59b61..af0584bcb52 100644
--- a/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Classification_entity/recordcontainers/jdito/onUpdate.js
@@ -48,11 +48,11 @@ if (vars.exists("$param.IsAdminMode_param") && vars.exists("$param.IsAdminMode_p
var newGroupName = vars.get("$field.CLASSIFICATIONGROUP");
ClassificationUtils.changeGroupName(oldGroupName, newGroupName, vars.get("$field.CLASSIFICATIONTYPE"))
- case "SCORE_TYPE.value":
- var scoreId = vars.get("$field.CLASSIFICATIONSCORE_ID");
- var newScoreName = vars.get("$field.SCORE_TYPE");
+ case "SCORETYPE.value":
+ var classificationTypeId = vars.get("$field.CLASSIFICATIONTYPEID");
+ var newScoreName = vars.get("$field.SCORETYPE");
- ClassificationUtils.changeScoreName(newScoreName, scoreId);
+ ClassificationUtils.changeScoreName(newScoreName, classificationTypeId);
}
})
diff --git a/neonContext/ClassificationAdmin/ClassificationAdmin.aod b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
index 26b6e61e6e1..45495e30e85 100644
--- a/neonContext/ClassificationAdmin/ClassificationAdmin.aod
+++ b/neonContext/ClassificationAdmin/ClassificationAdmin.aod
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
<name>ClassificationAdmin</name>
+ <title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonContext/ClassificationAdmin/documentation.adoc</documentation>
<mainview>ClassificationAdminMain_view</mainview>
<entity>ClassificationAdmin_entity</entity>
<references>
diff --git a/neonContext/ClassificationAdmin/documentation.adoc b/neonContext/ClassificationAdmin/documentation.adoc
new file mode 100644
index 00000000000..4c5a7f2883e
--- /dev/null
+++ b/neonContext/ClassificationAdmin/documentation.adoc
@@ -0,0 +1 @@
+This Context only exists to provide a Classification-Admin-View without an open-button
\ No newline at end of file
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index a29e03f144e..e7bb5db9c2e 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -111,12 +111,10 @@ ClassificationUtils.getUsageType = function(pParamField, pSelectionField)
return classificationType;
}
-ClassificationUtils.changeScoreName = function(pOldScoreName, pNewScoreName, pScoreId)
+ClassificationUtils.changeScoreName = function(pNewScoreName, pClassificationTypeId)
{
- var groups = ClassificationUtils.getAllScores(pClassificationGroup, false)
-
- if (groups.indexOf(pNewName, 0) == -1)
- {
- db.updateData("CLASSIFICATIONTYPE", ["CLASSIFICATIONGROUP"], null, [pNewName], SqlCondition.equals("CLASSIFICATIONTYPE.CLASSIFICATIONGROUP", pOldName, "1=2"));
- }
+ logging.log(pNewScoreName)
+ logging.log(pClassificationTypeId)
+
+ db.updateData("CLASSIFICATIONTYPE", ["SCORETYPE"], null, [pNewScoreName], SqlCondition.equals("CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID", pClassificationTypeId, "1=2"));
}
\ No newline at end of file
--
GitLab