From c4cb9a739573842cd8802a933338f26228d30ed8 Mon Sep 17 00:00:00 2001 From: Tobias Feldmann <t.feldmann@adito.de> Date: Mon, 13 Aug 2018 16:38:17 +0200 Subject: [PATCH] Comm_context, Comm_entity u Comm-Table --- aliasDefinition/Data_alias/Data_alias.aod | 136 ++++++++++++++++++ entity/Address_entity/Address_entity.aod | 2 + entity/Comm_entity/Comm_entity.aod | 101 +++++++++++++ entity/Comm_entity/conditionProcess.js | 8 ++ .../entityfields/date_new/valueProcess.js | 8 ++ .../entityfields/relation_id/valueProcess.js | 9 ++ .../entityfields/user_new/valueProcess.js | 7 + entity/Org_entity/Org_entity.aod | 18 +++ .../orgcomm_dfo/children/relid_param/code.js | 4 + entity/Pers_entity/Pers_entity.aod | 18 +++ .../perscomm_dfo/children/relid_param/code.js | 4 + neonContext/Comm_context/Comm_context.aod | 25 ++++ neonView/CommEdit_view/CommEdit_view.aod | 26 ++++ neonView/CommFilter_view/CommFilter_view.aod | 26 ++++ neonView/CommList_view/CommList_view.aod | 26 ++++ .../CommMultiEdit_view/CommMultiEdit_view.aod | 26 ++++ neonView/OrgEdit_view/OrgEdit_view.aod | 5 + neonView/OrgPreview_view/OrgPreview_view.aod | 5 + neonView/PersEdit_view/PersEdit_view.aod | 5 + .../PersPreview_view/PersPreview_view.aod | 5 + others/db_changes/masterChangelog.xml | 1 + others/db_changes/struct/create_comm.xml | 22 +++ 22 files changed, 487 insertions(+) create mode 100644 entity/Comm_entity/Comm_entity.aod create mode 100644 entity/Comm_entity/conditionProcess.js create mode 100644 entity/Comm_entity/entityfields/date_new/valueProcess.js create mode 100644 entity/Comm_entity/entityfields/relation_id/valueProcess.js create mode 100644 entity/Comm_entity/entityfields/user_new/valueProcess.js create mode 100644 entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js create mode 100644 entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js create mode 100644 neonContext/Comm_context/Comm_context.aod create mode 100644 neonView/CommEdit_view/CommEdit_view.aod create mode 100644 neonView/CommFilter_view/CommFilter_view.aod create mode 100644 neonView/CommList_view/CommList_view.aod create mode 100644 neonView/CommMultiEdit_view/CommMultiEdit_view.aod create mode 100644 others/db_changes/struct/create_comm.xml diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index ac040c579f..e37baaa7fa 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -1027,6 +1027,142 @@ </entityFieldDb> </entityFields> </entityDb> + <entityDb> + <name>COMM</name> + <dbName></dbName> + <idColumn>COMMID</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>COMMID</name> + <dbName></dbName> + <primaryKey v="true" /> + <columnType v="1" /> + <size v="36" /> + <scale v="0" /> + <notNull v="true" /> + <isUnique v="true" /> + <index v="false" /> + <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" /> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>MEDIUM_ID</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="4" /> + <size v="10" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <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" /> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>RELATION_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" /> + <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" /> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>STANDARD</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="4" /> + <size v="10" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <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" /> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>ADDR</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <title></title> + <description></description> + </entityFieldDb> + </entityFields> + </entityDb> </entities> </entityGroup> </aliasDefDb> diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod index e50eff8e96..830a6fff9e 100644 --- a/entity/Address_entity/Address_entity.aod +++ b/entity/Address_entity/Address_entity.aod @@ -62,6 +62,7 @@ <name>DATE_NEW</name> <tableName>ADDRESS</tableName> <columnName>DATE_NEW</columnName> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess> </entityField> <entityField> @@ -94,6 +95,7 @@ <name>USER_NEW</name> <tableName>ADDRESS</tableName> <columnName>USER_NEW</columnName> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess> </entityField> <entityField> diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod new file mode 100644 index 0000000000..38b92f9e1d --- /dev/null +++ b/entity/Comm_entity/Comm_entity.aod @@ -0,0 +1,101 @@ +<?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.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3"> + <name>Comm_entity</name> + <title>Kommunikation</title> + <majorModelMode>DISTRIBUTED</majorModelMode> + <alias>Data_alias</alias> + <conditionProcess>%aditoprj%/entity/Comm_entity/conditionProcess.js</conditionProcess> + <recordContainerType>DB</recordContainerType> + <caption>Kommunikation</caption> + <entityFields> + <entityField> + <name>ADDR</name> + <tableName>COMM</tableName> + <columnName>ADDR</columnName> + <caption>Adresse</caption> + </entityField> + <entityField> + <name>COMMID</name> + <tableName>COMM</tableName> + <columnName>COMMID</columnName> + </entityField> + <entityField> + <name>DATE_EDIT</name> + <tableName>COMM</tableName> + <columnName>DATE_EDIT</columnName> + </entityField> + <entityField> + <name>DATE_NEW</name> + <tableName>COMM</tableName> + <columnName>DATE_NEW</columnName> + <state>READONLY</state> + <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/date_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>MEDIUM_ID</name> + <tableName>COMM</tableName> + <columnName>MEDIUM_ID</columnName> + <caption>Medium</caption> + </entityField> + <entityField> + <name>RELATION_ID</name> + <tableName>COMM</tableName> + <columnName>RELATION_ID</columnName> + <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/relation_id/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>STANDARD</name> + <tableName>COMM</tableName> + <columnName>STANDARD</columnName> + </entityField> + <entityField> + <name>USER_EDIT</name> + <tableName>COMM</tableName> + <columnName>USER_EDIT</columnName> + </entityField> + <entityField> + <name>USER_NEW</name> + <tableName>COMM</tableName> + <columnName>USER_NEW</columnName> + <state>READONLY</state> + <valueProcess>%aditoprj%/entity/Comm_entity/entityfields/user_new/valueProcess.js</valueProcess> + </entityField> + <entityParameter> + <name>RelId_param</name> + <expose v="true" /> + <description>PARAMETER</description> + </entityParameter> + <entityIncomingField> + <name>PersComm_dfi</name> + <fieldType>DEPENDENCY_IN</fieldType> + <dependencies> + <entityDependency> + <name>b509cb67-6306-4f74-8ce8-0385052a9611</name> + <entityName>Pers_entity</entityName> + <fieldName>PersComm_dfo</fieldName> + <isOutgoing v="false" /> + </entityDependency> + </dependencies> + </entityIncomingField> + <entityIncomingField> + <name>OrgComm_dfi</name> + <fieldType>DEPENDENCY_IN</fieldType> + <dependencies> + <entityDependency> + <name>09723d40-72bc-4fcd-8283-fe085de73330</name> + <entityName>Org_entity</entityName> + <fieldName>OrgComm_dfo</fieldName> + <isOutgoing v="false" /> + </entityDependency> + </dependencies> + </entityIncomingField> + </entityFields> + <linkInformation> + <linkInformation> + <name>54875441-f1b0-47d1-9fa6-c1927863f3e3</name> + <tableName>COMM</tableName> + <primaryKey>COMMID</primaryKey> + <isUIDTable v="true" /> + </linkInformation> + </linkInformation> +</entity> diff --git a/entity/Comm_entity/conditionProcess.js b/entity/Comm_entity/conditionProcess.js new file mode 100644 index 0000000000..0d4b526962 --- /dev/null +++ b/entity/Comm_entity/conditionProcess.js @@ -0,0 +1,8 @@ +import("system.logging"); +import("system.result"); +import("system.vars"); + +if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null) + result.string("COMM.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')"); +else + result.string("1 = 2"); \ No newline at end of file diff --git a/entity/Comm_entity/entityfields/date_new/valueProcess.js b/entity/Comm_entity/entityfields/date_new/valueProcess.js new file mode 100644 index 0000000000..eedddb3cf0 --- /dev/null +++ b/entity/Comm_entity/entityfields/date_new/valueProcess.js @@ -0,0 +1,8 @@ +import("system.logging"); +import("system.vars"); +import("system.result"); +import("system.neon"); + +if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) + result.string(vars.getString("$sys.date")); + diff --git a/entity/Comm_entity/entityfields/relation_id/valueProcess.js b/entity/Comm_entity/entityfields/relation_id/valueProcess.js new file mode 100644 index 0000000000..2d085e3aff --- /dev/null +++ b/entity/Comm_entity/entityfields/relation_id/valueProcess.js @@ -0,0 +1,9 @@ +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) +{ + if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null) + result.string(vars.getString("$param.RelId_param")); +} \ No newline at end of file diff --git a/entity/Comm_entity/entityfields/user_new/valueProcess.js b/entity/Comm_entity/entityfields/user_new/valueProcess.js new file mode 100644 index 0000000000..f9abb66712 --- /dev/null +++ b/entity/Comm_entity/entityfields/user_new/valueProcess.js @@ -0,0 +1,7 @@ +import("system.logging"); +import("system.vars"); +import("system.result"); +import("system.neon"); + +if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) + result.string(vars.getString("$sys.user")); \ No newline at end of file diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod index 78a9fd3b28..24db71632f 100644 --- a/entity/Org_entity/Org_entity.aod +++ b/entity/Org_entity/Org_entity.aod @@ -205,6 +205,24 @@ <tableName>RELATION</tableName> <columnName>ADDRESS_ID</columnName> </entityField> + <entityOutgoingField> + <name>OrgComm_dfo</name> + <title>Kommunikation</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <caption>Kommunikation</caption> + <dependency> + <name>dependency</name> + <entityName>Comm_entity</entityName> + <fieldName>OrgComm_dfi</fieldName> + </dependency> + <children> + <entityParameter> + <name>RelId_param</name> + <code>%aditoprj%/entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js</code> + <triggerRecalculation v="true" /> + </entityParameter> + </children> + </entityOutgoingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js b/entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js new file mode 100644 index 0000000000..aa257b8b78 --- /dev/null +++ b/entity/Org_entity/entityfields/orgcomm_dfo/children/relid_param/code.js @@ -0,0 +1,4 @@ +import("system.result"); +import("system.vars"); + +result.string(vars.get("$field.RELATIONID")); \ No newline at end of file diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod index 1117ceb3ea..b9553856da 100644 --- a/entity/Pers_entity/Pers_entity.aod +++ b/entity/Pers_entity/Pers_entity.aod @@ -220,6 +220,24 @@ </entityParameter> </children> </entityOutgoingField> + <entityOutgoingField> + <name>PersComm_dfo</name> + <title>Kommunikation</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <caption>Kommunikation</caption> + <dependency> + <name>dependency</name> + <entityName>Comm_entity</entityName> + <fieldName>PersComm_dfi</fieldName> + </dependency> + <children> + <entityParameter> + <name>RelId_param</name> + <code>%aditoprj%/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js</code> + <triggerRecalculation v="true" /> + </entityParameter> + </children> + </entityOutgoingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js new file mode 100644 index 0000000000..aa257b8b78 --- /dev/null +++ b/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js @@ -0,0 +1,4 @@ +import("system.result"); +import("system.vars"); + +result.string(vars.get("$field.RELATIONID")); \ No newline at end of file diff --git a/neonContext/Comm_context/Comm_context.aod b/neonContext/Comm_context/Comm_context.aod new file mode 100644 index 0000000000..2f4dc3cfac --- /dev/null +++ b/neonContext/Comm_context/Comm_context.aod @@ -0,0 +1,25 @@ +<?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>Comm_context</name> + <title>Kommunikation</title> + <majorModelMode>DISTRIBUTED</majorModelMode> + <entity>Comm_entity</entity> + <references> + <neonViewReference> + <name>a6ea1a77-09d3-4c36-90dc-3bcb4a22842a</name> + <view>CommMultiEdit_view</view> + </neonViewReference> + <neonViewReference> + <name>af0e1f4b-a859-4302-b8d8-05568b9a4655</name> + <view>CommList_view</view> + </neonViewReference> + <neonViewReference> + <name>9bccd737-1feb-48e3-9b77-9b6b4720a4f8</name> + <view>CommEdit_view</view> + </neonViewReference> + <neonViewReference> + <name>ba995694-e88f-4f50-b4e7-5018b034747f</name> + <view>CommFilter_view</view> + </neonViewReference> + </references> +</neonContext> diff --git a/neonView/CommEdit_view/CommEdit_view.aod b/neonView/CommEdit_view/CommEdit_view.aod new file mode 100644 index 0000000000..c6b2e2b8e7 --- /dev/null +++ b/neonView/CommEdit_view/CommEdit_view.aod @@ -0,0 +1,26 @@ +<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0"> + <name>CommEdit_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <genericViewTemplate> + <name>Generic_template</name> + <entityField>#ENTITY</entityField> + <fields> + <entityFieldLink> + <name>baa7e569-6ee2-4c42-aaee-975d3cfb5977</name> + <entityField>MEDIUM_ID</entityField> + </entityFieldLink> + <entityFieldLink> + <name>6003ad0c-5e9d-4a56-a0a0-19f9a597a702</name> + <entityField>ADDR</entityField> + </entityFieldLink> + </fields> + </genericViewTemplate> + </children> +</neonView> diff --git a/neonView/CommFilter_view/CommFilter_view.aod b/neonView/CommFilter_view/CommFilter_view.aod new file mode 100644 index 0000000000..aebca82cc5 --- /dev/null +++ b/neonView/CommFilter_view/CommFilter_view.aod @@ -0,0 +1,26 @@ +<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0"> + <name>CommFilter_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <tableViewTemplate> + <name>Table_template</name> + <entityField>#ENTITY</entityField> + <columns> + <neonTableColumn> + <name>8a7d17a8-e6b9-430e-90ea-4a50daa97cba</name> + <entityField>MEDIUM_ID</entityField> + </neonTableColumn> + <neonTableColumn> + <name>1f8b562b-142d-4fdc-82d0-2d0cc855cdd5</name> + <entityField>ADDR</entityField> + </neonTableColumn> + </columns> + </tableViewTemplate> + </children> +</neonView> diff --git a/neonView/CommList_view/CommList_view.aod b/neonView/CommList_view/CommList_view.aod new file mode 100644 index 0000000000..3235321ba6 --- /dev/null +++ b/neonView/CommList_view/CommList_view.aod @@ -0,0 +1,26 @@ +<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0"> + <name>CommList_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <noneLayout> + <name>layout</name> + </noneLayout> + </layout> + <children> + <titledListViewTemplate> + <name>TitledList_template</name> + <entityField>#ENTITY</entityField> + <columns> + <neonTableColumn> + <name>5649723d-2478-4b4c-9e32-7944e643bc42</name> + <entityField>MEDIUM_ID</entityField> + </neonTableColumn> + <neonTableColumn> + <name>825df64b-901b-49ac-a759-3ee1c260a88a</name> + <entityField>ADDR</entityField> + </neonTableColumn> + </columns> + </titledListViewTemplate> + </children> +</neonView> diff --git a/neonView/CommMultiEdit_view/CommMultiEdit_view.aod b/neonView/CommMultiEdit_view/CommMultiEdit_view.aod new file mode 100644 index 0000000000..49892a2973 --- /dev/null +++ b/neonView/CommMultiEdit_view/CommMultiEdit_view.aod @@ -0,0 +1,26 @@ +<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0"> + <name>CommMultiEdit_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <noneLayout> + <name>layout</name> + </noneLayout> + </layout> + <children> + <genericMultipleViewTemplate> + <name>GenericMultiple_template</name> + <entityField>#ENTITY</entityField> + <children> + <neonTableColumn> + <name>b210222e-dfd3-4cec-bc2e-84b72aebb2b6</name> + <entityField>MEDIUM_ID</entityField> + </neonTableColumn> + <neonTableColumn> + <name>c20668f3-6722-4a38-86d6-0d29be06dbe1</name> + <entityField>ADDR</entityField> + </neonTableColumn> + </children> + </genericMultipleViewTemplate> + </children> +</neonView> diff --git a/neonView/OrgEdit_view/OrgEdit_view.aod b/neonView/OrgEdit_view/OrgEdit_view.aod index 3585d7d5a5..4e59022979 100644 --- a/neonView/OrgEdit_view/OrgEdit_view.aod +++ b/neonView/OrgEdit_view/OrgEdit_view.aod @@ -44,5 +44,10 @@ <entityField>OrgAddress_dfo</entityField> <view>AdressMultiEdit_view</view> </neonViewReference> + <neonViewReference> + <name>6355808f-ee94-4caf-95b1-3848e81c75b7</name> + <entityField>OrgComm_dfo</entityField> + <view>CommMultiEdit_view</view> + </neonViewReference> </children> </neonView> diff --git a/neonView/OrgPreview_view/OrgPreview_view.aod b/neonView/OrgPreview_view/OrgPreview_view.aod index e6a81a2579..2807fd672f 100644 --- a/neonView/OrgPreview_view/OrgPreview_view.aod +++ b/neonView/OrgPreview_view/OrgPreview_view.aod @@ -20,6 +20,11 @@ <entityField>OrgAddress_dfo</entityField> <view>AddressList_view</view> </neonViewReference> + <neonViewReference> + <name>7fbd6034-4213-41f9-bb0d-c73d55b88d82</name> + <entityField>OrgComm_dfo</entityField> + <view>CommList_view</view> + </neonViewReference> <genericViewTemplate> <name>OrgInfo_template</name> <showDrawer v="true" /> diff --git a/neonView/PersEdit_view/PersEdit_view.aod b/neonView/PersEdit_view/PersEdit_view.aod index c0d3309120..7326fe2858 100644 --- a/neonView/PersEdit_view/PersEdit_view.aod +++ b/neonView/PersEdit_view/PersEdit_view.aod @@ -55,5 +55,10 @@ <entityField>PersAddress_dfo</entityField> <view>AdressMultiEdit_view</view> </neonViewReference> + <neonViewReference> + <name>fc64789f-b4c6-401e-86e3-f484451c7689</name> + <entityField>PersComm_dfo</entityField> + <view>CommMultiEdit_view</view> + </neonViewReference> </children> </neonView> diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/PersPreview_view/PersPreview_view.aod index a340bf1982..1171a3ae22 100644 --- a/neonView/PersPreview_view/PersPreview_view.aod +++ b/neonView/PersPreview_view/PersPreview_view.aod @@ -20,6 +20,11 @@ <entityField>PersAddress_dfo</entityField> <view>AddressList_view</view> </neonViewReference> + <neonViewReference> + <name>41e3d75c-0456-4140-b651-eb45ffb53a35</name> + <entityField>PersComm_dfo</entityField> + <view>CommList_view</view> + </neonViewReference> <genericViewTemplate> <name>PersInfo_template</name> <showDrawer v="true" /> diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml index 857ea87435..ce276eeb3f 100644 --- a/others/db_changes/masterChangelog.xml +++ b/others/db_changes/masterChangelog.xml @@ -12,4 +12,5 @@ <include file="data/PERS_extendeddata.xml"/> <include file="data/example_history/extendHLink_62330df6.xml"/> <include file="struct/create_address.xml"/> + <include file="struct/create_comm.xml"/> </databaseChangeLog> diff --git a/others/db_changes/struct/create_comm.xml b/others/db_changes/struct/create_comm.xml new file mode 100644 index 0000000000..0fdb1ef77a --- /dev/null +++ b/others/db_changes/struct/create_comm.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="t.feldmann" id="33b5d1ac-08cf-3331-90a8-8cbc1439bfca"> + <createTable tableName="COMM"> + <column name="COMMID" type="CHAR(36)"> + <constraints primaryKey="true" primaryKeyName="PK_COMM_COMMID"/> + </column> + <column name="ADDR" type="VARCHAR(255)"/> + <column name="MEDIUM_ID" type="INTEGER"/> + <column name="RELATION_ID" type="CHAR(36)"/> + <column name="STANDARD" type="INTEGER"/> + <column name="DATE_EDIT" type="TIMESTAMP"/> + <column name="DATE_NEW" type="TIMESTAMP"> + <constraints nullable="false"/> + </column> + <column name="USER_EDIT" type="VARCHAR(50)"/> + <column name="USER_NEW" type="VARCHAR(50)"> + <constraints nullable="false"/> + </column> + </createTable> +</changeSet> +</databaseChangeLog> \ No newline at end of file -- GitLab