From eda5f4dd8a7c97cdf64b894e47cb5a517e4d4ba2 Mon Sep 17 00:00:00 2001 From: "s.pongratz" <s.pongratz@adito.de> Date: Fri, 10 Jul 2020 16:58:13 +0200 Subject: [PATCH] #1060627-LeadimportMappingassistent --- .../LeadimportMappingAssistant/changelog.xml | 5 + .../create_leadimportMappingAssistant.xml | 23 +++ .../Data_alias/basic/2020.1.2/changelog.xml | 1 + .liquibase/Data_alias/changelog.xml | 1 + aliasDefinition/Data_alias/Data_alias.aod | 146 ++++++++++++++++++ .../KeywordEntry_entity.aod | 6 + .../LeadimportMappingAssistant_entity.aod | 137 ++++++++++++++++ .../entityfields/date_edit/valueProcess.js | 6 + .../entityfields/date_new/valueProcess.js | 6 + .../fieldname/displayValueProcess.js | 6 + .../containername_param/valueProcess.js | 4 + .../leadimport_id/valueProcess.js | 6 + .../entityfields/user_edit/valueProcess.js | 6 + .../entityfields/user_new/valueProcess.js | 6 + .../recordcontainers/db/conditionProcess.js | 4 + .../recordcontainers/db/orderClauseProcess.js | 4 + .../Leadimport_entity/Leadimport_entity.aod | 14 ++ .../leadimport_id_param/valueProcess.js | 4 + .../LeadimportMappingAssistant.aod | 18 +++ .../LeadimportMain_view.aod | 5 + .../LeadimportMappingAssistantFilter_view.aod | 27 ++++ 21 files changed, 435 insertions(+) create mode 100644 .liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml create mode 100644 .liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml create mode 100644 entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js create mode 100644 entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js create mode 100644 entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js create mode 100644 entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js create mode 100644 entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js create mode 100644 neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod create mode 100644 neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod diff --git a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml new file mode 100644 index 00000000000..0afc65858ec --- /dev/null +++ b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/changelog.xml @@ -0,0 +1,5 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <include file="create_leadimportMappingAssistant.xml" relativeToChangelogFile="true" /> +</databaseChangeLog> diff --git a/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml new file mode 100644 index 00000000000..2a94138e9ab --- /dev/null +++ b/.liquibase/Data_alias/basic/2020.1.2/LeadimportMappingAssistant/create_leadimportMappingAssistant.xml @@ -0,0 +1,23 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <changeSet author="s.pongratz" id="546f84b4-b9d5-4b73-a9ea-40b1b8597170"> + <createTable tableName="LEADIMPORTMAPPINGASSISTANT"> + <column name="LEADIMPORTMAPPINGASSISTANTID" type="CHAR(36)"> + <constraints primaryKey="true" primaryKeyName="PK_LEADIMPORTMAPPINGASSISTANTID"/> + </column> + <column name="USER_NEW" type="NVARCHAR(50)"> + <constraints nullable="false"/> + </column> + <column name="DATE_NEW" type="DATETIME"> + <constraints nullable="false"/> + </column> + <column name="USER_EDIT" type="NVARCHAR(50)" /> + <column name="DATE_EDIT" type="DATETIME"/> + + <column name="FIELDNAME" type="CHAR(36)"/> + <column name="INPUTVALUE" type="VARCHAR(300)"/> + <column name="OUTPUTVALUE" type="VARCHAR(300)"/> + <column name="LEADIMPORT_ID" type="CHAR(36)"/> + </createTable> + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml index 29f7efdfa26..2502954b559 100644 --- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml +++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml @@ -2,4 +2,5 @@ <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> <include file="AlterDocumentTemplatePlaceOfUseDatatype/changelog.xml" relativeToChangelogFile="true"/> + <include file="LeadimportMappingAssistant/changelog.xml" relativeToChangelogFile="true" /> </databaseChangeLog> diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml index 50c63b65a63..a8cc53b4069 100644 --- a/.liquibase/Data_alias/changelog.xml +++ b/.liquibase/Data_alias/changelog.xml @@ -13,6 +13,7 @@ <include relativeToChangelogFile="true" file="basic/2020.0.3/changelog.xml"/> <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/> <include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/> + <include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/> <!--enable this only when you definetly want to overwrite the existing data with demo records:--> <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>--> diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 80c46862107..5c9cc32cb10 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -14947,6 +14947,152 @@ </entityFieldDb> </entityFields> </entityDb> + <entityDb> + <name>LEADIMPORTMAPPINGASSISTANT</name> + <dbName></dbName> + <idColumn>LEADIMPORTMAPPINGASSISTANTID</idColumn> + <idGeneratorType v="0" /> + <idGeneratorInterval v="1" /> + <documentation></documentation> + <title></title> + <description></description> + <auditSyncConfig> + <name>auditSyncConfig</name> + <auditMode v="0" /> + <syncActive v="false" /> + <syncComplete v="true" /> + <syncDirection v="1" /> + <syncIds></syncIds> + </auditSyncConfig> + <entityFields> + <entityFieldDb> + <name>LEADIMPORTMAPPINGASSISTANTID</name> + <dbName></dbName> + <primaryKey v="true" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="true" /> + <index v="true" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="29" /> + <scale v="9" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>FIELDNAME</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> + <entityFieldDb> + <name>DATE_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="93" /> + <size v="29" /> + <scale v="9" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>INPUTVALUE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="300" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>OUTPUTVALUE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="300" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>USER_NEW</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>LEADIMPORT_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> + <entityFieldDb> + <name>USER_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="50" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + </entityFields> + </entityDb> </entities> </entityGroup> </aliasDefDb> diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod index 1d23aa80c13..04ee90390bc 100644 --- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod +++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod @@ -577,6 +577,12 @@ <fieldName>KeywordVisitRecommendationPriority</fieldName> <isConsumer v="false" /> </entityDependency> + <entityDependency> + <name>d1769b5e-db2a-445b-bb79-c72ac757038b</name> + <entityName>LeadimportMappingAssistant_entity</entityName> + <fieldName>KeywordImportFields</fieldName> + <isConsumer v="false" /> + </entityDependency> </dependencies> <children> <entityParameter> diff --git a/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod new file mode 100644 index 00000000000..b2a0dd6a13f --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/LeadimportMappingAssistant_entity.aod @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14"> + <name>LeadimportMappingAssistant_entity</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <title>Mapping</title> + <titlePlural>Mappings</titlePlural> + <recordContainer>db</recordContainer> + <entityFields> + <entityProvider> + <name>#PROVIDER</name> + </entityProvider> + <entityField> + <name>FIELDNAME</name> + <title>Fieldname</title> + <consumer>KeywordImportFields</consumer> + <displayValueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js</displayValueProcess> + </entityField> + <entityField> + <name>LEADIMPORTMAPPINGASSISTANTID</name> + </entityField> + <entityField> + <name>LEADIMPORT_ID</name> + <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>INPUTVALUE</name> + <title>Input value</title> + </entityField> + <entityField> + <name>OUTPUTVALUE</name> + <title>Output value</title> + </entityField> + <entityField> + <name>USER_NEW</name> + <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>USER_EDIT</name> + <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>DATE_NEW</name> + <contentType>DATE</contentType> + <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>DATE_EDIT</name> + <contentType>DATE</contentType> + <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js</valueProcess> + </entityField> + <entityProvider> + <name>LeadimportMapping</name> + <dependencies> + <entityDependency> + <name>89a94a8b-9447-47a6-94c7-240e25aff7a8</name> + <entityName>Leadimport_entity</entityName> + <fieldName>LeadimportMappings</fieldName> + <isConsumer v="false" /> + </entityDependency> + </dependencies> + </entityProvider> + <entityParameter> + <name>Leadimport_ID_param</name> + <expose v="true" /> + <mandatory v="true" /> + </entityParameter> + <entityConsumer> + <name>KeywordImportFields</name> + <dependency> + <name>dependency</name> + <entityName>KeywordEntry_entity</entityName> + <fieldName>SpecificContainerKeywords</fieldName> + </dependency> + <children> + <entityParameter> + <name>ContainerName_param</name> + <valueProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> + </entityFields> + <recordContainers> + <dbRecordContainer> + <name>db</name> + <alias>Data_alias</alias> + <conditionProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js</conditionProcess> + <orderClauseProcess>%aditoprj%/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess> + <linkInformation> + <linkInformation> + <name>61a456d3-b7b5-4042-ae4c-6245d420da3b</name> + <tableName>LEADIMPORTMAPPINGASSISTANT</tableName> + <primaryKey>LEADIMPORTMAPPINGASSISTANTID</primaryKey> + <isUIDTable v="true" /> + <readonly v="false" /> + </linkInformation> + </linkInformation> + <recordFieldMappings> + <dbRecordFieldMapping> + <name>DATE_EDIT.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.DATE_EDIT</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>DATE_NEW.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.DATE_NEW</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>FIELDNAME.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.FIELDNAME</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>INPUTVALUE.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.INPUTVALUE</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>LEADIMPORT_ID.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>LEADIMPORTMAPPINGASSISTANTID.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.LEADIMPORTMAPPINGASSISTANTID</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>OUTPUTVALUE.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.OUTPUTVALUE</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>USER_EDIT.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.USER_EDIT</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>USER_NEW.value</name> + <recordfield>LEADIMPORTMAPPINGASSISTANT.USER_NEW</recordfield> + </dbRecordFieldMapping> + </recordFieldMappings> + </dbRecordContainer> + </recordContainers> +</entity> diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js new file mode 100644 index 00000000000..8d41a64d699 --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/entityfields/date_edit/valueProcess.js @@ -0,0 +1,6 @@ +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) + result.string(vars.get("$sys.date")); \ No newline at end of file diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js new file mode 100644 index 00000000000..8ee28e84edb --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/entityfields/date_new/valueProcess.js @@ -0,0 +1,6 @@ +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) + result.string(vars.get("$sys.date")); \ No newline at end of file diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js new file mode 100644 index 00000000000..eef0406796f --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/entityfields/fieldname/displayValueProcess.js @@ -0,0 +1,6 @@ +import("system.result"); +import("system.vars"); +import("KeywordRegistry_basic"); +import("Keyword_lib"); + +result.string(KeywordUtils.getViewValue($KeywordRegistry.importFields(), vars.get("$field.FIELDNAME"))); \ No newline at end of file diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js new file mode 100644 index 00000000000..44130c6f891 --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/entityfields/keywordimportfields/children/containername_param/valueProcess.js @@ -0,0 +1,4 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); +result.string($KeywordRegistry.importFields()); \ No newline at end of file diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js new file mode 100644 index 00000000000..3f143363605 --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/entityfields/leadimport_id/valueProcess.js @@ -0,0 +1,6 @@ +import("system.result"); +import("system.vars"); +if (vars.get("$this.value") == null) +{ + result.string(vars.get("$param.Leadimport_ID_param")); +} \ No newline at end of file diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js new file mode 100644 index 00000000000..90383c07131 --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/entityfields/user_edit/valueProcess.js @@ -0,0 +1,6 @@ +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) + result.string(vars.get("$sys.user")); \ No newline at end of file diff --git a/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js b/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js new file mode 100644 index 00000000000..dda83cfd00e --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/entityfields/user_new/valueProcess.js @@ -0,0 +1,6 @@ +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) + result.string(vars.get("$sys.user")); \ No newline at end of file diff --git a/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js new file mode 100644 index 00000000000..1856100040a --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/conditionProcess.js @@ -0,0 +1,4 @@ +import("system.result"); +import("Sql_lib"); + +result.string(newWhere("LEADIMPORTMAPPINGASSISTANT.LEADIMPORT_ID", "$param.Leadimport_ID_param").toString()); \ No newline at end of file diff --git a/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js new file mode 100644 index 00000000000..9b1cf90519b --- /dev/null +++ b/entity/LeadimportMappingAssistant_entity/recordcontainers/db/orderClauseProcess.js @@ -0,0 +1,4 @@ +import("system.result"); +import("system.db"); + +result.object({"LEADIMPORTMAPPINGASSISTANT.FIELDNAME": db.ASCENDING}); \ No newline at end of file diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod index b794f161e46..71343cce634 100644 --- a/entity/Leadimport_entity/Leadimport_entity.aod +++ b/entity/Leadimport_entity/Leadimport_entity.aod @@ -313,6 +313,20 @@ <state>INVISIBLE</state> <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/stateProcess.js</stateProcess> </entityActionField> + <entityConsumer> + <name>LeadimportMappings</name> + <dependency> + <name>dependency</name> + <entityName>LeadimportMappingAssistant_entity</entityName> + <fieldName>LeadimportMapping</fieldName> + </dependency> + <children> + <entityParameter> + <name>Leadimport_ID_param</name> + <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js b/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js new file mode 100644 index 00000000000..11eb7d91178 --- /dev/null +++ b/entity/Leadimport_entity/entityfields/leadimportmappings/children/leadimport_id_param/valueProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("system.result"); + +result.string(vars.get("$field.LEADIMPORTID")); \ No newline at end of file diff --git a/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod b/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod new file mode 100644 index 00000000000..2877b87630f --- /dev/null +++ b/neonContext/LeadimportMappingAssistant/LeadimportMappingAssistant.aod @@ -0,0 +1,18 @@ +<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1"> + <name>LeadimportMappingAssistant</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <filterView>LeadimportMappingAssistantFilter_view</filterView> + <devices> + <element>MOBILE</element> + <element>TABLET</element> + <element>DESKTOP</element> + </devices> + <entity>LeadimportMappingAssistant_entity</entity> + <references> + <neonViewReference> + <name>bc357365-04aa-4c3b-8448-9992fdb363f8</name> + <view>LeadimportMappingAssistantFilter_view</view> + </neonViewReference> + </references> +</neonContext> diff --git a/neonView/LeadimportMain_view/LeadimportMain_view.aod b/neonView/LeadimportMain_view/LeadimportMain_view.aod index 5dfdbbc4f8e..3cbee3d28bf 100644 --- a/neonView/LeadimportMain_view/LeadimportMain_view.aod +++ b/neonView/LeadimportMain_view/LeadimportMain_view.aod @@ -24,6 +24,11 @@ <entityField>ImportFieldID</entityField> <view>ImportFieldFilterMapping_view</view> </neonViewReference> + <neonViewReference> + <name>6382569f-b680-4d1e-9e5e-0198b71ebed7</name> + <entityField>LeadimportMappings</entityField> + <view>LeadimportMappingAssistantFilter_view</view> + </neonViewReference> <neonViewReference> <name>5a6123d2-a2a4-416d-a138-fac6cdc5fb82</name> <entityField>#ENTITY</entityField> diff --git a/neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod b/neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod new file mode 100644 index 00000000000..0a32f33679c --- /dev/null +++ b/neonView/LeadimportMappingAssistantFilter_view/LeadimportMappingAssistantFilter_view.aod @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6"> + <name>LeadimportMappingAssistantFilter_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <titledListViewTemplate> + <name>TitledList</name> + <titleField>FIELDNAME</titleField> + <entityField>#ENTITY</entityField> + <columns> + <neonTitledListTableColumn> + <name>6319d5a7-4155-46c7-acee-288abf282b72</name> + <entityField>INPUTVALUE</entityField> + </neonTitledListTableColumn> + <neonTitledListTableColumn> + <name>8736ffce-6731-4135-be61-60c986c5b564</name> + <entityField>OUTPUTVALUE</entityField> + </neonTitledListTableColumn> + </columns> + </titledListViewTemplate> + </children> +</neonView> -- GitLab