From 295c697a764ddd0092c4d539070190cb5a9d04cd Mon Sep 17 00:00:00 2001 From: "j.luginger" <j.luginger@JLuginger.aditosoftware.local> Date: Thu, 21 Feb 2019 08:16:03 +0100 Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1035025][SALUTATION] --- aliasDefinition/Data_alias/Data_alias.aod | 421 ++++++++++++++++++ .../_____SYSTEM_APPLICATION_NEON.aod | 1 + .../Salutation_entity/Salutation_entity.aod | 91 ++++ neonContext/Salutation/Salutation.aod | 14 + .../SalutationFilter_view.aod | 51 +++ .../data_alias/struct/create_salutation.xml | 17 + others/db_changes/masterChangelog.xml | 2 + 7 files changed, 597 insertions(+) create mode 100644 entity/Salutation_entity/Salutation_entity.aod create mode 100644 neonContext/Salutation/Salutation.aod create mode 100644 neonView/SalutationFilter_view/SalutationFilter_view.aod create mode 100644 others/db_changes/data_alias/struct/create_salutation.xml diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 9cfc964b7d..5705ff7923 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -4634,6 +4634,427 @@ </entityFieldDb> </entityFields> </entityDb> + <entityDb> + <name>SALUTATION</name> + <dbName></dbName> + <idColumn>SALUTATIONID</idColumn> + <idGeneratorType v="0" /> + <idGeneratorInterval v="1" /> + <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>LANGUAGE</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>SALUTATION</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> + <entityFieldDb> + <name>SEX</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="30" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>SORT</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="4" /> + <size v="10" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>SALUTATIONID</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>TITLE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="30" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>HEADLINE</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> + <entityFieldDb> + <name>LETTERSALUTATION</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> + <entityDb> + <name>DATABASECHANGELOG</name> + <dbName></dbName> + <idColumn></idColumn> + <idGeneratorType v="1" /> + <idGeneratorInterval v="1" /> + <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>EXECTYPE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="10" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DATEEXECUTED</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>ORDEREXECUTED</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="4" /> + <size v="10" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>COMMENTS</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>AUTHOR</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>CONTEXTS</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>MD5SUM</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="35" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DESCRIPTION</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>LIQUIBASE</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="20" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>DEPLOYMENT_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="10" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>TAG</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>LABELS</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>FILENAME</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + </entityFields> + </entityDb> + <entityDb> + <name>DATABASECHANGELOGLOCK</name> + <dbName></dbName> + <idColumn>ID</idColumn> + <idGeneratorType v="1" /> + <idGeneratorInterval v="1" /> + <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>LOCKGRANTED</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>LOCKED</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="16" /> + <size v="1" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>LOCKEDBY</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>ID</name> + <dbName></dbName> + <primaryKey v="true" /> + <columnType v="4" /> + <size v="10" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="true" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + </entityFields> + </entityDb> </entities> </entityGroup> </aliasDefDb> diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod index 7445939840..b8dea2d650 100644 --- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod +++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod @@ -32,6 +32,7 @@ <node name="Attribute" kind="10077" /> <node name="KeywordEntry" kind="10077" /> <node name="KeywordAttribute" kind="10077" /> + <node name="Salutation" kind="10077" /> <node name="INTERNAL_ADMINISTRATOR" kind="159" /> </node> </node> diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod new file mode 100644 index 0000000000..5ce491ed37 --- /dev/null +++ b/entity/Salutation_entity/Salutation_entity.aod @@ -0,0 +1,91 @@ +<?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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0"> + <name>Salutation_entity</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <recordContainer>db</recordContainer> + <entityFields> + <entityProvider> + <name>#PROVIDER</name> + </entityProvider> + <entityField> + <name>SALUTATIONID</name> + </entityField> + <entityField> + <name>HEADLINE</name> + <title>Anrede im Briedkopf</title> + </entityField> + <entityField> + <name>LANGUAGE_SALUTATION</name> + <title>Sprache</title> + </entityField> + <entityField> + <name>LETTERSALUTATION</name> + <title>Briefanrede</title> + </entityField> + <entityField> + <name>SALUTATION</name> + <title>Anrede</title> + </entityField> + <entityField> + <name>SEX</name> + <title>Geschlecht</title> + </entityField> + <entityField> + <name>SORT</name> + <title>Sortierung</title> + </entityField> + <entityField> + <name>TITLE</name> + <title>(Akademischer) Titel</title> + </entityField> + </entityFields> + <recordContainers> + <dbRecordContainer> + <name>db</name> + <alias>Data_alias</alias> + <linkInformation> + <linkInformation> + <name>6543f63c-3486-4e8b-bfc8-51b5088ce0b6</name> + <tableName>SALUTATION</tableName> + <primaryKey>SALUTATIONID</primaryKey> + <isUIDTable v="true" /> + <readonly v="false" /> + </linkInformation> + </linkInformation> + <recordFieldMappings> + <dbRecordFieldMapping> + <name>HEADLINE.value</name> + <recordfield>SALUTATION.HEADLINE</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>LANGUAGE_SALUTATION.value</name> + <recordfield>SALUTATION.LANGUAGE</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>LETTERSALUTATION.value</name> + <recordfield>SALUTATION.LETTERSALUTATION</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>SALUTATION.value</name> + <recordfield>SALUTATION.SALUTATION</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>SALUTATIONID.value</name> + <recordfield>SALUTATION.SALUTATIONID</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>SEX.value</name> + <recordfield>SALUTATION.SEX</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>SORT.value</name> + <recordfield>SALUTATION.SORT</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>TITLE.value</name> + <recordfield>SALUTATION.TITLE</recordfield> + </dbRecordFieldMapping> + </recordFieldMappings> + </dbRecordContainer> + </recordContainers> +</entity> diff --git a/neonContext/Salutation/Salutation.aod b/neonContext/Salutation/Salutation.aod new file mode 100644 index 0000000000..a1150ee5c6 --- /dev/null +++ b/neonContext/Salutation/Salutation.aod @@ -0,0 +1,14 @@ +<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0"> + <name>Salutation</name> + <title>Anrede</title> + <majorModelMode>DISTRIBUTED</majorModelMode> + <filterview>SalutationFilter_view</filterview> + <entity>Salutation_entity</entity> + <references> + <neonViewReference> + <name>e1ddbe88-af31-4860-9b9e-447282060ec2</name> + <view>SalutationFilter_view</view> + </neonViewReference> + </references> +</neonContext> diff --git a/neonView/SalutationFilter_view/SalutationFilter_view.aod b/neonView/SalutationFilter_view/SalutationFilter_view.aod new file mode 100644 index 0000000000..3259a47e21 --- /dev/null +++ b/neonView/SalutationFilter_view/SalutationFilter_view.aod @@ -0,0 +1,51 @@ +<?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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> + <name>SalutationFilter_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <tableViewTemplate> + <name>Table</name> + <entityField>#ENTITY</entityField> + <columns> + <neonTableColumn> + <name>4a0e3f58-8d0c-4481-8ff5-2f1762460c21</name> + <entityField>SORT</entityField> + </neonTableColumn> + <neonTableColumn> + <name>cd9277bb-e254-41d2-bbfa-5d328e348405</name> + <entityField>SALUTATION</entityField> + <width v="75" /> + </neonTableColumn> + <neonTableColumn> + <name>68809674-e641-4965-8977-20f6b3e1002a</name> + <entityField>SEX</entityField> + <width v="75" /> + </neonTableColumn> + <neonTableColumn> + <name>b4108c6a-173d-4692-b9dc-a0c02de7d373</name> + <entityField>LANGUAGE_SALUTATION</entityField> + <expandRatio v="100" /> + </neonTableColumn> + <neonTableColumn> + <name>229e8fa9-e4c3-4cab-b692-6695c4bff4aa</name> + <entityField>TITLE</entityField> + <width v="75" /> + </neonTableColumn> + <neonTableColumn> + <name>5aa35e22-4ca3-4a65-a9de-44bd209248e8</name> + <entityField>LETTERSALUTATION</entityField> + </neonTableColumn> + <neonTableColumn> + <name>dd21b360-22e4-448b-906d-059bc6c4033f</name> + <entityField>HEADLINE</entityField> + <width v="75" /> + </neonTableColumn> + </columns> + </tableViewTemplate> + </children> +</neonView> diff --git a/others/db_changes/data_alias/struct/create_salutation.xml b/others/db_changes/data_alias/struct/create_salutation.xml new file mode 100644 index 0000000000..5073e4b526 --- /dev/null +++ b/others/db_changes/data_alias/struct/create_salutation.xml @@ -0,0 +1,17 @@ +<?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="j.luginger" id="936582fe-351f-11e9-b210-d663bd873d93"> + <createTable tableName="SALUTATION"> + <column name="SALUTATIONID" type="CHAR(36)"> + <constraints primaryKey="true" primaryKeyName="PK_SALUTATION_SALUTATIONID"/> + </column> + <column name="HEADLINE" type="NVARCHAR(50)"/> + <column name="LANGUAGE" type="CHAR(36)"/> + <column name="LETTERSALUTATION" type="NVARCHAR(50)"/> + <column name="SALUTATION" type="NVARCHAR(50)"/> + <column name="SEX" type="CHAR(36)"/> + <column name="SORT" type="INTEGER"/> + <column name="TITLE" type="NVARCHAR(30)"/> + </createTable> +</changeSet> +</databaseChangeLog> diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml index c93c6d8738..3208ce01cb 100644 --- a/others/db_changes/masterChangelog.xml +++ b/others/db_changes/masterChangelog.xml @@ -10,6 +10,7 @@ <include file="data_alias/struct/AditoBasic/create_ab_countryinfo.xml"/> <include file="data_alias/struct/AditoBasic/create_ab_language.xml"/> + <include file="data_alias/struct/create_person.xml"/> <include file="data_alias/struct/create_organisation.xml"/> <include file="data_alias/struct/create_contact.xml"/> @@ -36,6 +37,7 @@ <include file="data_alias/struct/create_salesorderitem.xml"/> <include file="data_alias/struct/create_timetracking.xml"/> <include file="data_alias/struct/create_task.xml"/> + <include file="data_alias/struct/create_salutation.xml"/> <include file="data_alias/data/example_organisation/ORGANISATION_privat.xml"/> <include file="data_alias/data/example_organisation/ORGANISATION_gfk.xml"/> -- GitLab