From b0b3c4984d89f29e1681d173ab0ea05f2b420cf0 Mon Sep 17 00:00:00 2001 From: Benjamin Ulrich <b.ulrich@adito.de> Date: Wed, 7 Oct 2020 09:42:21 +0000 Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?= =?UTF-8?q?=201063416][Verwaiste=20Prozesse=20f=C3=BChren=20zu=20ScanServi?= =?UTF-8?q?ce-Warnungsflut]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entity/Activity_entity/Activity_entity.aod | 7 ------- .../entityfields/entrymonth/displayValueProcess.js | 1 - entity/Attribute_entity/Attribute_entity.aod | 2 -- entity/Campaign_entity/Campaign_entity.aod | 1 - entity/Campaign_entity/entityfields/tasks/stateProcess.js | 0 .../ClassificationGrading_entity.aod | 1 + entity/Classification_entity/Classification_entity.aod | 1 - .../entityfields/classifications/documentation.adoc | 0 .../children/containername_param/documentation.adoc | 0 entity/DSGVOInfo_entity/DSGVOInfo_entity.aod | 1 - .../entityfields/reporttype_param/valueProcess.js | 0 entity/DSGVO_entity/DSGVO_entity.aod | 1 - .../DistrictResponsible_entity.aod | 1 + .../DuplicateScannerResultFieldConfig_entity.aod | 1 - .../documentation.adoc | 0 .../KeywordAttributeRelation_entity.aod | 1 - .../filteralreadyusedbyentryid_param/documentation.adoc | 0 entity/Member_entity/Member_entity.aod | 2 +- entity/Member_entity/grantCreateProcess.js | 0 entity/Order_entity/Order_entity.aod | 2 -- .../entityfields/contactid_param/documentation.adoc | 0 .../children/assignmentname_param/documentation.adoc | 0 entity/Prod2prod_entity/Prod2prod_entity.aod | 1 + .../SalesprojectConversionRate_entity.aod | 5 ----- .../person_id.displayvalue/expression.js | 5 ----- .../OfferPreviewMultiple_view.aod | 3 +-- process/_test_importer/process.js | 1 + 27 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 entity/Campaign_entity/entityfields/tasks/stateProcess.js delete mode 100644 entity/Classification_entity/entityfields/classifications/documentation.adoc delete mode 100644 entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc delete mode 100644 entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js delete mode 100644 entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc delete mode 100644 entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/documentation.adoc delete mode 100644 entity/Member_entity/grantCreateProcess.js delete mode 100644 entity/Order_entity/entityfields/contactid_param/documentation.adoc delete mode 100644 entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc delete mode 100644 entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod index 809e7cb7f2..9163db06e9 100644 --- a/entity/Activity_entity/Activity_entity.aod +++ b/entity/Activity_entity/Activity_entity.aod @@ -157,7 +157,6 @@ <title>Date (Month)</title> <contentType>TEXT</contentType> <groupable v="true" /> - <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrymonth/valueProcess.js</valueProcess> <onValueChangeTypes> <element>MASK</element> <element>PROCESS</element> @@ -395,7 +394,6 @@ <name>ENTRYDAY</name> <title>Date (Day)</title> <groupable v="true" /> - <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess> </entityField> <entityConsumer> <name>Attributes</name> @@ -563,7 +561,6 @@ <name>ENTRYYEAR</name> <title>Date (Year)</title> <groupable v="true" /> - <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryyear/valueProcess.js</valueProcess> </entityField> <entityField> <name>bindata</name> @@ -799,10 +796,6 @@ <recordfield>ACTIVITY.ACTIVITYID</recordfield> <aggregateType>COUNT</aggregateType> </aggregateFieldDbMapping> - <dbRecordFieldMapping> - <name>COUNT.value</name> - <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression> - </dbRecordFieldMapping> <dbRecordFieldMapping> <name>ENTRYDAY.value</name> <expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/entryday.value/expression.js</expression> diff --git a/entity/Activity_entity/entityfields/entrymonth/displayValueProcess.js b/entity/Activity_entity/entityfields/entrymonth/displayValueProcess.js index e95bca5a3e..cb6405c40f 100644 --- a/entity/Activity_entity/entityfields/entrymonth/displayValueProcess.js +++ b/entity/Activity_entity/entityfields/entrymonth/displayValueProcess.js @@ -10,4 +10,3 @@ if (m) { let monthDate = new Date(2020, m-1); result.string(translate.text(datetime.toDate(monthDate.getTime(), "MMMM", "UTC"))); } - diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod index 16498580ba..6f00c57a63 100644 --- a/entity/Attribute_entity/Attribute_entity.aod +++ b/entity/Attribute_entity/Attribute_entity.aod @@ -4,8 +4,6 @@ <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation> <title>Attribute</title> - <grantCreateProcess>%aditoprj%/entity/Attribute_entity/grantCreateProcess.js</grantCreateProcess> - <grantUpdateProcess>%aditoprj%/entity/Attribute_entity/grantUpdateProcess.js</grantUpdateProcess> <grantDeleteProcess>%aditoprj%/entity/Attribute_entity/grantDeleteProcess.js</grantDeleteProcess> <contentTitleProcess>%aditoprj%/entity/Attribute_entity/contentTitleProcess.js</contentTitleProcess> <afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit> diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod index fbc177e81a..37416e7b55 100644 --- a/entity/Campaign_entity/Campaign_entity.aod +++ b/entity/Campaign_entity/Campaign_entity.aod @@ -274,7 +274,6 @@ <entityConsumer> <name>Tasks</name> <title>Tasks</title> - <stateProcess>%aditoprj%/entity/Campaign_entity/entityfields/tasks/stateProcess.js</stateProcess> <dependency> <name>dependency</name> <entityName>Task_entity</entityName> diff --git a/entity/Campaign_entity/entityfields/tasks/stateProcess.js b/entity/Campaign_entity/entityfields/tasks/stateProcess.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod index e82162ec53..fdf4e99995 100644 --- a/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod +++ b/entity/ClassificationGrading_entity/ClassificationGrading_entity.aod @@ -20,6 +20,7 @@ </entityField> <entityField> <name>MAXGRADEFORSCORE</name> + <documentation>%aditoprj%/entity/ClassificationGrading_entity/entityfields/maxgradeforscore/documentation.adoc</documentation> <title>Max Value</title> <contentType>NUMBER</contentType> <outputFormat>#####</outputFormat> diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod index 011426f28c..0ffc7c0298 100644 --- a/entity/Classification_entity/Classification_entity.aod +++ b/entity/Classification_entity/Classification_entity.aod @@ -42,7 +42,6 @@ </entityParameter> <entityProvider> <name>Classifications</name> - <documentation>%aditoprj%/entity/Classification_entity/entityfields/classifications/documentation.adoc</documentation> <dependencies> <entityDependency> <name>6274acfa-3dbf-4a9b-8926-2a2d1ff80d6d</name> diff --git a/entity/Classification_entity/entityfields/classifications/documentation.adoc b/entity/Classification_entity/entityfields/classifications/documentation.adoc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc b/entity/Competition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod index dd8ae2f623..9a090c1ee2 100644 --- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod +++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod @@ -52,7 +52,6 @@ </entityParameter> <entityParameter> <name>ReportType_param</name> - <valueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js</valueProcess> <expose v="true" /> </entityParameter> <entityProvider> diff --git a/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js b/entity/DSGVOInfo_entity/entityfields/reporttype_param/valueProcess.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod index 6fd134a3a8..19cefc3a19 100644 --- a/entity/DSGVO_entity/DSGVO_entity.aod +++ b/entity/DSGVO_entity/DSGVO_entity.aod @@ -13,7 +13,6 @@ </siblings> <grantCreate v="false" /> <grantDelete v="false" /> - <afterSave>%aditoprj%/entity/DSGVO_entity/afterSave.js</afterSave> <titlePlural></titlePlural> <recordContainer>jdito</recordContainer> <entityFields> diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod index cc4783ab5b..4062bb8fd4 100644 --- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod +++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod @@ -148,6 +148,7 @@ </entityConsumer> <entityField> <name>departmentAttributeName</name> + <documentation>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/documentation.adoc</documentation> <title>Department</title> <state>READONLY</state> <stateProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js</stateProcess> diff --git a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod index b587b5faf5..3297b0d171 100644 --- a/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod +++ b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod @@ -2,7 +2,6 @@ <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.17" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.17"> <name>DuplicateScannerResultFieldConfig_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <documentation>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc</documentation> <recordContainer>recordContainer</recordContainer> <entityFields> <entityProvider> diff --git a/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc b/entity/DuplicateScannerResultFieldConfig_entity/documentation.adoc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod index e4f1112d7f..81be338ad3 100644 --- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod +++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod @@ -90,7 +90,6 @@ <name>FilterAlreadyUsedByEntryId_param</name> <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess> <expose v="false" /> - <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/documentation.adoc</documentation> </entityParameter> </children> </entityConsumer> diff --git a/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/documentation.adoc b/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/documentation.adoc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod index 53dfef4032..23a14e5ebe 100644 --- a/entity/Member_entity/Member_entity.aod +++ b/entity/Member_entity/Member_entity.aod @@ -4,7 +4,6 @@ <majorModelMode>DISTRIBUTED</majorModelMode> <documentation>%aditoprj%/entity/Member_entity/documentation.adoc</documentation> <title>${SALESPROJECT_MEMBER}</title> - <grantCreateProcess>%aditoprj%/entity/Member_entity/grantCreateProcess.js</grantCreateProcess> <grantUpdateProcess>%aditoprj%/entity/Member_entity/grantUpdateProcess.js</grantUpdateProcess> <grantDeleteProcess>%aditoprj%/entity/Member_entity/grantDeleteProcess.js</grantDeleteProcess> <iconId>VAADIN:FILE_SOUND</iconId> @@ -219,6 +218,7 @@ </entityField> <entityField> <name>recordType</name> + <documentation>%aditoprj%/entity/Member_entity/entityfields/recordtype/documentation.adoc</documentation> </entityField> </entityFields> <recordContainers> diff --git a/entity/Member_entity/grantCreateProcess.js b/entity/Member_entity/grantCreateProcess.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index 77fcf820ec..06389d921d 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -166,7 +166,6 @@ <name>ContactId_param</name> <expose v="true" /> <mandatory v="true" /> - <documentation>%aditoprj%/entity/Order_entity/entityfields/contactid_param/documentation.adoc</documentation> <description>PARAMETER</description> </entityParameter> <entityField> @@ -219,7 +218,6 @@ <children> <entityParameter> <name>AssignmentName_param</name> - <documentation>%aditoprj%/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation> </entityParameter> <entityParameter> <name>AssignmentRowId_param</name> diff --git a/entity/Order_entity/entityfields/contactid_param/documentation.adoc b/entity/Order_entity/entityfields/contactid_param/documentation.adoc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc b/entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod index 09e2fcde10..824ac6d55e 100644 --- a/entity/Prod2prod_entity/Prod2prod_entity.aod +++ b/entity/Prod2prod_entity/Prod2prod_entity.aod @@ -17,6 +17,7 @@ </entityField> <entityField> <name>OPTIONAL</name> + <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/documentation.adoc</documentation> <title>Optional</title> <contentType>BOOLEAN</contentType> <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/dropDownProcess.js</dropDownProcess> diff --git a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod index 3a7099a2d8..e7474ae27a 100644 --- a/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod +++ b/entity/SalesprojectConversionRate_entity/SalesprojectConversionRate_entity.aod @@ -76,11 +76,6 @@ <name>AB_KEYWORD_ENTRYID_TITLE.value</name> </jDitoRecordFieldMapping> </recordFieldMappings> - <aggregateFieldMappings> - <jDitoRecordFieldMapping> - <name>conversionRate_aggregate.value</name> - </jDitoRecordFieldMapping> - </aggregateFieldMappings> <filterExtensions> <filterExtension> <name>Year</name> diff --git a/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js b/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js deleted file mode 100644 index b061026da3..0000000000 --- a/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js +++ /dev/null @@ -1,5 +0,0 @@ -import("system.result"); -import("system.vars"); -import("Person_lib"); - -result.string(PersUtils.getResolvingDisplaySubSql("VISITPLANEMPLOYEEWEEK.CONTACT_ID")); \ No newline at end of file diff --git a/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod index c879059396..44610fe33c 100644 --- a/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod +++ b/neonView/OfferPreviewMultiple_view/OfferPreviewMultiple_view.aod @@ -5,7 +5,7 @@ <layout> <headerFooterLayout> <name>layout</name> - <footer>Scorecard</footer> + <footer>AggregatedValues</footer> </headerFooterLayout> </layout> <children> @@ -39,7 +39,6 @@ </treeTableViewTemplate> <scoreCardViewTemplate> <name>AggregatedValues</name> - <entityField>OfferAggregates</entityField> <fields> <entityFieldLink> <name>71cd7dd5-c142-4b4c-8a6b-ca5ed8acf92e</name> diff --git a/process/_test_importer/process.js b/process/_test_importer/process.js index 3eaad9708e..418c18564d 100644 --- a/process/_test_importer/process.js +++ b/process/_test_importer/process.js @@ -1,3 +1,4 @@ +import("Attribute_lib"); import("system.text"); import("Util_lib"); import("ImporterTest_lib"); -- GitLab