From 5db8fc46caa42ed68aec127642b0364169ef4e15 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Wed, 10 Apr 2019 14:10:17 +0200
Subject: [PATCH] fix merge errors
---
.../AditoBasic/create_ab_loghistory.xml | 0
.../Data_alias/basic/2019.2/changelog.xml | 2 +
.../LogHistory_entity/LogHistory_entity.aod | 240 +++++++++---------
.../LogHistoryFilter_view.aod | 80 +++---
neonView/PersonMain_view/PersonMain_view.aod | 1 +
.../db_changes/data_alias/basic/init/init.xml | 0
.../system_alias/struct/create_asys_audit.xml | 23 --
.../_____PREFERENCES_PROJECT.aod | 2 +-
process/Loghistory_lib/Loghistory_lib.aod | 19 +-
process/process_audit/process_audit.aod | 16 +-
10 files changed, 184 insertions(+), 199 deletions(-)
rename {others/db_changes/data_alias/basic/init/struct => .liquibase/Data_alias/basic/2019.2}/AditoBasic/create_ab_loghistory.xml (100%)
delete mode 100644 others/db_changes/data_alias/basic/init/init.xml
delete mode 100644 others/db_changes/system_alias/struct/create_asys_audit.xml
diff --git a/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_loghistory.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/create_ab_loghistory.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_loghistory.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/create_ab_loghistory.xml
diff --git a/.liquibase/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
index 02937d76436..6f93491024b 100644
--- a/.liquibase/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -136,4 +136,6 @@
<!-- Derby needs special handling -->
<include relativeToChangelogFile="true" file="alter_activityLink_notDerby.xml" />
<include relativeToChangelogFile="true" file="alter_activityLink_Derby.xml" />
+
+ <include relativeToChangelogFile="true" file="AditoBasic/create_ab_loghistory.xml"/>
</databaseChangeLog>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index d73a1326dc8..d32a9883c88 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,120 +1,120 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
- <name>LogHistory_entity</name>
- <title>LogHistory</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <iconId>NEON:HISTORY</iconId>
- <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>DATE_NEW</name>
- <title>Änderungsdatum</title>
- <contentType>DATE</contentType>
- <resolution>SECOND</resolution>
- <mandatory v="true" />
- <groupable v="true" />
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <title>Benutzer</title>
- <mandatory v="true" />
- <groupable v="true" />
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Beschreibung</title>
- <contentType>TEXT</contentType>
- <mandatory v="true" />
- </entityField>
- <entityParameter>
- <name>tablenameId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>LogHistoryProvider</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
- <entityName>Person_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>contactId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>tablename_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>LOGHISTORYID</name>
- <title>ID</title>
- <mandatory v="true" />
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ICON</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <title>db</title>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>6becd235-2c53-4ddb-916c-e25da8fc59f5</name>
- <tableName>AB_LOGHISTORY</tableName>
- <primaryKey>AB_LOGHISTORYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>AB_LOGHISTORY.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DESCRIPTION.value</name>
- <recordfield>AB_LOGHISTORY.DESCRIPTION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LOGHISTORYID.value</name>
- <recordfield>AB_LOGHISTORY.AB_LOGHISTORYID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>AB_LOGHISTORY.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.1">
+ <name>LogHistory_entity</name>
+ <title>LogHistory</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <iconId>NEON:HISTORY</iconId>
+ <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <title>Änderungsdatum</title>
+ <contentType>DATE</contentType>
+ <resolution>SECOND</resolution>
+ <mandatory v="true" />
+ <groupable v="true" />
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <title>Benutzer</title>
+ <mandatory v="true" />
+ <groupable v="true" />
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Beschreibung</title>
+ <contentType>TEXT</contentType>
+ <mandatory v="true" />
+ </entityField>
+ <entityParameter>
+ <name>tablenameId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>LogHistoryProvider</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>contactId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>tablename_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>LOGHISTORYID</name>
+ <title>ID</title>
+ <mandatory v="true" />
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <title>db</title>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>6becd235-2c53-4ddb-916c-e25da8fc59f5</name>
+ <tableName>AB_LOGHISTORY</tableName>
+ <primaryKey>AB_LOGHISTORYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>AB_LOGHISTORY.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ <recordfield>AB_LOGHISTORY.DESCRIPTION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LOGHISTORYID.value</name>
+ <recordfield>AB_LOGHISTORY.AB_LOGHISTORYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>AB_LOGHISTORY.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
index 4b1e251cc0a..a95fd3b08d3 100644
--- a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
+++ b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
@@ -1,40 +1,40 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>LogHistoryFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <groupLayout>
- <name>layout</name>
- </groupLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>LogHistoryTable</name>
- <hideActions v="false" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>97886728-fbfe-4d32-b5b4-7dce443e1e2c</name>
- <entityField>DATE_NEW</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2647a81d-2a50-433a-8dc9-f701a60e10e8</name>
- <entityField>USER_NEW</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>02a31f8a-2f91-4364-9d2a-898c4b587afa</name>
- <entityField>DESCRIPTION</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- <timelineViewTemplate>
- <name>LogHistoryTimeLine</name>
- <dateField>DATE_NEW</dateField>
- <titleField>USER_NEW</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
- <iconIdField>#IMAGE</iconIdField>
- <entityField>#ENTITY</entityField>
- </timelineViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>LogHistoryFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>LogHistoryTable</name>
+ <hideActions v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>97886728-fbfe-4d32-b5b4-7dce443e1e2c</name>
+ <entityField>DATE_NEW</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2647a81d-2a50-433a-8dc9-f701a60e10e8</name>
+ <entityField>USER_NEW</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>02a31f8a-2f91-4364-9d2a-898c4b587afa</name>
+ <entityField>DESCRIPTION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ <timelineViewTemplate>
+ <name>LogHistoryTimeLine</name>
+ <dateField>DATE_NEW</dateField>
+ <titleField>USER_NEW</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <iconIdField>#IMAGE</iconIdField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 3f1ff1dc33a..8f264e0b675 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -48,6 +48,7 @@
<name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
<entityField>LogHistoryConsumer</entityField>
<view>LogHistoryFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
<entityField>AttributeTree</entityField>
diff --git a/others/db_changes/data_alias/basic/init/init.xml b/others/db_changes/data_alias/basic/init/init.xml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/others/db_changes/system_alias/struct/create_asys_audit.xml b/others/db_changes/system_alias/struct/create_asys_audit.xml
deleted file mode 100644
index 9ca9fdf0c75..00000000000
--- a/others/db_changes/system_alias/struct/create_asys_audit.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="m.kuhn" id="fcb1ff99-52bd-4ebc-8137-ec05b4cacbd7">
- <createTable tableName="ASYS_AUDIT">
- <column name="ID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_ASYS_AUDIT_ID"/>
- </column>
- <column name="DATASETID" type="NVARCHAR(1023)"/>
- <column name="DATASETNEWVALUE_STRING" type="NVARCHAR(1023)"/>
- <column name="SQLACTION" type="CHAR(1)"/>
- <column name="LOGWRITERUID" type="NVARCHAR(127)"/>
- <column name="DATASETNEWVALUE_BLOB" type="LONGVARBINARY(2147483647)"/>
- <column name="DATASETNEWVALUE_CLOB" type="LONGVARBINARY(2147483647)"/>
- <column name="AOCOLUMNNAME" type="NVARCHAR(127)"/>
- <column name="ALIAS" type="NVARCHAR(255)"/>
- <column name="LOGTIME" type="TIMESTAMP"/>
- <column name="ATABLENAME" type="NVARCHAR(127)"/>
- <column name="ATIMESTAMP" type="TIMESTAMP"/>
- <column name="LOGTYPE" type="INTEGER"/>
- <column name="AUSER" type="NVARCHAR(255)"/>
- </createTable>
-</changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index e075af9a3c2..2e627c2e517 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -14,7 +14,7 @@
<value></value>
</entry>
<entry>
- <key>auswärts</key>
+ <key>auswärts</key>
<value></value>
</entry>
<entry>
diff --git a/process/Loghistory_lib/Loghistory_lib.aod b/process/Loghistory_lib/Loghistory_lib.aod
index a88fbae558b..6ef876b187e 100644
--- a/process/Loghistory_lib/Loghistory_lib.aod
+++ b/process/Loghistory_lib/Loghistory_lib.aod
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
- <name>Loghistory_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Loghistory_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>Loghistory_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Loghistory_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/process_audit/process_audit.aod b/process/process_audit/process_audit.aod
index 018d83646b3..ea60b01713c 100644
--- a/process/process_audit/process_audit.aod
+++ b/process/process_audit/process_audit.aod
@@ -1,6 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process 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/process/1.2.0">
- <name>process_audit</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/process_audit/process.js</process>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>process_audit</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/process_audit/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
--
GitLab