Skip to content
Snippets Groups Projects
Commit 5db8fc46 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

fix merge errors

parent 38cae3f2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 184 additions and 199 deletions
.liquibase/Data_alias/basic/2019.2/changelog.xml
+ 2
− 0
View file @ 5db8fc46
...@@ -136,4 +136,6 @@ ...@@ -136,4 +136,6 @@
<!-- Derby needs special handling --> <!-- Derby needs special handling -->
<include relativeToChangelogFile="true" file="alter_activityLink_notDerby.xml" /> <include relativeToChangelogFile="true" file="alter_activityLink_notDerby.xml" />
<include relativeToChangelogFile="true" file="alter_activityLink_Derby.xml" /> <include relativeToChangelogFile="true" file="alter_activityLink_Derby.xml" />
<include relativeToChangelogFile="true" file="AditoBasic/create_ab_loghistory.xml"/>
</databaseChangeLog> </databaseChangeLog>
entity/LogHistory_entity/LogHistory_entity.aod
+ 120
− 120
View file @ 5db8fc46
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <name>LogHistory_entity</name>
<title>LogHistory</title> <title>LogHistory</title>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<iconId>NEON:HISTORY</iconId> <iconId>NEON:HISTORY</iconId>
<imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess> <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<entityFields> <entityFields>
<entityProvider> <entityProvider>
<name>#PROVIDER</name> <name>#PROVIDER</name>
</entityProvider> </entityProvider>
<entityField> <entityField>
<name>DATE_NEW</name> <name>DATE_NEW</name>
<title>Änderungsdatum</title> <title>Änderungsdatum</title>
<contentType>DATE</contentType> <contentType>DATE</contentType>
<resolution>SECOND</resolution> <resolution>SECOND</resolution>
<mandatory v="true" /> <mandatory v="true" />
<groupable v="true" /> <groupable v="true" />
</entityField> </entityField>
<entityField> <entityField>
<name>USER_NEW</name> <name>USER_NEW</name>
<title>Benutzer</title> <title>Benutzer</title>
<mandatory v="true" /> <mandatory v="true" />
<groupable v="true" /> <groupable v="true" />
</entityField> </entityField>
<entityField> <entityField>
<name>DESCRIPTION</name> <name>DESCRIPTION</name>
<title>Beschreibung</title> <title>Beschreibung</title>
<contentType>TEXT</contentType> <contentType>TEXT</contentType>
<mandatory v="true" /> <mandatory v="true" />
</entityField> </entityField>
<entityParameter> <entityParameter>
<name>tablenameId_param</name> <name>tablenameId_param</name>
<expose v="true" /> <expose v="true" />
<triggerRecalculation v="true" /> <triggerRecalculation v="true" />
<mandatory v="true" /> <mandatory v="true" />
<description>PARAMETER</description> <description>PARAMETER</description>
</entityParameter> </entityParameter>
<entityProvider> <entityProvider>
<name>LogHistoryProvider</name> <name>LogHistoryProvider</name>
<fieldType>DEPENDENCY_IN</fieldType> <fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer> <recordContainer>db</recordContainer>
<dependencies> <dependencies>
<entityDependency> <entityDependency>
<name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name> <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
<entityName>Person_entity</entityName> <entityName>Person_entity</entityName>
<fieldName>LogHistoryConsumer</fieldName> <fieldName>LogHistoryConsumer</fieldName>
<isConsumer v="false" /> <isConsumer v="false" />
</entityDependency> </entityDependency>
<entityDependency> <entityDependency>
<name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name> <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
<entityName>Organisation_entity</entityName> <entityName>Organisation_entity</entityName>
<fieldName>LogHistoryConsumer</fieldName> <fieldName>LogHistoryConsumer</fieldName>
<isConsumer v="false" /> <isConsumer v="false" />
</entityDependency> </entityDependency>
</dependencies> </dependencies>
</entityProvider> </entityProvider>
<entityParameter> <entityParameter>
<name>contactId_param</name> <name>contactId_param</name>
<expose v="true" /> <expose v="true" />
<triggerRecalculation v="true" /> <triggerRecalculation v="true" />
<mandatory v="true" /> <mandatory v="true" />
<description>PARAMETER</description> <description>PARAMETER</description>
</entityParameter> </entityParameter>
<entityParameter> <entityParameter>
<name>tablename_param</name> <name>tablename_param</name>
<expose v="true" /> <expose v="true" />
<triggerRecalculation v="true" /> <triggerRecalculation v="true" />
<mandatory v="true" /> <mandatory v="true" />
<description>PARAMETER</description> <description>PARAMETER</description>
</entityParameter> </entityParameter>
<entityField> <entityField>
<name>LOGHISTORYID</name> <name>LOGHISTORYID</name>
<title>ID</title> <title>ID</title>
<mandatory v="true" /> <mandatory v="true" />
<searchable v="false" /> <searchable v="false" />
</entityField> </entityField>
<entityField> <entityField>
<name>ICON</name> <name>ICON</name>
<searchable v="false" /> <searchable v="false" />
<valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess> <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField> </entityField>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<dbRecordContainer> <dbRecordContainer>
<name>db</name> <name>db</name>
<title>db</title> <title>db</title>
<alias>Data_alias</alias> <alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js</conditionProcess> <conditionProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation> <linkInformation>
<linkInformation> <linkInformation>
<name>6becd235-2c53-4ddb-916c-e25da8fc59f5</name> <name>6becd235-2c53-4ddb-916c-e25da8fc59f5</name>
<tableName>AB_LOGHISTORY</tableName> <tableName>AB_LOGHISTORY</tableName>
<primaryKey>AB_LOGHISTORYID</primaryKey> <primaryKey>AB_LOGHISTORYID</primaryKey>
<isUIDTable v="true" /> <isUIDTable v="true" />
<readonly v="false" /> <readonly v="false" />
</linkInformation> </linkInformation>
</linkInformation> </linkInformation>
<recordFieldMappings> <recordFieldMappings>
<dbRecordFieldMapping> <dbRecordFieldMapping>
<name>DATE_NEW.value</name> <name>DATE_NEW.value</name>
<recordfield>AB_LOGHISTORY.DATE_NEW</recordfield> <recordfield>AB_LOGHISTORY.DATE_NEW</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping> <dbRecordFieldMapping>
<name>DESCRIPTION.value</name> <name>DESCRIPTION.value</name>
<recordfield>AB_LOGHISTORY.DESCRIPTION</recordfield> <recordfield>AB_LOGHISTORY.DESCRIPTION</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping> <dbRecordFieldMapping>
<name>LOGHISTORYID.value</name> <name>LOGHISTORYID.value</name>
<recordfield>AB_LOGHISTORY.AB_LOGHISTORYID</recordfield> <recordfield>AB_LOGHISTORY.AB_LOGHISTORYID</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping> <dbRecordFieldMapping>
<name>USER_NEW.value</name> <name>USER_NEW.value</name>
<recordfield>AB_LOGHISTORY.USER_NEW</recordfield> <recordfield>AB_LOGHISTORY.USER_NEW</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
</recordFieldMappings> </recordFieldMappings>
</dbRecordContainer> </dbRecordContainer>
</recordContainers> </recordContainers>
</entity> </entity>
neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
+ 40
− 40
View file @ 5db8fc46
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <name>LogHistoryFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" /> <filterable v="true" />
<layout> <layout>
<groupLayout> <groupLayout>
<name>layout</name> <name>layout</name>
</groupLayout> </groupLayout>
</layout> </layout>
<children> <children>
<tableViewTemplate> <tableViewTemplate>
<name>LogHistoryTable</name> <name>LogHistoryTable</name>
<hideActions v="false" /> <hideActions v="false" />
<entityField>#ENTITY</entityField> <entityField>#ENTITY</entityField>
<columns> <columns>
<neonTableColumn> <neonTableColumn>
<name>97886728-fbfe-4d32-b5b4-7dce443e1e2c</name> <name>97886728-fbfe-4d32-b5b4-7dce443e1e2c</name>
<entityField>DATE_NEW</entityField> <entityField>DATE_NEW</entityField>
</neonTableColumn> </neonTableColumn>
<neonTableColumn> <neonTableColumn>
<name>2647a81d-2a50-433a-8dc9-f701a60e10e8</name> <name>2647a81d-2a50-433a-8dc9-f701a60e10e8</name>
<entityField>USER_NEW</entityField> <entityField>USER_NEW</entityField>
</neonTableColumn> </neonTableColumn>
<neonTableColumn> <neonTableColumn>
<name>02a31f8a-2f91-4364-9d2a-898c4b587afa</name> <name>02a31f8a-2f91-4364-9d2a-898c4b587afa</name>
<entityField>DESCRIPTION</entityField> <entityField>DESCRIPTION</entityField>
</neonTableColumn> </neonTableColumn>
</columns> </columns>
</tableViewTemplate> </tableViewTemplate>
<timelineViewTemplate> <timelineViewTemplate>
<name>LogHistoryTimeLine</name> <name>LogHistoryTimeLine</name>
<dateField>DATE_NEW</dateField> <dateField>DATE_NEW</dateField>
<titleField>USER_NEW</titleField> <titleField>USER_NEW</titleField>
<descriptionField>DESCRIPTION</descriptionField> <descriptionField>DESCRIPTION</descriptionField>
<iconIdField>#IMAGE</iconIdField> <iconIdField>#IMAGE</iconIdField>
<entityField>#ENTITY</entityField> <entityField>#ENTITY</entityField>
</timelineViewTemplate> </timelineViewTemplate>
</children> </children>
</neonView> </neonView>
neonView/PersonMain_view/PersonMain_view.aod
+ 1
− 0
View file @ 5db8fc46
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name> <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
<entityField>LogHistoryConsumer</entityField> <entityField>LogHistoryConsumer</entityField>
<view>LogHistoryFilter_view</view> <view>LogHistoryFilter_view</view>
</neonViewReference>
<neonViewReference> <neonViewReference>
<name>cf989bf6-3e49-44fc-ba98-322aae377da3</name> <name>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
<entityField>AttributeTree</entityField> <entityField>AttributeTree</entityField>
......
others/db_changes/data_alias/basic/init/init.xml deleted 100644 → 0
+ 0
− 0
View file @ 38cae3f2
others/db_changes/system_alias/struct/create_asys_audit.xml deleted 100644 → 0
+ 0
− 23
View file @ 38cae3f2
<?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
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 1
− 1
View file @ 5db8fc46
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<value></value> <value></value>
</entry> </entry>
<entry> <entry>
<key>auswrts</key> <key>auswärts</key>
<value></value> <value></value>
</entry> </entry>
<entry> <entry>
......
process/Loghistory_lib/Loghistory_lib.aod
+ 10
− 9
View file @ 5db8fc46
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <name>Loghistory_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Loghistory_lib/process.js</process> <process>%aditoprj%/process/Loghistory_lib/process.js</process>
<variants> <variants>
<element>LIBRARY</element> <element>LIBRARY</element>
</variants> <element>EXECUTABLE</element>
</process> </variants>
</process>
process/process_audit/process_audit.aod
+ 10
− 6
View file @ 5db8fc46
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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> <name>process_audit</name>
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/process_audit/process.js</process> <process>%aditoprj%/process/process_audit/process.js</process>
</process> <variants>
<element>LIBRARY</element>
<element>EXECUTABLE</element>
</variants>
</process>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment