diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerResultFieldsConfig.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerResultFieldsConfig.xml new file mode 100644 index 0000000000000000000000000000000000000000..cd4c79d93234bf376766556ef01d8ae89b050d07 --- /dev/null +++ b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerResultFieldsConfig.xml @@ -0,0 +1,22 @@ +<?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="d.buechler" id="80615d12-0999-4281-91cb-613940cb55f3"> + <createTable tableName="DUPLICATESCANNERRESULTFIELDCONFIG"> + <column name="ID" type="CHAR(36)"> + <constraints primaryKey="true" primaryKeyName="PK_DUPLICATESCANNERRESULTFIELDCONFIG_ID"/> + </column> + <column name="DUPLICATESCANNER_ID" type="CHAR(36)"> + <constraints nullable="false" /> + </column> + <column name="ENTITY_FIELD_NAME" type="NVARCHAR(100)" /> + <column name="USER_NEW" type="NVARCHAR(50)"> + <constraints nullable="false"/> + </column> + <column name="DATE_NEW" type="DATE"> + <constraints nullable="false"/> + </column> + <column name="USER_EDIT" type="NVARCHAR(50)" /> + <column name="DATE_EDIT" type="DATE"/> + </createTable> + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2019.2.1/changelog.xml b/.liquibase/Data_alias/basic/2019.2.1/changelog.xml index f5be2c867d4b841e6a3432999864a72e311efd9f..0afcc44c129b45cd767a841942a0f637e97579f9 100644 --- a/.liquibase/Data_alias/basic/2019.2.1/changelog.xml +++ b/.liquibase/Data_alias/basic/2019.2.1/changelog.xml @@ -13,5 +13,6 @@ <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScanner.xml"/> <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerPrefilterConfig.xml"/> <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerIndexConfig.xml"/> + <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerResultFieldsConfig.xml"/> <include relativeToChangelogFile="true" file="Duplicates/create_unrelatedDuplicates.xml"/> </databaseChangeLog> diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 9b3fef4808685c1d13f149af2148d781e8cdcf04..eeb2605d1138f46d6046a6ed127b88ac0c1da972 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -11602,6 +11602,124 @@ </entityFieldDb> </entityFields> </entityDb> + <entityDb> + <name>DUPLICATESCANNERRESULTFIELDCONFIG</name> + <dbName></dbName> + <idColumn>ID</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>DATE_EDIT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="91" /> + <size v="10" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DUPLICATESCANNER_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <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="91" /> + <size v="10" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>ID</name> + <dbName></dbName> + <primaryKey v="true" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="true" /> + <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>ENTITY_FIELD_NAME</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="100" /> + <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/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod new file mode 100644 index 0000000000000000000000000000000000000000..f24dcdd76099895cc0a63f5b8cb961d432143f97 --- /dev/null +++ b/entity/DuplicateScannerResultFieldConfig_entity/DuplicateScannerResultFieldConfig_entity.aod @@ -0,0 +1,100 @@ +<?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.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11"> + <name>DuplicateScannerResultFieldConfig_entity</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <recordContainer>recordContainer</recordContainer> + <entityFields> + <entityProvider> + <name>#PROVIDER</name> + </entityProvider> + <entityField> + <name>UID</name> + </entityField> + <entityField> + <name>ENTITY_FIELD_NAME</name> + <title>Entity field name</title> + </entityField> + <entityField> + <name>DATE_EDIT</name> + <valueProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/entityfields/date_edit/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>DATE_NEW</name> + <valueProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/entityfields/date_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>USER_NEW</name> + <valueProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/entityfields/user_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>USER_EDIT</name> + <valueProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/entityfields/user_edit/valueProcess.js</valueProcess> + </entityField> + <entityParameter> + <name>DuplicateScannerId_param</name> + <expose v="true" /> + <mandatory v="true" /> + </entityParameter> + <entityProvider> + <name>ScannerResultFieldConfigProvider</name> + <dependencies> + <entityDependency> + <name>119b48a5-ce78-4169-bd31-76e524cece99</name> + <entityName>DuplicateScanner_entity</entityName> + <fieldName>ScannerResultFieldsConfig_Consumer</fieldName> + <isConsumer v="false" /> + </entityDependency> + </dependencies> + </entityProvider> + <entityField> + <name>DUPLICATESCANNER_ID</name> + <valueProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/entityfields/duplicatescanner_id/valueProcess.js</valueProcess> + </entityField> + </entityFields> + <recordContainers> + <dbRecordContainer> + <name>recordContainer</name> + <alias>Data_alias</alias> + <conditionProcess>%aditoprj%/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js</conditionProcess> + <linkInformation> + <linkInformation> + <name>f7126f94-9e4c-46a0-8dc9-9e52fda1c7c0</name> + <tableName>DUPLICATESCANNERRESULTFIELDCONFIG</tableName> + <primaryKey>ID</primaryKey> + <isUIDTable v="false" /> + <readonly v="false" /> + </linkInformation> + </linkInformation> + <recordFieldMappings> + <dbRecordFieldMapping> + <name>DATE_EDIT.value</name> + <recordfield>DUPLICATESCANNERRESULTFIELDCONFIG.DATE_EDIT</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>DATE_NEW.value</name> + <recordfield>DUPLICATESCANNERRESULTFIELDCONFIG.DATE_NEW</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>ENTITY_FIELD_NAME.value</name> + <recordfield>DUPLICATESCANNERRESULTFIELDCONFIG.ENTITY_FIELD_NAME</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>UID.value</name> + <recordfield>DUPLICATESCANNERRESULTFIELDCONFIG.ID</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>USER_EDIT.value</name> + <recordfield>DUPLICATESCANNERRESULTFIELDCONFIG.USER_EDIT</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>USER_NEW.value</name> + <recordfield>DUPLICATESCANNERRESULTFIELDCONFIG.USER_NEW</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>DUPLICATESCANNER_ID.value</name> + <recordfield>DUPLICATESCANNERRESULTFIELDCONFIG.DUPLICATESCANNER_ID</recordfield> + </dbRecordFieldMapping> + </recordFieldMappings> + </dbRecordContainer> + </recordContainers> +</entity> diff --git a/entity/DuplicateScannerResultFieldConfig_entity/entityfields/date_edit/valueProcess.js b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/date_edit/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..5e6ef059738e0c724a468685333a5e257ac228ce --- /dev/null +++ b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/date_edit/valueProcess.js @@ -0,0 +1,7 @@ +import("system.util"); +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/DuplicateScannerResultFieldConfig_entity/entityfields/date_new/valueProcess.js b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/date_new/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..a72892783bf2bd04fe353c47f1be0cb570bbb323 --- /dev/null +++ b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/date_new/valueProcess.js @@ -0,0 +1,7 @@ +import("system.util"); +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) + result.string(vars.get("$sys.date")); \ No newline at end of file diff --git a/entity/DuplicateScannerResultFieldConfig_entity/entityfields/duplicatescanner_id/valueProcess.js b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/duplicatescanner_id/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..b8c682ad670116ff553d3774001f92eeec9478ce --- /dev/null +++ b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/duplicatescanner_id/valueProcess.js @@ -0,0 +1,7 @@ +import("system.result"); +import("system.vars"); + +if(vars.get("$this.value") == null || vars.get("$this.value") == "") +{ + result.string(vars.get("$param.DuplicateScannerId_param")); +} \ No newline at end of file diff --git a/entity/DuplicateScannerResultFieldConfig_entity/entityfields/user_edit/valueProcess.js b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/user_edit/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..6af880ae3e0e2b89b4eee8327ed49f1eefe458af --- /dev/null +++ b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/user_edit/valueProcess.js @@ -0,0 +1,7 @@ +import("system.util"); +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/DuplicateScannerResultFieldConfig_entity/entityfields/user_new/valueProcess.js b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/user_new/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..e518bc75a9494e53a83613dedd943106e74fc00a --- /dev/null +++ b/entity/DuplicateScannerResultFieldConfig_entity/entityfields/user_new/valueProcess.js @@ -0,0 +1,7 @@ +import("system.util"); +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) + result.string(vars.get("$sys.user")); \ No newline at end of file diff --git a/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js b/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..09f2397fdf9818efae79ef28201915ffc52639c3 --- /dev/null +++ b/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js @@ -0,0 +1,7 @@ +import("system.vars"); +import("system.result"); + +if(vars.get("$param.DuplicateScannerId_param")) +{ + result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'"); +} \ No newline at end of file diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod index 51dc169af88b12fb4a67e1187deb1de18bed371f..42f0b6d52f9794f50b0b9c28aa012a4224cd4cee 100644 --- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod +++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod @@ -87,6 +87,20 @@ </entityParameter> </children> </entityConsumer> + <entityConsumer> + <name>ScannerResultFieldsConfig_Consumer</name> + <dependency> + <name>dependency</name> + <entityName>DuplicateScannerResultFieldConfig_entity</entityName> + <fieldName>ScannerResultFieldConfigProvider</fieldName> + </dependency> + <children> + <entityParameter> + <name>DuplicateScannerId_param</name> + <valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scannerresultfieldsconfig_consumer/children/duplicatescannerid_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/DuplicateScanner_entity/entityfields/scannerresultfieldsconfig_consumer/children/duplicatescannerid_param/valueProcess.js b/entity/DuplicateScanner_entity/entityfields/scannerresultfieldsconfig_consumer/children/duplicatescannerid_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..3c559d42002c59103607e03f79eb792d99d74d31 --- /dev/null +++ b/entity/DuplicateScanner_entity/entityfields/scannerresultfieldsconfig_consumer/children/duplicatescannerid_param/valueProcess.js @@ -0,0 +1,3 @@ +import("system.vars"); +import("system.result"); +result.string(vars.get("$field.UID")); \ No newline at end of file diff --git a/neonContext/DuplicateScannerResultFieldConfig/DuplicateScannerResultFieldConfig.aod b/neonContext/DuplicateScannerResultFieldConfig/DuplicateScannerResultFieldConfig.aod new file mode 100644 index 0000000000000000000000000000000000000000..054a1c7fe2c2ea3e3df0e046afc8e03a1ccf3d02 --- /dev/null +++ b/neonContext/DuplicateScannerResultFieldConfig/DuplicateScannerResultFieldConfig.aod @@ -0,0 +1,12 @@ +<?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>DuplicateScannerResultFieldConfig</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <entity>DuplicateScannerResultFieldConfig_entity</entity> + <references> + <neonViewReference> + <name>4bab12e9-c4c3-450f-bfcf-8ecbec1f994c</name> + <view>DuplicateScannerResultFieldConfigEdit_view</view> + </neonViewReference> + </references> +</neonContext> diff --git a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod index 2ce2c53291563518eaf725ec752a131cdf433cc7..8de67abe4e7eb2ad23a8795bfa6da93edc9c4dbe 100644 --- a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod +++ b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod @@ -5,7 +5,7 @@ <layout> <boxLayout> <name>layout</name> - <maxDirectionElements v="3" /> + <maxDirectionElements v="4" /> <autoHeight v="false" /> </boxLayout> </layout> @@ -39,5 +39,10 @@ <entityField>ScannerIndexConfigs_Consumer</entityField> <view>DuplicateScannerIndexConfigEdit_view</view> </neonViewReference> + <neonViewReference> + <name>88257173-a722-45a4-88be-790c9ce575cd</name> + <entityField>ScannerResultFieldsConfig_Consumer</entityField> + <view>DuplicateScannerResultFieldConfigEdit_view</view> + </neonViewReference> </children> </neonView> diff --git a/neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod b/neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod index 680269d7292a4a3186924671ac29d3819ab1ea51..b1c814efb261cd198be9d9e464c759ff79931227 100644 --- a/neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod +++ b/neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod @@ -12,7 +12,7 @@ <name>EntityFieldsConfig</name> <autoNewRow v="true" /> <entityField>#ENTITY</entityField> - <title></title> + <title>Field configuration</title> <devices /> <columns> <neonTableColumn> diff --git a/neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod b/neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod index acc5485240da60c0524f6027c6b4779d19c27a1f..3aee7953eaafdcc5e5b16f30dd500e8ccc072d72 100644 --- a/neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod +++ b/neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod @@ -32,5 +32,15 @@ <entityField>ScannerPrefilterConfigs_Consumer</entityField> <view>DuplicateEdit_view</view> </neonViewReference> + <neonViewReference> + <name>37c931f5-021f-485f-9a89-9938f2fb3570</name> + <entityField>ScannerIndexConfigs_Consumer</entityField> + <view>DuplicateScannerIndexConfigEdit_view</view> + </neonViewReference> + <neonViewReference> + <name>df1a5775-1a21-44ca-9829-e49fdbbebc10</name> + <entityField>ScannerResultFieldsConfig_Consumer</entityField> + <view>DuplicateScannerResultFieldConfigEdit_view</view> + </neonViewReference> </children> </neonView> diff --git a/neonView/DuplicateScannerResultFieldConfigEdit_view/DuplicateScannerResultFieldConfigEdit_view.aod b/neonView/DuplicateScannerResultFieldConfigEdit_view/DuplicateScannerResultFieldConfigEdit_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..e90a5912e1e192990505bc5a52c3b41ae714ab14 --- /dev/null +++ b/neonView/DuplicateScannerResultFieldConfigEdit_view/DuplicateScannerResultFieldConfigEdit_view.aod @@ -0,0 +1,24 @@ +<?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.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.2"> + <name>DuplicateScannerResultFieldConfigEdit_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <genericMultipleViewTemplate> + <name>ResultFieldsConfig</name> + <autoNewRow v="true" /> + <entityField>#ENTITY</entityField> + <title>Result fields</title> + <columns> + <neonTableColumn> + <name>e330572c-aa47-4c52-a760-3e8765ce3dd0</name> + <entityField>ENTITY_FIELD_NAME</entityField> + </neonTableColumn> + </columns> + </genericMultipleViewTemplate> + </children> +</neonView>