diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_ActivityCategory.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeKeyword_target_group.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
similarity index 69%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
index 99852b24f7249d850ec0f6f8a32fd7503de7a471..d9d8b0d5c9a7af796f4e305693341aeacc76967b 100644
--- a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
+++ b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
@@ -17,15 +17,6 @@
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="1fa94dc3-b875-4e95-9ec1-8cb714f058fb"/>
- <column name="KEYID" value="MEMO"/>
- <column name="TITLE" value="Memo"/>
- <column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="8"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="1"/>
- </insert>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
@@ -33,12 +24,6 @@
<param value="9d2f9605-1a5e-47d3-8920-168f5637e37f"/>
</whereParams>
</delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="1fa94dc3-b875-4e95-9ec1-8cb714f058fb"/>
- </whereParams>
- </delete>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_CommunicationMedium.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactContactrole.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactDepartment.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_ContactPosition.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_OfferProbability.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectPhase.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectState.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_TaskPriority.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/init_TaskProgress.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/insert_offer_status_keyword.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/insert_salesproject_state_keyword.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml b/.liquibase/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
rename to .liquibase/Data_alias/basic/2019.2/AditoBasic/update_Strength_Weakness.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml b/.liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
similarity index 78%
rename from others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
rename to .liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
index 0186627b55d3410360406bd0a6263d5bbccd04d0..272ae0c6a2922b4096ce2e511adc036fcdb3b88c 100644
--- a/others/db_changes/Data_alias/basic/2019.2/AttributeKeyword.xml
+++ b/.liquibase/Data_alias/basic/2019.2/AttributeKeyword.xml
@@ -3,16 +3,16 @@
<changeSet author="s.listl" id="f527a5cc-f1e5-497f-a069-33aee944d421">
<addColumn tableName="AB_ATTRIBUTE">
<column name="KEYWORD_CONTAINER" type="VARCHAR(80)"/>
- </addColumn>
- <addColumn tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_INFO" type="NCLOB"/>
- </addColumn>
- <addColumn tableName="AB_ATTRIBUTE">
<column name="SORTING" type="INTEGER"/>
</addColumn>
<addColumn tableName="AB_ATTRIBUTERELATION">
- <column name="MEMO_VALUE" type="NCLOB"/>
+ <column name="INT_VALUE" type="INTEGER"/>
</addColumn>
+ <dropColumn tableName="AB_ATTRIBUTERELATION">
+ <column name="BOOL_VALUE"/>
+ </dropColumn>
+ <modifyDataType tableName="AB_ATTRIBUTERELATION" columnName="CHAR_VALUE" newDataType="NVARCHAR(512)"/>
<createIndex indexName="IDX_ATTRPARENT" tableName="AB_ATTRIBUTE">
<column name="ATTRIBUTE_PARENT_ID"/>
</createIndex>
diff --git a/others/db_changes/Data_alias/basic/2019.2/ChangeNotes.txt b/.liquibase/Data_alias/basic/2019.2/ChangeNotes.txt
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/ChangeNotes.txt
rename to .liquibase/Data_alias/basic/2019.2/ChangeNotes.txt
diff --git a/others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml b/.liquibase/Data_alias/basic/2019.2/Contact_add_columns.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Contact_add_columns.xml
rename to .liquibase/Data_alias/basic/2019.2/Contact_add_columns.xml
diff --git a/.liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml b/.liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..285d0f993be8fb154019c0127ec548e10051b320
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
@@ -0,0 +1,13 @@
+<?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.goderbauer" id="2f82302d-1fb0-46d2-a290-dbeca32f427f">
+ <addColumn tableName="PERSON">
+ <column name="PICTURE" type="BLOB"/>
+ </addColumn>
+ <addColumn tableName="ORGANISATION">
+ <column name="PICTURE" type="BLOB"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml b/.liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
rename to .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/Offer_terms.xml b/.liquibase/Data_alias/basic/2019.2/Offer_terms.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Offer_terms.xml
rename to .liquibase/Data_alias/basic/2019.2/Offer_terms.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/Product_remove_fk.xml b/.liquibase/Data_alias/basic/2019.2/Product_remove_fk.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Product_remove_fk.xml
rename to .liquibase/Data_alias/basic/2019.2/Product_remove_fk.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/SalesOrder_source_offer.xml b/.liquibase/Data_alias/basic/2019.2/SalesOrder_source_offer.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/SalesOrder_source_offer.xml
rename to .liquibase/Data_alias/basic/2019.2/SalesOrder_source_offer.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/Salesproject_add_column.xml b/.liquibase/Data_alias/basic/2019.2/Salesproject_add_column.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/Salesproject_add_column.xml
rename to .liquibase/Data_alias/basic/2019.2/Salesproject_add_column.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/activity_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/activity_add_parent.xml b/.liquibase/Data_alias/basic/2019.2/activity_add_parent.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/activity_add_parent.xml
rename to .liquibase/Data_alias/basic/2019.2/activity_add_parent.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/activitylink_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml b/.liquibase/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
similarity index 99%
rename from others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
rename to .liquibase/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
index 89d9e3cf4a13e7a2472166adb1f37e6889bd93b1..063480e4508574b391d37f3a116a0ae7924670b9 100644
--- a/others/db_changes/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
+++ b/.liquibase/Data_alias/basic/2019.2/add_ObjectRelation_type.xml
@@ -25,6 +25,7 @@
<addColumn tableName="AB_OBJECTRELATION">
<column name="AB_OBJECTRELATIONTYPE1" type="CHAR(36)"/>
<column name="AB_OBJECTRELATIONTYPE2" type="CHAR(36)"/>
+ <column name="INFO" type="NCLOB"/>
</addColumn>
<dropIndex tableName="AB_OBJECTRELATION" indexName="IDX_AB_OBJECTRELATION_OBJECT1"/>
@@ -106,7 +107,7 @@
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
<column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="promotion target of"/>
+ <column name="RELATION_TITLE" value="solicits"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
<column name="SIDE" valueNumeric="1"/>
<column name="HIERARCHY" valueNumeric="0"/>
@@ -114,7 +115,7 @@
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="e397b595-38ae-4365-908e-75ee388838eb"/>
<column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="solicits"/>
+ <column name="RELATION_TITLE" value="promotion target of"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
<column name="SIDE" valueNumeric="2"/>
<column name="HIERARCHY" valueNumeric="0"/>
diff --git a/others/db_changes/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/address_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml b/.liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml
new file mode 100644
index 0000000000000000000000000000000000000000..42dad5d1fe1233018439f983730dda81cbaf8f26
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/alter_activityLink_Derby.xml
@@ -0,0 +1,11 @@
+<?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 dbms="derby" author="j.hoermann" id="4e0bce38-7470-4289-a656-2f2e34cefd9c">
+ <sql>
+ ALTER TABLE ACTIVITYLINK ADD COLUMN ACTIVITY_ID_NEW CHAR(36);
+ UPDATE ACTIVITYLINK SET ACTIVITY_ID_NEW=ACTIVITY_ID;
+ ALTER TABLE ACTIVITYLINK DROP COLUMN ACTIVITY_ID;
+ RENAME COLUMN ACTIVITYLINK.ACTIVITY_ID_NEW TO ACTIVITY_ID;
+ </sql>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml b/.liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1f3a0b842f009417b8ed199eb918f583bf670807
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/alter_activityLink_notDerby.xml
@@ -0,0 +1,6 @@
+<?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 dbms="!derby" author="j.hoermann" id="634590d7-8bcc-40f9-9615-9de7cd91e586">
+ <modifyDataType tableName="ACTIVITYLINK" columnName="ACTIVITY_ID" newDataType="CHAR(36)"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/attributerelation_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/changelog.xml b/.liquibase/Data_alias/basic/2019.2/changelog.xml
similarity index 93%
rename from others/db_changes/Data_alias/basic/2019.2/changelog.xml
rename to .liquibase/Data_alias/basic/2019.2/changelog.xml
index a8c4a893a888db66a67bee15238815623b5ddec3..5d7b680705af76bb815c9800b9f27b43271d6256 100644
--- a/others/db_changes/Data_alias/basic/2019.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2/changelog.xml
@@ -20,7 +20,7 @@
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1003.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1004.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_gfk.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_jkl.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_activity/ACTIVITY_gfk.xml" context="example"/>
@@ -28,30 +28,30 @@
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1001.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_offer/OFFER_1003.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
-
+
<include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
-
+
<include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
-
+
<include relativeToChangelogFile="true" file="activity_add_parent.xml"/>
<include relativeToChangelogFile="true" file="task_add_parent.xml"/>
<include relativeToChangelogFile="true" file="create_salutation.xml"/>
-
+
<include relativeToChangelogFile="true" file="drop_estimation_salesproject.xml"/>
-
+
<!--References to the Keyword Values-->
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/OfferProbability.xml"/>
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/ActivityCategory.xml"/>
@@ -65,7 +65,7 @@
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/TaskPriority.xml"/>
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml"/>
<include relativeToChangelogFile="true" file="KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml"/>
-
+
<!--References to the reference files-->
<include relativeToChangelogFile="true" file="AditoBasic/init_OfferProbability.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ActivityCategory.xml"/>
@@ -83,27 +83,27 @@
<include relativeToChangelogFile="true" file="Contact_add_columns.xml"/>
<include relativeToChangelogFile="true" file="SalesOrder_source_offer.xml"/>
<include relativeToChangelogFile="true" file="Product_remove_fk.xml"/>
-
+
<include relativeToChangelogFile="true" file="data/example_attribute/Attribute.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_attribute/AttributeUsage.xml" context="example"/>
-
+
<include relativeToChangelogFile="true" file="drop_contact_id_sp_forecast.xml"/>
-
+
<include relativeToChangelogFile="true" file="fix_sp_phases.xml"/>
-
+
<include relativeToChangelogFile="true" file="drop_pricePolitics-weakness-strength.xml"/>
-
+
<include relativeToChangelogFile="true" file="update_pricelist_keyword.xml"/>
-
+
<include relativeToChangelogFile="true" file="create_taskLink.xml"/>
-
+
<include relativeToChangelogFile="true" file="Offer_terms.xml"/>
-
+
<include relativeToChangelogFile="true" file="add_ObjectRelation_type.xml"/>
<include relativeToChangelogFile="true" file="data/AditoBasic/ObjectRelation_exampleData.xml" context="example"/>
-
+
<include relativeToChangelogFile="true" file="Salesproject_add_column.xml"/>
-
+
<include relativeToChangelogFile="true" file="AditoBasic/update_Strength_Weakness.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactDepartment.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_ContactContactrole.xml"/>
@@ -124,11 +124,19 @@
<include relativeToChangelogFile="true" file="offer_add_date_editnew_user_editnew.xml"/>
<include relativeToChangelogFile="true" file="attributerelation_add_date_editnew_user_editnew.xml"/>
<include relativeToChangelogFile="true" file="communication_add_date_editnew_user_editnew.xml"/>
-
+
<include relativeToChangelogFile="true" file="indicesRefactor/ContactManagement.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Keyword.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Activity.xml"/>
<include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
+
+ <include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
+ <include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
+
+ <!-- Derby needs special handling -->
+ <include relativeToChangelogFile="true" file="alter_activityLink_notDerby.xml" />
+ <include relativeToChangelogFile="true" file="alter_activityLink_Derby.xml" />
+</databaseChangeLog>
<include relativeToChangelogFile="true" file="create_documenttemplate.xml"/>
<include relativeToChangelogFile="true" file="create_documenttemplatelink.xml"/>
diff --git a/others/db_changes/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/communication_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/contact_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/create_salutation.xml b/.liquibase/Data_alias/basic/2019.2/create_salutation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/create_salutation.xml
rename to .liquibase/Data_alias/basic/2019.2/create_salutation.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/create_taskLink.xml b/.liquibase/Data_alias/basic/2019.2/create_taskLink.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/create_taskLink.xml
rename to .liquibase/Data_alias/basic/2019.2/create_taskLink.xml
diff --git a/.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml b/.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e9a0ce04943fdc463a68127bbe377aa382e64091
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
@@ -0,0 +1,35 @@
+<?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.hoermann" id="44c06ef1-d9b7-4c5a-a3ee-276ed84caca3">
+ <delete tableName="AB_OBJECTRELATION"/>
+
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+ <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="OBJECT2_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
+ <column name="AB_OBJECTRELATIONTYPE1" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
+ <column name="AB_OBJECTRELATIONTYPE2" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
+ </insert>
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
+ <column name="OBJECT1_ROWID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
+ <column name="OBJECT2_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="AB_OBJECTRELATIONTYPE1" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
+ <column name="AB_OBJECTRELATIONTYPE2" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
+ </insert>
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
+ <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
+ <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
+ <column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
+ </insert>
+ <insert tableName="AB_OBJECTRELATION">
+ <column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
+ <column name="OBJECT1_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
+ <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/ORGANISATION_private.xml b/.liquibase/Data_alias/basic/2019.2/data/ORGANISATION_private.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/ORGANISATION_private.xml
rename to .liquibase/Data_alias/basic/2019.2/data/ORGANISATION_private.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml b/.liquibase/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt b/.liquibase/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
rename to .liquibase/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt b/.liquibase/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
rename to .liquibase/Data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_attribute/Attribute.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/.liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml b/.liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml b/.liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml b/.liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml b/.liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml b/.liquibase/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1005.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1006.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1007.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1008.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1009.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml b/.liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/example_task/base.xml b/.liquibase/Data_alias/basic/2019.2/data/example_task/base.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/data/example_task/base.xml
rename to .liquibase/Data_alias/basic/2019.2/data/example_task/base.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml b/.liquibase/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
rename to .liquibase/Data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/drop_estimation_salesproject.xml b/.liquibase/Data_alias/basic/2019.2/drop_estimation_salesproject.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/drop_estimation_salesproject.xml
rename to .liquibase/Data_alias/basic/2019.2/drop_estimation_salesproject.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml b/.liquibase/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
rename to .liquibase/Data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/fix_sp_phases.xml b/.liquibase/Data_alias/basic/2019.2/fix_sp_phases.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/fix_sp_phases.xml
rename to .liquibase/Data_alias/basic/2019.2/fix_sp_phases.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Activity.xml b/.liquibase/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
rename to .liquibase/Data_alias/basic/2019.2/indicesRefactor/Activity.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml b/.liquibase/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
rename to .liquibase/Data_alias/basic/2019.2/indicesRefactor/ContactManagement.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml b/.liquibase/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
rename to .liquibase/Data_alias/basic/2019.2/indicesRefactor/Keyword.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Task.xml b/.liquibase/Data_alias/basic/2019.2/indicesRefactor/Task.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/indicesRefactor/Task.xml
rename to .liquibase/Data_alias/basic/2019.2/indicesRefactor/Task.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/offer_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/organisation_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/person_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.2/product_add_date_editnew_user_editnew.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/removeTaskCode.xml b/.liquibase/Data_alias/basic/2019.2/removeTaskCode.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/removeTaskCode.xml
rename to .liquibase/Data_alias/basic/2019.2/removeTaskCode.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/task_add_parent.xml b/.liquibase/Data_alias/basic/2019.2/task_add_parent.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/task_add_parent.xml
rename to .liquibase/Data_alias/basic/2019.2/task_add_parent.xml
diff --git a/.liquibase/Data_alias/basic/2019.2/update_Keyword_Essentials.xml b/.liquibase/Data_alias/basic/2019.2/update_Keyword_Essentials.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f9e3cb33a23bef6fd498164e20d1bd0ac1cbc16f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.2/update_Keyword_Essentials.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="a.loreth" id="b1629529-92ab-437d-b864-0fd68fe5ceab">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>KEYID in ('BSICacti-0dir-0inc-b8a3-f43e2c73df65', 'BSICacti-0dir-outg-8337-909b0f93143a', 'BSIC0rel-stat-actv-ae03-b6b04430e90b', '21bc4d20-1a87-4247-8f7c-8d3a09631850', '4dee8727-8299-422e-ae41-6cdf9de2dfd7', '02553fc7-4611-4914-8ff5-0b7c4e7531c9', '09072b59-d12f-469b-acbd-18a28232ff70', 'ec92271b-eac2-4ec2-be24-ab4abde7e939')</where>
+ </update>
+
+
+ <rollback>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="0" />
+ <where>KEYID in ('BSICacti-0dir-0inc-b8a3-f43e2c73df65', 'BSICacti-0dir-outg-8337-909b0f93143a', 'BSIC0rel-stat-actv-ae03-b6b04430e90b', '21bc4d20-1a87-4247-8f7c-8d3a09631850', '4dee8727-8299-422e-ae41-6cdf9de2dfd7', '02553fc7-4611-4914-8ff5-0b7c4e7531c9', '09072b59-d12f-469b-acbd-18a28232ff70', 'ec92271b-eac2-4ec2-be24-ab4abde7e939')</where>
+ </update>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
diff --git a/others/db_changes/Data_alias/basic/2019.2/update_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/update_TaskType_Task.xml
rename to .liquibase/Data_alias/basic/2019.2/update_TaskType_Task.xml
diff --git a/others/db_changes/Data_alias/basic/2019.2/update_pricelist_keyword.xml b/.liquibase/Data_alias/basic/2019.2/update_pricelist_keyword.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/2019.2/update_pricelist_keyword.xml
rename to .liquibase/Data_alias/basic/2019.2/update_pricelist_keyword.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
diff --git a/others/db_changes/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml
rename to .liquibase/Data_alias/basic/init/data/AditoBasic/init_ab_language.xml
diff --git a/others/db_changes/Data_alias/basic/init/init.xml b/.liquibase/Data_alias/basic/init/init.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/init.xml
rename to .liquibase/Data_alias/basic/init/init.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
rename to .liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_activity.xml b/.liquibase/Data_alias/basic/init/struct/create_activity.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_activity.xml
rename to .liquibase/Data_alias/basic/init/struct/create_activity.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_activitylink.xml b/.liquibase/Data_alias/basic/init/struct/create_activitylink.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_activitylink.xml
rename to .liquibase/Data_alias/basic/init/struct/create_activitylink.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_address.xml b/.liquibase/Data_alias/basic/init/struct/create_address.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_address.xml
rename to .liquibase/Data_alias/basic/init/struct/create_address.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_appointmentlink.xml b/.liquibase/Data_alias/basic/init/struct/create_appointmentlink.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_appointmentlink.xml
rename to .liquibase/Data_alias/basic/init/struct/create_appointmentlink.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_communication.xml b/.liquibase/Data_alias/basic/init/struct/create_communication.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_communication.xml
rename to .liquibase/Data_alias/basic/init/struct/create_communication.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_contact.xml b/.liquibase/Data_alias/basic/init/struct/create_contact.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_contact.xml
rename to .liquibase/Data_alias/basic/init/struct/create_contact.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_contract.xml b/.liquibase/Data_alias/basic/init/struct/create_contract.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_contract.xml
rename to .liquibase/Data_alias/basic/init/struct/create_contract.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_offer.xml b/.liquibase/Data_alias/basic/init/struct/create_offer.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_offer.xml
rename to .liquibase/Data_alias/basic/init/struct/create_offer.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_offeritem.xml b/.liquibase/Data_alias/basic/init/struct/create_offeritem.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_offeritem.xml
rename to .liquibase/Data_alias/basic/init/struct/create_offeritem.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_organisation.xml b/.liquibase/Data_alias/basic/init/struct/create_organisation.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_organisation.xml
rename to .liquibase/Data_alias/basic/init/struct/create_organisation.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_person.xml b/.liquibase/Data_alias/basic/init/struct/create_person.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_person.xml
rename to .liquibase/Data_alias/basic/init/struct/create_person.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_prod2prod.xml b/.liquibase/Data_alias/basic/init/struct/create_prod2prod.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_prod2prod.xml
rename to .liquibase/Data_alias/basic/init/struct/create_prod2prod.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_product.xml b/.liquibase/Data_alias/basic/init/struct/create_product.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_product.xml
rename to .liquibase/Data_alias/basic/init/struct/create_product.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_productprice.xml b/.liquibase/Data_alias/basic/init/struct/create_productprice.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_productprice.xml
rename to .liquibase/Data_alias/basic/init/struct/create_productprice.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesorder.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesorder.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesorder.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesorderitem.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorderitem.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesorderitem.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesorderitem.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_classification.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_classification.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_classification.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_classification.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_competition.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_competition.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_competition.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_competition.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_cycle.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_cycle.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_cycle.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_forecast.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_forecast.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_forecast.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_forecast.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_member.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_member.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_member.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_member.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_salesproject_source.xml b/.liquibase/Data_alias/basic/init/struct/create_salesproject_source.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_salesproject_source.xml
rename to .liquibase/Data_alias/basic/init/struct/create_salesproject_source.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_stock.xml b/.liquibase/Data_alias/basic/init/struct/create_stock.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_stock.xml
rename to .liquibase/Data_alias/basic/init/struct/create_stock.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_task.xml b/.liquibase/Data_alias/basic/init/struct/create_task.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_task.xml
rename to .liquibase/Data_alias/basic/init/struct/create_task.xml
diff --git a/others/db_changes/Data_alias/basic/init/struct/create_timetracking.xml b/.liquibase/Data_alias/basic/init/struct/create_timetracking.xml
similarity index 100%
rename from others/db_changes/Data_alias/basic/init/struct/create_timetracking.xml
rename to .liquibase/Data_alias/basic/init/struct/create_timetracking.xml
diff --git a/others/db_changes/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
similarity index 100%
rename from others/db_changes/Data_alias/changelog.xml
rename to .liquibase/Data_alias/changelog.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____configuration.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/_____system_sysdb_version.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/defaultBlob/data_alias.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_aliasconfig.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_system.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml b/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/init.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/init.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_aliasconfig.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_binaries.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarbackend.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_calendarlink.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_dashletconfigurations.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_dashlets.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_notifications.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_sequences.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_system.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_timer.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml b/.liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/struct/create_asys_users.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml b/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
rename to .liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
diff --git a/others/db_changes/_____SYSTEMALIAS/changelog.xml b/.liquibase/_____SYSTEMALIAS/changelog.xml
similarity index 100%
rename from others/db_changes/_____SYSTEMALIAS/changelog.xml
rename to .liquibase/_____SYSTEMALIAS/changelog.xml
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index e7ee8d4dfc721bb847bbbcb4be07a920112a4fee..ef529844696180457273cb651c7aab32c71db2f5 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -160,6 +160,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PICTURE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2004" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -568,6 +582,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PICTURE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2004" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4309,6 +4337,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>INFO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4576,20 +4618,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>BOOL_VALUE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_VALUE</name>
<dbName></dbName>
@@ -4651,7 +4679,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="63" />
+ <size v="512" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -4688,20 +4716,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>MEMO_VALUE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
@@ -4758,6 +4772,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>INT_VALUE</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>
</entityFields>
</entityDb>
<entityDb>
@@ -4809,12 +4837,12 @@
<name>ACTIVITY_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 8521d1ca9a4947042ba9d11e93bc0b43b4745292..cbb5dde38ef619d8824cc4d7b9754cfbe5c06804 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -34,6 +34,7 @@
<node name="Employee" kind="10077" />
<node name="KeywordEntry" kind="10077" />
<node name="KeywordAttribute" kind="10077" />
+ <node name="ObjectRelationType" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/entity/Activity_entity/entityfields/category/displayValueProcess.js b/entity/Activity_entity/entityfields/category/displayValueProcess.js
index 05aefdcf5311c34ab4c294743782a3f70f8ce8c7..5a77b5521266503239321a1a8a471047b9c58cd9 100644
--- a/entity/Activity_entity/entityfields/category/displayValueProcess.js
+++ b/entity/Activity_entity/entityfields/category/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/creator/valueProcess.js b/entity/Activity_entity/entityfields/creator/valueProcess.js
index b8bc2d05397d92e47cf8c606c6ff8d5099f73ecf..a95c59aa0b3b800aa722f4da67d502dd69d18ae9 100644
--- a/entity/Activity_entity/entityfields/creator/valueProcess.js
+++ b/entity/Activity_entity/entityfields/creator/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-import("Employee_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index c30d6b2520c493830ac572123194912dd8ef0d1b..db1ed69d22949c42f33e439c7a6fe0d8b9bcb94b 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -1,7 +1,5 @@
import("system.vars");
import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-var histMedium = vars.get("$field.CATEGORY");
-result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), histMedium) + ")" : ""));
+var category = vars.get("$field.CATEGORY.displayValue");
+result.string(vars.get("$field.SUBJECT") + (category ? " (" + category + ")" : ""));
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 3feac2b6cffd866329fcf92285773851a8023e85..df8385fa8fbe6b6e32f925fcf2bba765e0d03d3d 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -21,6 +21,7 @@
</entityField>
<entityField>
<name>ADDRIDENTIFIER</name>
+ <title>{$ADDRESS_IDENTIFIER}</title>
</entityField>
<entityField>
<name>ADDR_TYPE</name>
@@ -192,6 +193,7 @@
</entityField>
<entityParameter>
<name>DefaultAddressId_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js</valueProcess>
<expose v="true" />
<mandatory v="false" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
@@ -232,7 +234,10 @@
</entityParameter>
<entityParameter>
<name>OrganisationId_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
<expose v="true" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc</documentation>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
@@ -276,12 +281,20 @@
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>IS_STANDARD_ICON</name>
+ <title>Standard</title>
+ <contentType>IMAGE</contentType>
+ <contentTypeProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js</contentTypeProcess>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<linkInformation>
<linkInformation>
diff --git a/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js b/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c5d394a1a55a336b53ea24c4bbe5cc5afa53be7
--- /dev/null
+++ b/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js
@@ -0,0 +1,20 @@
+import("Sql_lib");
+import("system.db");
+import("system.result");
+import("system.vars");
+
+//this organisationId param is optional which means:
+//if it's not given for the "OrganisationAndContactAddresses"-provider we've to find the orgId by the passed CONTACTID
+//the reason behind this is: whenever the consuming entity can provide the organisationid it should provide the id to improve performance
+//(since we[Address_entity] have not to find out the value our own)
+//but if the consuming entity does not have the value we[Address_entity] will do it for the sake of simpler usage
+
+var contactId = vars.get("$param.ContactId_param");
+if (contactId)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select CONTACT.ADDRESS_ID from CONTACT");
+ var organisationId = db.cell(sql);
+ result.string(organisationId);
+}
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard/documentation.adoc b/entity/Address_entity/entityfields/is_standard/documentation.adoc
index fb7d4bac8de251235814acac61084c0f44919064..6a7186b4676561a755c46356e525477ed0c6ea28 100644
--- a/entity/Address_entity/entityfields/is_standard/documentation.adoc
+++ b/entity/Address_entity/entityfields/is_standard/documentation.adoc
@@ -1,3 +1,3 @@
The `IS_STANDARD` field specifies if an ADDRESS is the standard address (see Address_entity documentation)
-
-However that information is not stored directly in the `ADDRESS` database table. Every `CONTACT`-record has an own standard address.
\ No newline at end of file
+However that information is not stored directly in the `ADDRESS` database table. Every `CONTACT`-record has an own standard address.
+This fields works only correct if `DefaultAddressId_param` is passed.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js b/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2c348afa93c82ff8f11312242f9eb36fcd174111
--- /dev/null
+++ b/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+
+var isStandard = vars.getString("$field.IS_STANDARD") == "true";
+var res;
+if (isStandard)
+ res = "IMAGE";
+else
+ res = "TEXT";
+result.string(res);
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js b/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7420487f08a230ce60f272cdd253abf4331667c2
--- /dev/null
+++ b/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+
+var isStandard = vars.getString("$field.IS_STANDARD") == "true";
+var res;
+if (isStandard)
+ res = "VAADIN:MAP_MARKER";
+else
+ res = "";
+result.string(res);
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..74649993db04d3b1a82da68fb7f50ba86b972235
--- /dev/null
+++ b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc
@@ -0,0 +1,2 @@
+This param will be calculated automatically with the given "ContactId_param" if you do not pass it.
+When you've got the ORGANISTAIONID-value already you should pass it for better performance.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4bf0500f2c4d1835300f8dbcb921f28b8917f7c
--- /dev/null
+++ b/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js
@@ -0,0 +1,20 @@
+import("Sql_lib");
+import("system.db");
+import("system.result");
+import("system.vars");
+
+//this organisationId param is optional which means:
+//if it's not given for the "OrganisationAndContactAddresses"-provider we've to find the orgId by the passed CONTACTID
+//the reason behind this is: whenever the consuming entity can provide the organisationid it should provide the id to improve performance
+//(since we[Address_entity] have not to find out the value our own)
+//but if the consuming entity does not have the value we[Address_entity] will do it for the sake of simpler usage
+
+var contactId = vars.get("$param.ContactId_param");
+if (contactId)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select CONTACT.ORGANISATION_ID from CONTACT");
+ var organisationId = db.cell(sql);
+ result.string(organisationId);
+}
\ No newline at end of file
diff --git a/entity/Address_entity/recordcontainers/db/orderClauseProcess.js b/entity/Address_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7cafef1a54066dc53101218e6709f0d4f18b400e
--- /dev/null
+++ b/entity/Address_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.db");
+
+result.object({"ADDRESS.COUNTRY": db.ASCENDING,
+ "ADDRESS.ADDRESS": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 3cad25e214a7ca8c50ce04d9f9a80aae4253e832..65221a6d022823d235aff680ff5f1d6fee485bb2 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -116,6 +116,7 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
<name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
diff --git a/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js b/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..19dc62881edc6aaf5268121f4d793bc895e8e942
--- /dev/null
+++ b/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "ORGANISATION.CUSTOMERCODE": db.ASCENDING,
+ "ORGANISATION.NAME": db.ASCENDING,
+ "PERSON.LASTNAME": db.ASCENDING,
+ "PERSON.FIRSTNAME": db.ASCENDING
+ });
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index e6588fbe363eaad34e82afe75a89f8ed35b9b193..d06a6101b3c5dd8a0a0c2582f4333610b8a91cb5 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -131,10 +131,10 @@
<description>PARAMETER</description>
</entityParameter>
<entityField>
- <name>BOOL_VALUE</name>
+ <name>INT_VALUE</name>
<contentType>BOOLEAN</contentType>
<searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ID_VALUE</name>
@@ -169,10 +169,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>MEMO_VALUE</name>
- <searchable v="false" />
- </entityField>
<entityParameter>
<name>FilteredAttributeIds_param</name>
<expose v="true" />
@@ -278,10 +274,6 @@
<name>NUMBER_VALUE.value</name>
<recordfield>AB_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>BOOL_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.BOOL_VALUE</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ID_VALUE.value</name>
<recordfield>AB_ATTRIBUTERELATION.ID_VALUE</recordfield>
@@ -290,10 +282,6 @@
<name>ATTRIBUTE_PARENT_ID.value</name>
<recordfield>AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MEMO_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.MEMO_VALUE</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>AB_ATTRIBUTERELATION.USER_NEW</recordfield>
@@ -310,6 +298,10 @@
<name>DATE_EDIT.value</name>
<recordfield>AB_ATTRIBUTERELATION.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INT_VALUE.value</name>
+ <recordfield>AB_ATTRIBUTERELATION.INT_VALUE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
index 9347efa6c0caed251cd27fdabf8e94710302e365..132c9bbe345620f8d9fc4550c13dcdb87a493487 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
@@ -3,10 +3,9 @@ import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
- neon.setFieldValue("$field.BOOL_VALUE", null);
+ neon.setFieldValue("$field.INT_VALUE", null);
neon.setFieldValue("$field.CHAR_VALUE", null);
neon.setFieldValue("$field.DATE_VALUE", null);
neon.setFieldValue("$field.ID_VALUE", null);
neon.setFieldValue("$field.NUMBER_VALUE", null);
- neon.setFieldValue("$field.MEMO_VALUE", null);
}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
similarity index 65%
rename from entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js
rename to entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
index c5937313ed5351c005fd2f860e5df0cbd2f6cf5d..91ca68074f8ae51f3149c59954293133708905ea 100644
--- a/entity/AttributeRelation_entity/entityfields/bool_value/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-if(!vars.get("$field.BOOL_VALUE"))
+if(!vars.get("$field.INT_VALUE"))
result.string("0");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
index f1d1025828f4a7c554dd525a6f8ed38fc3551b2f..bea46eecb189b5b83f3704ecf8ea3f019d0581c4 100644
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
@@ -6,9 +6,8 @@ import("Attribute_lib");
"$field.CHAR_VALUE";
"$field.DATE_VALUE";
"$field.NUMBER_VALUE";
-"$field.BOOL_VALUE";
+"$field.INT_VALUE";
"$field.ID_VALUE";
-"$field.MEMO_VALUE";
if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
{
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c56f881e002f57622f6c794a36084061d48df894
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,97 @@
+import("JditoFilter_lib");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.db");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+import("Attribute_lib");
+
+var condition = new SqlCondition();
+
+var getGroups = vars.exists("$param.GetGroups_param") && vars.get("$param.GetGroups_param");
+var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
+if (getGroups)
+{
+ //this is for the selection of the superordinate attribute, this condition
+ //filters out the own id and the children to prevent loops
+ condition.andSqlCondition(SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP)
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$param.AttrParentId_param", "# != ?")
+ .and("AB_ATTRIBUTE.AB_ATTRIBUTEID not in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')")
+ .build());
+}
+else if (objectType) //if there's an objectType, it comes from the AttributeRelation entity
+{
+ var filteredAttributes = [];
+ if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
+ filteredAttributes = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
+
+ var ids = AttributeUtil.getPossibleAttributes(objectType, false, filteredAttributes);
+ condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + ids.join("','") + "')");
+}
+else
+{
+ var type = vars.exists("$param.AttrParentType_param") && vars.get("$param.AttrParentType_param");
+ if (type == $AttributeTypes.COMBO)
+ condition = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", "$param.AttrParentId_param")
+ .build();
+ else if (type)
+ {
+ var parentId = vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param");
+ if (parentId)
+ condition.and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.AttrParentId_param")).join("','") + "')");
+ }
+}
+
+var sql = "select AB_ATTRIBUTEID, AB_ATTRIBUTEID, ATTRIBUTE_ACTIVE, "
+ + "ATTRIBUTE_NAME, ATTRIBUTE_PARENT_ID, ATTRIBUTE_TYPE, "
+ + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "ATTRIBUTE_TYPE")
+ + ", KEYWORD_CONTAINER from AB_ATTRIBUTE";
+
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+ condition.and(" AB_ATTRIBUTEID in ('" + vars.get("$local.idvalues").join("','") + "')");
+else if (vars.exists("$local.filter") && vars.get("$local.filter"))
+{
+ var filter = vars.get("$local.filter");
+ condition.andSqlCondition((JditoFilterUtils.getSqlCondition(filter, "AB_ATTRIBUTE")));
+}
+
+var attributes = db.table(condition.buildSql(sql, "1=1"));
+
+if (!(vars.exists("$local.idvalues") && vars.get("$local.idvalues")))
+ attributes = _sortArrayForTree(attributes);
+
+result.object(attributes);
+
+//sorts the records in a way that a tree can be built
+function _sortArrayForTree (pArray)
+{
+ var rows = {};
+ var allIds = {};
+ var idIndex = 1;
+ var parentIdIndex = 4;
+
+ pArray.forEach(function (row) {allIds[row[idIndex]] = true;});
+
+ var index = 0;
+
+ for (let itemsAdded = true; itemsAdded; itemsAdded = oldIndex != index)
+ {
+ var oldIndex = index;
+ pArray.forEach(function (row)
+ {
+ if (!(row[idIndex] in this) && (row[parentIdIndex] in this || !allIds[row[parentIdIndex]]))
+ this[row[idIndex]] = {
+ data : row,
+ index : index++
+ };
+ }, rows);
+ }
+ var sortedArray = new Array(Object.keys(rows).length);
+ for (let i in rows)
+ sortedArray[rows[i].index] = rows[i].data;
+
+ return sortedArray;
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..046b1dca18f622ac02623b1f82cb419c9d0d5d81
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,35 @@
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+import("Attribute_lib");
+
+var condition = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+ .build("1=2");
+
+db.deleteData("AB_ATTRIBUTE", condition);
+
+var attributeId = vars.get("$field.UID");
+
+var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
+
+condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
+ .build();
+
+//delete all entries in AB_ATTRIBUTEUSAGE belonging to the attribute to avoid unrelated entries
+db.deleteData("AB_ATTRIBUTEUSAGE", condition);
+
+condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
+ .build();
+
+//delete all entries in AB_ATTRIBUTERELATION for the attributes
+db.deleteData("AB_ATTRIBUTERELATION", condition);
+
+condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + childIds.join("','") + "')")
+ .build();
+
+//delete all attribute children
+db.deleteData("AB_ATTRIBUTE", condition);
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onInsert.js b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..87565632d7cf592ac1bfe137d87ca62be849a32c
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,23 @@
+import("system.db");
+import("system.vars");
+
+var columns = [
+ "AB_ATTRIBUTEID",
+ "ATTRIBUTE_ACTIVE",
+ "ATTRIBUTE_LEVEL",
+ "ATTRIBUTE_NAME",
+ "ATTRIBUTE_PARENT_ID",
+ "ATTRIBUTE_TYPE",
+ "KEYWORD_CONTAINER"
+];
+var values = [
+ vars.get("$field.UID"),
+ vars.get("$field.ATTRIBUTE_ACTIVE"),
+ vars.get("$field.ATTRIBUTE_LEVEL"),
+ vars.get("$field.ATTRIBUTE_NAME"),
+ vars.get("$field.ATTRIBUTE_PARENT_ID"),
+ vars.get("$field.ATTRIBUTE_TYPE"),
+ vars.get("$field.KEYWORD_CONTAINER")
+];
+
+db.insertData("AB_ATTRIBUTE", columns, null, values);
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..6740df0d149b19858958fbc5b0c9839a721bd4e1
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,26 @@
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+
+var columns = [
+ "ATTRIBUTE_ACTIVE",
+ "ATTRIBUTE_LEVEL",
+ "ATTRIBUTE_NAME",
+ "ATTRIBUTE_PARENT_ID",
+ "ATTRIBUTE_TYPE",
+ "KEYWORD_CONTAINER"
+];
+var values = [
+ vars.get("$field.ATTRIBUTE_ACTIVE"),
+ vars.get("$field.ATTRIBUTE_LEVEL"),
+ vars.get("$field.ATTRIBUTE_NAME"),
+ vars.get("$field.ATTRIBUTE_PARENT_ID"),
+ vars.get("$field.ATTRIBUTE_TYPE"),
+ vars.get("$field.KEYWORD_CONTAINER")
+];
+
+var condition = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.UID")
+ .build("1=2");
+
+db.updateData("AB_ATTRIBUTE", columns, null, values, conditon);
\ No newline at end of file
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 2b6cdcfe10d221b034e2d15bda7e6205a97974da..ca27c053422a714556ac0c4f589d32852c88ff21 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -29,7 +29,6 @@
<mandatory v="false" />
<displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
<onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
- <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>PERSON_ID</name>
@@ -92,6 +91,7 @@
<entityField>
<name>ADDRESS_ID</name>
<title>standard address</title>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PERSON_TITLE</name>
@@ -227,15 +227,24 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
- <name>d2a29013-e270-4ce1-8f2d-b372206f0aa3</name>
+ <name>31dbd8d8-b10c-4621-ab45-b735216f078f</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
+ <linkInformation>
+ <name>31948bfb-2fe9-4345-a65c-14ad49ffbc0e</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -290,6 +299,10 @@
<name>DATE_EDIT.value</name>
<recordfield>CONTACT.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORGANISATION_ID.displayValue</name>
+ <recordfield>ORGANISATION.NAME</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Contact_entity/entityfields/address_id/valueProcess.js b/entity/Contact_entity/entityfields/address_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1d6810b0429c11c9c2a96791677caa7d557f9e8
--- /dev/null
+++ b/entity/Contact_entity/entityfields/address_id/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("StandardObject_lib");
+
+// Check if the standard address is already set.
+if (vars.get("$field.ADDRESS_ID") === null || vars.get("$field.ADDRESS_ID") === "" || vars.get("$field.ADDRESS_ID") == 0) {
+ var possibleStandardAddressID = new StandardObject("Address", null, "Person", vars.get("$field.CONTACTID"))
+ .onPersonValueChange(vars.get("$field.ORGANISATION_ID"));
+
+ // If a possible standard addrss was found it should get applied to the field.
+ if (possibleStandardAddressID !== null)
+ result.string(possibleStandardAddressID);
+}
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js b/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
deleted file mode 100644
index 0347a3d2d5b43d2b6be7a3464f03c5e61330828d..0000000000000000000000000000000000000000
--- a/entity/Contact_entity/entityfields/organisation_id/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-
-//since the standard address can be only values of org the standard address has to be reset on org change
-vars.set("$field.ADDRESS_ID", "");
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js b/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f1b7f857628de43f0e06daf553421d7758a099ff
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+result.string("CONTACT\n\
+ join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID");
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js b/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..be00ad88d1395634e3a06d856da1652cb7b5ecdb
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "ORGANISATION.NAME": db.ASCENDING
+});
\ No newline at end of file
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 6b92f784aa1b0eefdd87b1fe711183f4a0bbe562..ae0b115f7aeb9e8496d700685ebd2bf01c2271c8 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -10,12 +10,6 @@
<name>#PROVIDER</name>
<recordContainer>jdito</recordContainer>
<dependencies>
- <entityDependency>
- <name>fcccd077-46c9-4d57-9d9f-27915e40dbce</name>
- <entityName>ObjectRelation_entity</entityName>
- <fieldName>Context</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>37559258-24f1-4c8c-b462-23ddf8de4e1e</name>
<entityName>AppointmentLink_entity</entityName>
@@ -41,6 +35,14 @@
<entityProvider>
<name>Context</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
+ <entityName>ObjectRelationType_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>excludeContexts_param</name>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index bba4e47a4e5e6bf77cebf034adf42e7d7ec94fc0..306c111923c03f903008917eb7d17676b05b5069 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -90,6 +90,7 @@
</entityParameter>
<entityField>
<name>UID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>DESCRIPTION</name>
diff --git a/entity/Document_entity/recordcontainers/jdito/contentProcess.js b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
index 6682c389f91318540cc0e444e7f5106bc2db2c66..ccee9b0372c42613f4f3fb78de22b7bfff755ef9 100644
--- a/entity/Document_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.result");
import("system.db");
@@ -16,7 +17,7 @@ if(vars.exists("$param.AssignmentTable_param") &&
if(vars.exists("$param.Keyword_param")) {
keyword = vars.get("$param.Keyword_param");
}
-
+
// Check if multiple Documents are selected
if(vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
metadata = db.getBinaryMetadataForIds(vars.get("$local.idvalues"), true, alias)
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index db73c36b4c1d88cd7163e2be896457168deb3fe4..634f8e557f4ad28238fa8a0c69abf38cea1e34f2 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,56 +1,58 @@
-<?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>EmployeeRole_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>EmployeeRoles</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
- <entityName>Employee_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>ROLE</name>
- <title>Role</title>
- <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ROLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </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>EmployeeRole_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>EmployeeRoles</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>ROLE</name>
+ <title>Role</title>
+ <possibleItemsProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>ROLE.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js b/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
index a9b4b9a616dbb75ca19a78151f6ef27d129d472b..e52145c8011337d56bd0cd3a5e9eea62f3562493 100644
--- a/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
+++ b/entity/EmployeeRole_entity/entityfields/role/possibleItemsProcess.js
@@ -1,10 +1,27 @@
+import("system.translate");
+import("system.vars");
import("system.result");
import("system.tools");
+var selectedRole = vars.get("$field.ROLE");
var roles = [];
var allRoles = tools.getAllRoles([tools.ROLE_INTERNAL, tools.ROLE_PROJECT, tools.ROLE_XMPP]);
+var excludeRoles = {
+ "INTERNAL_GROUPWARE" : true,
+ "INTERNAL_SNMP" : true,
+ "INTERNAL_DESIGNER" : true,
+ "INTERNAL_TECHNICAL" : true
+};
+
+if (tools.existUsers(vars.get("$param.UserTitle_param")))
+{
+ var userRoles = tools.getRoles(vars.get("$param.UserTitle_param"));
+ for (let i in userRoles)
+ excludeRoles[userRoles[i]] = true;
+}
for (let roleId in allRoles)
- roles.push([roleId, allRoles[roleId][0]])
+ if (!excludeRoles[roleId] || roleId == selectedRole)
+ roles.push([roleId, translate.text(allRoles[roleId][0])]);
result.object(roles);
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 6ec492b15bb907b1f524c8cef7f0e28251693f33..748fd22d321b296b99cfb1c9072045c3068be6c6 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,280 +1,272 @@
-<?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>Employee_entity</name>
- <title>Employee</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
- <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
- <iconId>VAADIN:GROUP</iconId>
- <titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <lookupIdfield>CONTACT_ID</lookupIdfield>
- </entityProvider>
- <entityField>
- <name>UID</name>
- <title>Username</title>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/uid/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>TITLE_ORIGINAL</name>
- <description>the original username, this is required to update the correct user when the username is changed</description>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <title>Person</title>
- <consumer>Contacts</consumer>
- <linkedContext>Person</linkedContext>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>FIRSTNAME</name>
- <title>Firstname</title>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/firstname/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>LASTNAME</name>
- <title>Lastname</title>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/lastname/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ISACTIVE</name>
- <title>Active</title>
- <contentType>BOOLEAN</contentType>
- <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>EMAIL_ADDRESS</name>
- <title>Email</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>PASSWORD</name>
- <title>Password</title>
- <contentType>PASSWORD</contentType>
- <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
- </entityField>
- <entityField>
- <name>CONFIRM_PASSWORD</name>
- <title>Confirm password</title>
- <contentType>PASSWORD</contentType>
- <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
- </entityField>
- <entityActionField>
- <name>setPassword</name>
- <fieldType>ACTION</fieldType>
- <title>Set password</title>
- <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PASSWORD</iconId>
- </entityActionField>
- <entityParameter>
- <name>PasswordChange_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>Contacts</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Attributes</name>
- <title>Attributes</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityFieldGroup>
- <name>NAME_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
- <title>Name</title>
- <description>FIELDGROUP</description>
- <fields>
- <element>FIRSTNAME</element>
- <element>LASTNAME</element>
- </fields>
- </entityFieldGroup>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>DEPARTMENT</name>
- <title>Department</title>
- <state>INVISIBLE</state>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityField>
- <name>ROLES</name>
- </entityField>
- <entityConsumer>
- <name>EmployeeRoles</name>
- <title>Roles</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>EmployeeRole_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>AttributeTree</name>
- <title>Attribute Tree</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Documents</name>
- <title>Documents</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>StoredSelections</name>
- <title>Stored selections</title>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>StoredSelection_entity</entityName>
- <fieldName>StoredSelections</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Base64String_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>STORED_SELECTIONS</name>
- <searchable v="false" />
- </entityField>
- <entityProvider>
- <name>Employees</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
- <entityName>Timetracking_entity</entityName>
- <fieldName>Employees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>TITLE_ORIGINAL.value</element>
- <element>ISACTIVE.value</element>
- <element>FIRSTNAME.value</element>
- <element>LASTNAME.value</element>
- <element>EMAIL_ADDRESS.value</element>
- <element>DESCRIPTION.value</element>
- <element>CONTACT_ID.value</element>
- <element>CONTACT_ID.displayValue</element>
- <element>STORED_SELECTIONS.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </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>Employee_entity</name>
+ <title>Employee</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <onValidation>%aditoprj%/entity/Employee_entity/onValidation.js</onValidation>
+ <afterOperatingState>%aditoprj%/entity/Employee_entity/afterOperatingState.js</afterOperatingState>
+ <iconId>VAADIN:GROUP</iconId>
+ <titleProcess>%aditoprj%/entity/Employee_entity/titleProcess.js</titleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <lookupIdfield>CONTACT_ID</lookupIdfield>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/uid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Username</title>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/title/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/title/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <title>Person</title>
+ <consumer>Contacts</consumer>
+ <linkedContext>Person</linkedContext>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/contact_id/stateProcess.js</stateProcess>
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValidation.js</onValidation>
+ <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/contact_id/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>FIRSTNAME</name>
+ <title>Firstname</title>
+ </entityField>
+ <entityField>
+ <name>LASTNAME</name>
+ <title>Lastname</title>
+ <mandatory v="false" />
+ </entityField>
+ <entityField>
+ <name>ISACTIVE</name>
+ <title>Active</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/isactive/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>EMAIL_ADDRESS</name>
+ <title>Email</title>
+ <mandatory v="true" />
+ <possibleItemsProcess>%aditoprj%/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js</possibleItemsProcess>
+ <newItemsAllowed v="true" />
+ <onValidation>%aditoprj%/entity/Employee_entity/entityfields/email_address/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>PASSWORD</name>
+ <title>Password</title>
+ <contentType>PASSWORD</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/password/mandatoryProcess.js</mandatoryProcess>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/password/stateProcess.js</stateProcess>
+ </entityField>
+ <entityField>
+ <name>CONFIRM_PASSWORD</name>
+ <title>Confirm password</title>
+ <contentType>PASSWORD</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js</mandatoryProcess>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/Employee_entity/entityfields/confirm_password/stateProcess.js</stateProcess>
+ </entityField>
+ <entityActionField>
+ <name>setPassword</name>
+ <fieldType>ACTION</fieldType>
+ <title>Set password</title>
+ <onActionProcess>%aditoprj%/entity/Employee_entity/entityfields/setpassword/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PASSWORD</iconId>
+ </entityActionField>
+ <entityParameter>
+ <name>PasswordChange_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Contacts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityFieldGroup>
+ <name>NAME_fieldGroup</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
+ <title>Name</title>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>FIRSTNAME</element>
+ <element>LASTNAME</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/image/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Employee_entity/entityfields/image/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>DEPARTMENT</name>
+ <title>Department</title>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>ROLES</name>
+ </entityField>
+ <entityConsumer>
+ <name>EmployeeRoles</name>
+ <title>Roles</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>EmployeeRole_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employeeroles/children/usertitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <title>Attribute Tree</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <title>Documents</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Employees</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <lookupIdfield>CONTACT_ID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>0ca415b9-a940-424e-bee8-05c007b20659</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>73f93f34-bfe9-48fd-b9ce-7f8ba46014c9</name>
+ <entityName>Timetracking_entity</entityName>
+ <fieldName>Employees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/Employee_entity/entityfields/employees/children/onlyactives_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>TITLE_ORIGINAL</name>
+ <searchable v="false" />
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>TITLE.value</element>
+ <element>TITLE_ORIGINAL.value</element>
+ <element>ISACTIVE.value</element>
+ <element>FIRSTNAME.value</element>
+ <element>LASTNAME.value</element>
+ <element>EMAIL_ADDRESS.value</element>
+ <element>EMAIL_ADDRESS.displayValue</element>
+ <element>DESCRIPTION.value</element>
+ <element>CONTACT_ID.value</element>
+ <element>CONTACT_ID.displayValue</element>
+ <element>STORED_SELECTIONS.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index ef0d5bcac51027b862291e5abd61c0c05773a8df..16c85500b5355a72548030867e3d300661e9d4aa 100644
--- a/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
index ef0d5bcac51027b862291e5abd61c0c05773a8df..16c85500b5355a72548030867e3d300661e9d4aa 100644
--- a/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js b/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
index 66736a3ca98abea439334d4d1364a6e9b74bfb06..fec2cc6ff48f1b706465426d53c69f773af1ed8d 100644
--- a/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
+++ b/entity/Employee_entity/entityfields/confirm_password/mandatoryProcess.js
@@ -1,8 +1,8 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
- result.string(true);
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ result.string(true);
+
diff --git a/entity/Employee_entity/entityfields/confirm_password/stateProcess.js b/entity/Employee_entity/entityfields/confirm_password/stateProcess.js
index 7df5126f5865033048bf20af2c352257ae0376ce..a2440a36b0d0a6befdeff33db5800db1d9d02664 100644
--- a/entity/Employee_entity/entityfields/confirm_password/stateProcess.js
+++ b/entity/Employee_entity/entityfields/confirm_password/stateProcess.js
@@ -1,10 +1,10 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var state = neon.COMPONENTSTATE_INVISIBLE;
-var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
- state = neon.COMPONENTSTATE_AUTO;
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ state = neon.COMPONENTSTATE_AUTO;
+
result.string(state);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/contact_id/onValueChange.js b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b8af980eacaa7cf7553115592be5a360dd3406b
--- /dev/null
+++ b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
@@ -0,0 +1,25 @@
+import("Communication_lib");
+import("Entity_lib");
+import("system.result");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+
+var contactId = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId)
+{
+ var name = db.array(
+ db.ROW,
+ SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", contactId)
+ .buildSql("select FIRSTNAME, LASTNAME, (" + CommUtil.getStandardSubSqlMail() + ") from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
+ );
+
+ neon.setFieldValues({
+ "$field.FIRSTNAME" : name[0] || "",
+ "$field.LASTNAME" : name[1] || "",
+ "$field.EMAIL_ADDRESS" : name[2] || ""
+ });
+}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/contact_id/stateProcess.js b/entity/Employee_entity/entityfields/contact_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..465a0be94edd9d1e3bbd126cb3f0546a546917a2
--- /dev/null
+++ b/entity/Employee_entity/entityfields/contact_id/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Employee_lib")
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && EmployeeUtils.hasRelations(vars.get("$field.CONTACT_ID")))
+ result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
index ef0d5bcac51027b862291e5abd61c0c05773a8df..16c85500b5355a72548030867e3d300661e9d4aa 100644
--- a/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
+++ b/entity/Employee_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/onValidation.js b/entity/Employee_entity/entityfields/email_address/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..35d65102d1e956f09fd9c6298ae86f754c985a83
--- /dev/null
+++ b/entity/Employee_entity/entityfields/email_address/onValidation.js
@@ -0,0 +1,13 @@
+import("Entity_lib");
+import("system.result");
+import("system.vars");
+import("system.tools");
+import("system.translate");
+
+var email = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.EMAIL_ADDRESS"));
+var isTaken = tools.getUserByAttribute(tools.EMAIL, [email]);
+isTaken = isTaken
+ ? isTaken[tools.TITLE] != vars.get("$field.TITLE_ORIGINAL")
+ : false;
+if (email && isTaken)
+ result.string(translate.text("Email must be unique!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js b/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..21bbfcda32c97039f276ebb89db9eecaf6e21db1
--- /dev/null
+++ b/entity/Employee_entity/entityfields/email_address/possibleItemsProcess.js
@@ -0,0 +1,30 @@
+import("Communication_lib");
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var contactId = vars.get("$field.CONTACT_ID");
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && contactId)
+{
+ var sql = SqlCondition.begin()
+ .andPrepare("COMMUNICATION.CONTACT_ID", contactId)
+ .and("COMMUNICATION.MEDIUM_ID in ('" + CommUtil.getMediumIdsByCategory("EMAIL").join("', '") + "')")
+ .buildSql("select ADDR, ADDR from COMMUNICATION");
+
+ var addresses = db.table(sql);
+
+ //include the currently set email address
+ var currentAddress = vars.get("$field.EMAIL_ADDRESS");
+ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && currentAddress
+ && !addresses.some(function (row) {return row[0] == currentAddress;}))
+ {
+ addresses.push([currentAddress, currentAddress]);
+ }
+
+ result.object(addresses);
+}
+else
+ result.object([]);
diff --git a/entity/Employee_entity/entityfields/firstname/valueProcess.js b/entity/Employee_entity/entityfields/firstname/valueProcess.js
deleted file mode 100644
index 310fb8ddc85d7f2e3d3d97a8d934ffa9e86f6ba0..0000000000000000000000000000000000000000
--- a/entity/Employee_entity/entityfields/firstname/valueProcess.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import("system.result");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-
-var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
- && contactId)
-{
- var firstname = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.CONTACTID", contactId)
- .buildSql("select FIRSTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
- );
- result.string(firstname);
-}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/isactive/valueProcess.js b/entity/Employee_entity/entityfields/isactive/valueProcess.js
index 7993af1a5f422c0cbe027b436b00644ceee8d3ed..86ff56f08f7147b273771b10752464d691c1deb0 100644
--- a/entity/Employee_entity/entityfields/isactive/valueProcess.js
+++ b/entity/Employee_entity/entityfields/isactive/valueProcess.js
@@ -2,5 +2,5 @@ import("system.neon");
import("system.vars");
import("system.result");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("true");
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/lastname/valueProcess.js b/entity/Employee_entity/entityfields/lastname/valueProcess.js
deleted file mode 100644
index 5913681662c97cf9041552ec407090d186ece436..0000000000000000000000000000000000000000
--- a/entity/Employee_entity/entityfields/lastname/valueProcess.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import("system.result");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-
-var contactId = vars.get("$field.CONTACT_ID");
-if ((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
- && contactId)
-{
- var lastname = db.cell(SqlCondition.begin()
- .andPrepare("CONTACT.CONTACTID", contactId)
- .buildSql("select LASTNAME from PERSON join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID")
- );
- result.string(lastname);
-}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/password/mandatoryProcess.js b/entity/Employee_entity/entityfields/password/mandatoryProcess.js
index 66736a3ca98abea439334d4d1364a6e9b74bfb06..fec2cc6ff48f1b706465426d53c69f773af1ed8d 100644
--- a/entity/Employee_entity/entityfields/password/mandatoryProcess.js
+++ b/entity/Employee_entity/entityfields/password/mandatoryProcess.js
@@ -1,8 +1,8 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
- result.string(true);
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ result.string(true);
+
diff --git a/entity/Employee_entity/entityfields/password/stateProcess.js b/entity/Employee_entity/entityfields/password/stateProcess.js
index 7df5126f5865033048bf20af2c352257ae0376ce..a2440a36b0d0a6befdeff33db5800db1d9d02664 100644
--- a/entity/Employee_entity/entityfields/password/stateProcess.js
+++ b/entity/Employee_entity/entityfields/password/stateProcess.js
@@ -1,10 +1,10 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var state = neon.COMPONENTSTATE_INVISIBLE;
-var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || changePassword)
- state = neon.COMPONENTSTATE_AUTO;
-
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+var changePassword = vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || changePassword)
+ state = neon.COMPONENTSTATE_AUTO;
+
result.string(state);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js b/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
deleted file mode 100644
index 8d34e510f8d26ac8c60f33215e307cdc3067de51..0000000000000000000000000000000000000000
--- a/entity/Employee_entity/entityfields/storedselections/children/base64string_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.STORED_SELECTIONS"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/uid/onValidation.js b/entity/Employee_entity/entityfields/title/onValidation.js
similarity index 69%
rename from entity/Employee_entity/entityfields/uid/onValidation.js
rename to entity/Employee_entity/entityfields/title/onValidation.js
index e6c2cc26a81f30f31d1916545a062ac1c023498c..b7a2177b025698809ddcc9f2d4adb5ea62cdd6e6 100644
--- a/entity/Employee_entity/entityfields/uid/onValidation.js
+++ b/entity/Employee_entity/entityfields/title/onValidation.js
@@ -5,7 +5,7 @@ import("system.vars");
import("system.tools");
import("Entity_lib");
-var title = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.UID"));
-if (!(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && title == vars.get("$field.TITLE_ORIGINAL"))
+var title = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.TITLE"));
+if (!(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && title == vars.get("$field.TITLE_ORIGINAL"))
&& title != "" && tools.existUsers(title))
result.string(translate.text("Username already exists!"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/title/valueProcess.js b/entity/Employee_entity/entityfields/title/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..058b37c3c1c367ab44f6212d3e684707bb3a398b
--- /dev/null
+++ b/entity/Employee_entity/entityfields/title/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("Employee_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && !vars.get("$field.TITLE"))
+ result.string(EmployeeUtils.generateUserName(vars.get("$field.FIRSTNAME"), vars.get("$field.LASTNAME"), "f.l+"));
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/uid/valueProcess.js b/entity/Employee_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4e2c2abf86f0bd1c75ffb84ca5ef712288a78c3f
--- /dev/null
+++ b/entity/Employee_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ && vars.get("$field.TITLE"))
+ result.string(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index bd4a9109ac97ec98be86b3e4252d94fbf258a7be..f40cbd25c020ec69598596d91c051cac0ab0c538 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -4,6 +4,7 @@ import("system.tools");
import("Util_lib");
import("Contact_lib");
import("JditoFilter_lib");
+import("Employee_lib");
var users;
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -19,12 +20,14 @@ else
users = users.map(function (user)
{
return [
+ user[tools.TITLE],
user[tools.TITLE],
user[tools.TITLE],
user[tools.PARAMS][tools.ISACTIVE],
user[tools.PARAMS][tools.FIRSTNAME],
user[tools.PARAMS][tools.LASTNAME],
user[tools.PARAMS][tools.EMAIL],
+ user[tools.PARAMS][tools.EMAIL],
user[tools.DESCRIPTION],
user[tools.PARAMS][tools.CONTACTID],
ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
@@ -35,7 +38,7 @@ users = users.map(function (user)
var filter = vars.exists("$local.filter") && vars.get("$local.filter");
//TODO: this is a workaround that filters the records manually, it should be possible to filter the users with a tools.* method
-users = JditoFilterUtils.filterRecords(["UID", "", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", "", ], users, filter);
+users = JditoFilterUtils.filterRecords(["UID", "TITLE", "TITLE_ORIGINAL", "ISACTIVE", "FIRSTNAME", "LASTNAME", "EMAIL_ADDRESS", "DESCRIPTION", "CONTACT_ID", ""], users, filter);
ArrayUtils.sort2d(users, 0, true, false); //sort by username
diff --git a/entity/Employee_entity/recordcontainers/jdito/onDelete.js b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
index 084591314517206b0f791a54ad7a39699e6622fe..212b6d23132d934d2e7169624a2607b58d99a2e0 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
@@ -4,5 +4,5 @@ import("system.tools");
import("Employee_lib");
//TODO: the current user should not delete himself, put this condition in grantDelete when available
-if (EmployeeUtils.getCurrentUserName() != vars.get("$field.UID"))
- tools.deleteUser(vars.get("$field.UID"));
\ No newline at end of file
+if (EmployeeUtils.getCurrentUserName() != vars.get("$field.TITLE") && !EmployeeUtils.hasRelations(vars.get("$field.CONTACT_ID")))
+ tools.deleteUser(vars.get("$field.TITLE"));
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onInsert.js b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
index 21f772e8ce2d94252d75f4381f4b7de8b48c0c67..9d7e0fddbe405e9a445b8373a512eec792dc929c 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onInsert.js
@@ -1,6 +1,7 @@
import("system.neon");
import("system.vars");
import("system.tools");
+import("Employee_lib");
var user = {};
var params = []; //this has to be an array
@@ -12,7 +13,7 @@ params[tools.CONTACTID] = vars.get("$field.CONTACT_ID");
params[tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
params[tools.ISACTIVE] = vars.get("$field.ISACTIVE");
-user[tools.TITLE] = vars.get("$field.UID");
+user[tools.TITLE] = vars.get("$field.TITLE");
user[tools.PARAMS] = params;
if (vars.get("$field.PASSWORD") && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 03a003f2633627942005c8c90878f827e3e54ccd..6402be1fa563698440eecb3c0421427a58406644 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -1,5 +1,4 @@
import("system.db");
-import("system.logging");
import("system.vars");
import("system.tools");
import("Person_lib");
@@ -18,10 +17,9 @@ FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
PersUtils.removeImage(personId);
});
-var user = {};
-user[tools.PARAMS] = [];
+var user = tools.getUser(vars.get("$field.TITLE_ORIGINAL"));
-user[tools.TITLE] = vars.get("$field.UID");
+user[tools.TITLE] = vars.get("$field.TITLE");
user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");
user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index a3d25003bc799af6a437321d3ac292084214c741..0acae5fca576607f197ee4b4692071410183e310 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -438,6 +438,7 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <isPageable v="false" />
<conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 7569f2f522cda9dfe237cdd8af2d3594c8a505ea..317e4db13fb31047f0a6817205dedc0e5ec93dd6 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,27 +1,24 @@
<?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>ObjectRelationType_entity</name>
+ <title>Relation type</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:SPLIT</icon>
<titleProcess>%aditoprj%/entity/ObjectRelationType_entity/titleProcess.js</titleProcess>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>e66086ed-667b-4270-9ffb-ccb41e894ac3</name>
- <entityName>ObjectRelation_entity</entityName>
- <fieldName>ObjectRelationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
</entityProvider>
<entityField>
<name>UID</name>
<valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/uid/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>RELATION_TITLE</name>
+ <name>SOURCE_RELATION_TITLE</name>
+ <title>Relation type 1</title>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js</displayValueProcess>
</entityField>
<entityParameter>
<name>SourceObjectType_param</name>
@@ -46,17 +43,112 @@
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OnlyFirstSide_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
+ <entityParameter>
+ <name>OnlyFirstSide_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>RELATION_TYPE</name>
+ </entityField>
+ <entityField>
+ <name>DIRECTION</name>
+ </entityField>
+ <entityField>
+ <name>HIERARCHY</name>
+ <title>Hierarchy</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DEST_OBJECT_TYPE</name>
+ <title>Context 2</title>
+ <consumer>Contexts</consumer>
+ <mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>SOURCE_OBJECT_TYPE</name>
+ <title>Context 1</title>
+ <consumer>Contexts</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>AB_OBJECTRELATIONTYPE1</name>
+ </entityField>
+ <entityField>
+ <name>AB_OBJECTRELATIONTYPE2</name>
+ </entityField>
+ <entityField>
+ <name>SIDE</name>
+ </entityField>
+ <entityField>
+ <name>DEST_OBJECTRELATIONTYPEID</name>
+ </entityField>
+ <entityField>
+ <name>DEST_RELATION_TITLE</name>
+ <title>Relation type 2</title>
+ <mandatoryProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Contexts</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Context</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityActionField>
+ <name>removeUsage</name>
+ <fieldType>ACTION</fieldType>
+ <title>Delete all usage</title>
+ <onActionProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js</onActionProcess>
+ <iconId>NEON:TRASH</iconId>
+ </entityActionField>
+ <entityField>
+ <name>Type2Enabled_proxy</name>
+ <title>Enable relation type 2</title>
+ <contentType>BOOLEAN</contentType>
+ <possibleItemsProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
- <element>RELATION_TITLE.value</element>
+ <element>SOURCE_RELATION_TITLE.value</element>
+ <element>RELATION_TYPE.value</element>
+ <element>DIRECTION.value</element>
+ <element>HIERARCHY.value</element>
+ <element>DEST_OBJECT_TYPE.value</element>
+ <element>SOURCE_OBJECT_TYPE.value</element>
+ <element>AB_OBJECTRELATIONTYPE1.value</element>
+ <element>AB_OBJECTRELATIONTYPE2.value</element>
+ <element>SIDE.value</element>
+ <element>DEST_OBJECTRELATIONTYPEID.value</element>
+ <element>DEST_RELATION_TITLE.value</element>
+ <element>Type2Enabled_proxy.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..40aa4394b28d55270a839e0ead448446f78e8686
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/dest_object_type/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("Context_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(!vars.get("$field.DEST_OBJECT_TYPE")) {
+ result.string("");
+} else if (vars.exists("$field.DEST_OBJECT_TYPE") && vars.get("$field.DEST_OBJECT_TYPE")) {
+ result.string(ContextUtils.getContext(vars.get("$field.DEST_OBJECT_TYPE"))[2]);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_object_type/mandatoryProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_object_type/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5f8ceb31ad2d7152f52576f7f0e520061d1ebc04
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/dest_object_type/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.Type2Enabled_proxy") == "1")
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d9cbdc51a738f2419cb48403287fd4e881029824
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+logging.log("hui " + vars.get("$field.Type2Enabled_proxy"))
+
+if (vars.getString("$field.Type2Enabled_proxy") == "0")
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6aecb834c55c3c2d2bd7ec41df700ab39b7ae933
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/dest_relation_title/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+
+result.string(translate.text(vars.get("$field.DEST_RELATION_TITLE")));
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_relation_title/mandatoryProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_relation_title/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0151ae8326830dccf8b5aebcb65d476182b113c7
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/dest_relation_title/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.Type2Enabled_proxy") == "1");
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_relation_title/stateProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_relation_title/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..74da791552b4d4a7ea1b5064319c589d9f3bea38
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/dest_relation_title/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.getString("$field.Type2Enabled_proxy") == "0")
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js b/entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b88d5392d1a40aa827f90e9dfcdd26303c4b1baa
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/hierarchy/possibleItemsProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+ ["1", translate.text("Yes")]
+ ,["0", translate.text("No")]
+]);
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b3028ee4f3a3271d9a6603e8d52faf656a4fa484
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/hierarchy/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string("0")
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/description/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js
similarity index 56%
rename from entity/ObjectTree_entity/entityfields/description/valueProcess.js
rename to entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js
index 552c76f9742ef18911436c6a7cee0f9e98d4eea0..755662df1632264e94e6a4d766bb65ead50a553d 100644
--- a/entity/ObjectTree_entity/entityfields/description/valueProcess.js
+++ b/entity/ObjectRelationType_entity/entityfields/objectrelationtypes/children/onlyfirstside_param/valueProcess.js
@@ -1 +1,3 @@
import("system.result");
+
+result.string("0")
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js
similarity index 52%
rename from entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/valueProcess.js
rename to entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js
index 4a2d2e1c96782b8407f30181246efb90a9efd35a..985b9f8612b5b61cb0d132b3fa7aec6412d4439a 100644
--- a/entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/valueProcess.js
+++ b/entity/ObjectRelationType_entity/entityfields/onlyfirstside_param/valueProcess.js
@@ -1,3 +1,2 @@
import("system.result");
-
-result.string("tree");
\ No newline at end of file
+result.string("1");
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js b/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7de1f5f6cb2dc53d15d82fdf758c2dd93880f2a6
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/removeusage/onActionProcess.js
@@ -0,0 +1,14 @@
+import("system.translate");
+import("system.question");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+if (vars.get("$field.UID") && vars.get("$field.DEST_OBJECTRELATIONTYPEID"))
+{
+ db.deleteData("AB_OBJECTRELATION", SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", "$field.UID")
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", "$field.DEST_OBJECTRELATIONTYPEID").build("1=2"));
+ question.showMessage(translate.withArguments("Deleted all usages of \"%0\".", [translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))]), question.INFORMATION, translate.text("Successful"))
+}
+
diff --git a/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js b/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..762ebccbcb1e905fa528f7557056c0be29e32682
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/source_object_type/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("Context_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.SOURCE_OBJECT_TYPE")) {
+ result.string("");
+} else if (vars.exists("$field.SOURCE_OBJECT_TYPE") && vars.get("$field.SOURCE_OBJECT_TYPE")) {
+ result.string(ContextUtils.getContext(vars.get("$field.SOURCE_OBJECT_TYPE"))[2]);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js b/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..abba412e0e44eccb7125811e68858e85db985847
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/source_relation_title/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+
+result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")));
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/possibleItemsProcess.js b/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b88d5392d1a40aa827f90e9dfcdd26303c4b1baa
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/possibleItemsProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+ ["1", translate.text("Yes")]
+ ,["0", translate.text("No")]
+]);
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/valueProcess.js b/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee7b68c6f9c712c45af6a147dc23c15d9bc7b1ec
--- /dev/null
+++ b/entity/ObjectRelationType_entity/entityfields/type2enabled_proxy/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if (!vars.get("$field.Type2Enabled_proxy"))
+ result.string(vars.get("$field.DIRECTION") == "same" ? 0 : 1);
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
index 23e43cb44c7bc9f62000e8d7c77f7f8b24cc0a22..e3b5147b2a0d188cc8121b65f5748eb67200edf7 100644
--- a/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/contentProcess.js
@@ -1,6 +1,12 @@
-import("system.logging");
import("system.result");
import("system.vars");
import("ObjectRelation_lib");
-result.object(ObjectRelationUtils.getPossibleRelationTypes(vars.get("$param.SourceObjectType_param")));
\ No newline at end of file
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
+{
+ result.object([ObjectRelationUtils.getRelationType(vars.get("$local.idvalues")[0], true)]);
+}
+else
+{
+ result.object(ObjectRelationUtils.getPossibleRelationTypes(vars.get("$param.SourceObjectType_param"), true, vars.get("$param.OnlyFirstSide_param") == "1", undefined, true));
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..0c99d246e9ad41792904cece09329cdc6157d746
--- /dev/null
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,23 @@
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("system.translate");
+import("system.question");
+import("Sql_lib");
+
+var usageCount = db.cell(SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", "$field.UID")
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", "$field.DEST_OBJECTRELATIONTYPEID")
+ .buildSql("select count(*) from AB_OBJECTRELATION", "1=2"))
+
+if (usageCount <= 0)
+{
+ db.deleteData("AB_OBJECTRELATIONTYPE", SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATIONTYPE.RELATION_TYPE", "$field.RELATION_TYPE")
+ .build("1=2"));
+}
+else
+{
+ // TODO: Show message hier nicht möglich: mit Grant-Prozess ausführung komplett verhindern, wenn es diese gibt.
+ //question.showMessage(translate.withArguments("There are still %0 relations using the type %1.", [usageCount, translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))]), question.WARNING, translate.text("Cannot remove relation type"))
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c7155c513a43eef2afadf630ee6b6ef12bad3c9
--- /dev/null
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,44 @@
+import("system.util");
+import("ObjectRelation_lib");
+import("system.vars");
+import("system.db");
+import("system.util");
+
+var newRelationType = util.getNewUUID();
+
+db.insertData("AB_OBJECTRELATIONTYPE", [
+ "AB_OBJECTRELATIONTYPEID",
+ "OBJECT_TYPE",
+ "RELATION_TITLE",
+ "RELATION_TYPE",
+ "SIDE",
+ "HIERARCHY"
+], null, [
+ util.getNewUUID(),
+ vars.get("$field.SOURCE_OBJECT_TYPE"),
+ vars.get("$field.SOURCE_RELATION_TITLE"),
+ newRelationType,
+ 1,
+ vars.get("$field.HIERARCHY")
+]);
+
+if (vars.getString("$field.Type2Enabled_proxy") == "1"
+ && (vars.get("$field.SOURCE_RELATION_TITLE") != vars.get("$field.DEST_RELATION_TITLE")
+ && vars.get("$field.SOURCE_OBJECT_TYPE") != vars.get("$field.DEST_OBJECT_TYPE")))
+{
+ db.insertData("AB_OBJECTRELATIONTYPE", [
+ "AB_OBJECTRELATIONTYPEID",
+ "OBJECT_TYPE",
+ "RELATION_TITLE",
+ "RELATION_TYPE",
+ "SIDE",
+ "HIERARCHY"
+ ], null, [
+ util.getNewUUID(),
+ vars.get("$field.DEST_OBJECT_TYPE"),
+ vars.get("$field.DEST_RELATION_TITLE"),
+ newRelationType,
+ 2,
+ vars.get("$field.HIERARCHY")
+ ]);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..218578069a6d0ba35654cdeb3c0e264bcdd3721d
--- /dev/null
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,99 @@
+import("Entity_lib");
+import("system.logging");
+import("system.util");
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+
+logging.log("---------------------------")
+var usageCount = db.cell(SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", "$field.UID")
+ .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", "$field.DEST_OBJECTRELATIONTYPEID")
+ .buildSql("select count(*) from AB_OBJECTRELATION", "1=2"))
+
+if (usageCount <= 0)
+{
+ var type1Fields = {};
+ var type2Fields = {};
+
+ vars.get("local.changed").forEach(function(pChange)
+ {
+ var fieldName = pChange.split(".")[0];
+
+ switch (pChange.split("_")[0])
+ {
+ case "SOURCE":
+ type1Fields[fieldName.replace("SOURCE_", "")] = vars.get("$field." + fieldName);
+ break;
+ case "DEST":
+ type2Fields[fieldName.replace("DEST_", "")] = vars.get("$field." + fieldName);
+ break;
+ case "Type2Enabled":
+ break;
+ default:
+ type1Fields[fieldName] = vars.get("$field." + fieldName);
+ type2Fields[fieldName] = vars.get("$field." + fieldName);
+ }
+ });
+
+ var updates = [];
+ var type1Cond = SqlCondition.begin().andPrepare("AB_OBJECTRELATIONTYPE.RELATION_TYPE", vars.get("$field.RELATION_TYPE"))
+ .andPrepare("AB_OBJECTRELATIONTYPE.SIDE", "1").build("1=2");
+ var type2Cond = SqlCondition.begin().andPrepare("AB_OBJECTRELATIONTYPE.RELATION_TYPE", vars.get("$field.RELATION_TYPE"))
+ .andPrepare("AB_OBJECTRELATIONTYPE.SIDE", "2").build("1=2");
+
+ for (let field in type1Fields) {
+ updates.push(["AB_OBJECTRELATIONTYPE", [field], null, [type1Fields[field]], type1Cond]);
+ }
+
+ var type2Enabled = vars.getString("$field.Type2Enabled_proxy");
+
+ logging.log("en " + type2Enabled)
+ // delete, if type2 is empty -> convert it to a "same"-type
+ if (type2Enabled == "0" || ((vars.get("$field.SOURCE_RELATION_TITLE") == vars.get("$field.DEST_RELATION_TITLE") && vars.get("$field.SOURCE_OBJECT_TYPE") == vars.get("$field.DEST_OBJECT_TYPE"))
+ || !vars.get("$field.DEST_OBJECT_TYPE") && !vars.get("$field.DEST_RELATION_TITLE")))
+ {
+ logging.log(vars.get("$field.DEST_OBJECTRELATIONTYPEID"))
+ db.deleteData("AB_OBJECTRELATIONTYPE", type2Cond);
+ }
+ else
+ { // update if already existing
+ if (vars.get("$field.DIRECTION") != "same")
+ {
+ for (let field in type2Fields) {
+ updates.push(["AB_OBJECTRELATIONTYPE", [field], null, [type2Fields[field]], type2Cond]);
+ }
+ }
+ else
+ { // insert if it was "same" before
+ if ((vars.get("$field.SOURCE_RELATION_TITLE") != vars.get("$field.DEST_RELATION_TITLE") || vars.get("$field.SOURCE_OBJECT_TYPE") != vars.get("$field.DEST_OBJECT_TYPE"))
+ && vars.get("$field.DEST_OBJECT_TYPE") && vars.get("$field.DEST_RELATION_TITLE"))
+ {
+ db.insertData("AB_OBJECTRELATIONTYPE", [
+ "AB_OBJECTRELATIONTYPEID",
+ "OBJECT_TYPE",
+ "RELATION_TITLE",
+ "RELATION_TYPE",
+ "SIDE",
+ "HIERARCHY"
+ ], null, [
+ util.getNewUUID(),
+ vars.get("$field.DEST_OBJECT_TYPE"),
+ vars.get("$field.DEST_RELATION_TITLE"),
+ vars.get("$field.RELATION_TYPE"),
+ 2,
+ vars.get("$field.HIERARCHY")
+ ]);
+
+ }
+ }
+ }
+
+ db.updates(updates);
+}
+else
+{
+ // TODO: Show message hier nicht möglich: mit Grant-Prozess ausführung komplett verhindern, wenn es diese gibt.
+ //question.showMessage(translate.withArguments("There are still %0 relations using the type %1.", [usageCount, translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE"))]), question.WARNING, translate.text("Cannot remove relation type"))
+}
+
diff --git a/entity/ObjectRelationType_entity/titleProcess.js b/entity/ObjectRelationType_entity/titleProcess.js
index 71a9111fb455f300d19637ad0dac20645516bac6..dbc0c500302fcbb7dfe706e35445f9f01952daa5 100644
--- a/entity/ObjectRelationType_entity/titleProcess.js
+++ b/entity/ObjectRelationType_entity/titleProcess.js
@@ -2,4 +2,11 @@ import("system.translate");
import("system.vars");
import("system.result");
-result.string(translate.text(vars.get("$field.RELATION_TITLE")))
\ No newline at end of file
+if (vars.exists("$param.OnlyFirstSide_param") && vars.get("$param.OnlyFirstSide_param") == "1" && vars.get("$field.DIRECTION") != "same")
+{
+ result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")) + " -> " + translate.text(vars.get("$field.DEST_RELATION_TITLE")));
+}
+else
+{
+ result.string(translate.text(vars.get("$field.SOURCE_RELATION_TITLE")));
+}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
deleted file mode 100644
index f495721eb13f304f78bf5276952927f10ce304f4..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ /dev/null
@@ -1,219 +0,0 @@
-<?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>ObjectRelation_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/ObjectRelation_entity/documentation.adoc</documentation>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>6789c40b-d70b-4133-af1d-40cbf548d460</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>ObjectRelations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>AB_OBJECTRELATIONTYPE1</name>
- <title>Type 1</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>OBJECT1_ROWID</name>
- <title>Object 1</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>AB_OBJECTRELATIONID</name>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/ab_objectrelationid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT2_ROWID</name>
- <title>Object 2</title>
- <mandatory v="true" />
- <titleProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js</titleProcess>
- </entityField>
- <entityField>
- <name>AB_OBJECTRELATIONTYPE2</name>
- <title>Type 2</title>
- <mandatory v="true" />
- </entityField>
- <entityConsumer>
- <name>Contexts</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Objects</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>ObjectRelations</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <targetContextField>objectTypeProxy</targetContextField>
- <targetIdField>rowIdProxy</targetIdField>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>30a7c954-3127-4ceb-9838-a0b7b55d0c8c</name>
- <entityName>Person_entity</entityName>
- <fieldName>ObjectRelations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>ObjectRelationTypes</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectRelationType_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>SourceObjectType_param</name>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>selectedObjectRelationTypeIdProxy</name>
- <title>Relationtype</title>
- <possibleItemsProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>relationTypeProxy</name>
- <title>Relationtype</title>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/relationtypeproxy/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>rowIdProxy</name>
- <title>Object</title>
- <consumer>Objects</consumer>
- <linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/rowidproxy/linkedContextProcess.js</linkedContextProcess>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/rowidproxy/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/rowidproxy/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/ObjectRelation_entity/entityfields/rowidproxy/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>objectTypeProxy</name>
- <title>Object type</title>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/objecttypeproxy/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>mySide</name>
- <description>Is always the side the current Object (from the parameters) is in the currently selected ObjectRelationType</description>
- </entityField>
- <entityField>
- <name>OBJECT1_TYPE</name>
- </entityField>
- <entityField>
- <name>OBJECT2_TYPE</name>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <description><null value></description>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/ObjectRelation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>e64669fe-3252-42b9-9b9b-56a2166d81b7</name>
- <tableName>AB_OBJECTRELATION</tableName>
- <primaryKey>AB_OBJECTRELATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>2ff74f14-9e9c-458d-9100-1c2c9fb34b89</name>
- <tableName>AB_OBJECTRELATIONTYPE</tableName>
- <primaryKey>AB_OBJECTRELATIONTYPEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>AB_OBJECTRELATIONID.value</name>
- <recordfield>AB_OBJECTRELATION.AB_OBJECTRELATIONID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT1_ROWID.value</name>
- <recordfield>AB_OBJECTRELATION.OBJECT1_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT2_ROWID.value</name>
- <recordfield>AB_OBJECTRELATION.OBJECT2_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_OBJECTRELATIONTYPE1.value</name>
- <recordfield>AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_OBJECTRELATIONTYPE2.value</name>
- <recordfield>AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT2_TYPE.value</name>
- <expression>%aditoprj%/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object2_type.value/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT1_TYPE.value</name>
- <expression>%aditoprj%/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object1_type.value/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/ObjectRelation_entity/documentation.adoc b/entity/ObjectRelation_entity/documentation.adoc
deleted file mode 100644
index 687b98cb73cd11d9e6d6cbaf44457be3377ea0af..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/documentation.adoc
+++ /dev/null
@@ -1,51 +0,0 @@
-Object Relation
-===============
-:toc2: left
-:numbered:
-
-(how it works currently 13.03.2019)
-
-== How the ObjectRelation_entity works ==
-The entity works with the AB_OBJECTRELATION and AB_OBJECTRELATIONTYPE db-tables.
-
-The AB_OBJECTRELATIONTYPE defines which relations are possible.
-It always defines one "side" of the relation. So for each relation you always need two of them and both have to be from the same RELATION_TYPE.
-
-So for example if you would like to have a relation between a child and parent you need these two types:
-
-----
-AB_OBJECTRELATIONTYPEID = UID_1
-OBJECT_TYPE = Person
-RELATION_TITLE = child of
-RELATION_TYPE = TypeUID_1
-SIDE = 1
-
-and
-
-AB_OBJECTRELATIONTYPEID = UID_2
-OBJECT_TYPE = Person
-RELATION_TITLE = parent of
-RELATION_TYPE = TypeUID_1
-SIDE = 2
-----
-
-Note that the RELATION_TYPE is the same.
-
-
-If you create a new relation between two persons it looks like this:
-
-----
-AB_OBJECTRELATIONID = RelUID_1
-OBJECT1_ROWID = UID_Lisa_Sommer
-OBJECT2_ROWID = UID_Franz_Mueller
-AB_OBJECTRELATIONTYPE1 = UID_1
-AB_OBJECTRELATIONTYPE2 = UID_2
-----
-
--> So:
-
-* Most relationtypes consist of two separate types connected by the RELATION_TYPE-id
-* Each type also has a SIDE, which defines, if it is for side 1 or side 2
-* If both sides are from the same type, then there is only one OBJECTRELATIONTYPE with the side 1 and Objects use the same one.
-
-The provider use the targetContext-feature to show the preview of the linked objects directly. (see targetContext-docu in the ohers/guide folder)
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/ab_objectrelationid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/ab_objectrelationid/valueProcess.js
deleted file mode 100644
index f6b9da922bcaccb0006690f599c1d3cee4d00c55..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/ab_objectrelationid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.util");
-import("system.vars");
-import("system.result");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/date_edit/valueProcess.js b/entity/ObjectRelation_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 710ac8a06a9911f82ff222c7d9d231846ca93fb2..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/date_new/valueProcess.js b/entity/ObjectRelation_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/valueProcess.js
deleted file mode 100644
index 48379a6374dacddb9ccbcaa323c9a24e96e105c1..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("ObjectRelationType");
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object2/children/objecttype_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/object2/children/objecttype_param/valueProcess.js
deleted file mode 100644
index e4c1084f9a07683a0ceaab1f42521b8a2819c3dc..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/object2/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.OBJECT2_TYPE"))
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js b/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js
deleted file mode 100644
index dc39a528c34c8e610d4f6f53ea6f83b98699f497..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("Context_lib");
-result.string(vars.exists("$param.Object2RowidTitle_param") ? vars.get("$param.Object2RowidTitle_param") : "Object 2");
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js
deleted file mode 100644
index 1a0c474771a9e04dbe87f9ea547c2bd843ff4a25..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$param.ObjectType_param"))
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objects/children/objecttype_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/objects/children/objecttype_param/valueProcess.js
deleted file mode 100644
index b1f7548ec5943881ae5b9fe74dc423635555f85b..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/objects/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.objectTypeProxy"))
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objects2/children/objecttype_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/objects2/children/objecttype_param/valueProcess.js
deleted file mode 100644
index e4c1084f9a07683a0ceaab1f42521b8a2819c3dc..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/objects2/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.OBJECT2_TYPE"))
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objecttree/children/providertype_param/code.js b/entity/ObjectRelation_entity/entityfields/objecttree/children/providertype_param/code.js
deleted file mode 100644
index 4a2d2e1c96782b8407f30181246efb90a9efd35a..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/objecttree/children/providertype_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("tree");
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objecttypeproxy/valueProcess.js b/entity/ObjectRelation_entity/entityfields/objecttypeproxy/valueProcess.js
deleted file mode 100644
index 463b2525125de2404ec16b3a17273df8d9851d6f..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/objecttypeproxy/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-result.string(db.cell(SqlCondition.begin()
- .andPrepareVars("AB_OBJECTRELATIONTYPE.AB_OBJECTRELATIONTYPEID", "$field.selectedObjectRelationTypeIdProxy")
- .buildSql("select OBJECT_TYPE from AB_OBJECTRELATIONTYPE", "1=2")));
diff --git a/entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js b/entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js
deleted file mode 100644
index 981503eee34d83611c7bf484a2fab5e86840bf03..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/providertype_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("none");
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/relationtypeproxy/valueProcess.js b/entity/ObjectRelation_entity/entityfields/relationtypeproxy/valueProcess.js
deleted file mode 100644
index 76668648c060b4a8d158cd2b655f142291ef25af..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/relationtypeproxy/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-result.string(db.cell(SqlCondition.begin()
- .andPrepareVars("AB_OBJECTRELATIONTYPE.AB_OBJECTRELATIONTYPEID", "$field.selectedObjectRelationTypeIdProxy")
- .buildSql("select RELATION_TYPE from AB_OBJECTRELATIONTYPE", "1=2")));
diff --git a/entity/ObjectRelation_entity/entityfields/rowidproxy/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/rowidproxy/displayValueProcess.js
deleted file mode 100644
index a93e4e38004f09f00e4a04b102371cf4e9877f46..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/rowidproxy/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Context_lib");
-
-result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.objectTypeProxy"), vars.get("$field.rowIdProxy"))));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/rowidproxy/linkedContextProcess.js b/entity/ObjectRelation_entity/entityfields/rowidproxy/linkedContextProcess.js
deleted file mode 100644
index dbb069dff2b35c0d0d2ba499188d33a865aef84a..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/rowidproxy/linkedContextProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.objectTypeProxy"))
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/rowidproxy/onValueChange.js b/entity/ObjectRelation_entity/entityfields/rowidproxy/onValueChange.js
deleted file mode 100644
index 33a17fadf00db3fb20aab978c0db6bdfc129d7dd..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/rowidproxy/onValueChange.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("Entity_lib");
-
-var selectedRowId = vars.exists("$field.rowIdProxy") ? vars.get("$field.rowIdProxy") : "";
-selectedRowId = ProcessHandlingUtils.getOnValidationValue(selectedRowId);
-
-var mySide = vars.get("$field.mySide");
-
-if (mySide && selectedRowId)
-{
- if (mySide == "1")
- {
- neon.setFieldValue("$field.OBJECT1_ROWID", vars.get("$param.ObjectRowid_param"));
- neon.setFieldValue("$field.OBJECT2_ROWID", selectedRowId);
- }
- else
- {
- neon.setFieldValue("$field.OBJECT1_ROWID", selectedRowId);
- neon.setFieldValue("$field.OBJECT2_ROWID", vars.get("$param.ObjectRowid_param"));
- }
-}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/rowidproxy/valueProcess.js b/entity/ObjectRelation_entity/entityfields/rowidproxy/valueProcess.js
deleted file mode 100644
index 709876feae8ab16d398f6fcaaa468f1ff101b9d6..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/rowidproxy/valueProcess.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
- var type1 = vars.get("$field.OBJECT1_TYPE");
- var type2 = vars.get("$field.OBJECT2_TYPE");
- var rowid1 = vars.get("$field.OBJECT1_ROWID");
- var rowid2 = vars.get("$field.OBJECT2_ROWID");
-
- var currentType = vars.get("$param.ObjectType_param");
- var currentRowid = vars.get("$param.ObjectRowid_param");
-
- if (type1 == currentType && rowid1 == currentRowid)
- {
- result.string(rowid2)
- }
- else if (type2 == currentType && rowid2 == currentRowid)
- {
- result.string(rowid1)
- }
-}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js b/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js
deleted file mode 100644
index 6a50b40e6edb73828ddc114540c1f58f8b85627c..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.result");
-import("system.vars");
-
-result.object(db.table(
-["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE \n\
- from AB_OBJECTRELATIONTYPE main \n\
- left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
- where case when type2.OBJECT_TYPE is null then ( ? = main.OBJECT_TYPE) else ( ? = type2.OBJECT_TYPE) end"
-, [
- [vars.get("$param.ObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- [vars.get("$param.ObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
-]]).map(function(pItem)
-{
- return [pItem[0], translate.text(pItem[1])];
-}));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/valueProcess.js b/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/valueProcess.js
deleted file mode 100644
index 2e1e59bf7a9e242aaa2aeaaff8aca3255b2b12fc..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/valueProcess.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
- var type1 = vars.get("$field.OBJECT1_TYPE");
- var type2 = vars.get("$field.OBJECT2_TYPE");
- var rowid1 = vars.get("$field.OBJECT1_ROWID");
- var rowid2 = vars.get("$field.OBJECT2_ROWID");
-
- var currentType = vars.get("$param.ObjectType_param");
- var currentRowid = vars.get("$param.ObjectRowid_param");
-
- if (type1 == currentType && rowid1 == currentRowid)
- {
- result.string(vars.get("$field.AB_OBJECTRELATIONTYPE2"))
- }
- else if (type2 == currentType && rowid2 == currentRowid)
- {
- result.string(vars.get("$field.AB_OBJECTRELATIONTYPE1"))
- }
-}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/targetobjectrowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/targetobjectrowid/displayValueProcess.js
deleted file mode 100644
index f262c44d341bd7722a749aaaf5551dfac9ec5ced..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/targetobjectrowid/displayValueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Context_lib");
-
-var providerType = vars.getString("$param.ProviderType_param");
-
-// any object
-if (providerType == "any")
-{
- result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.AnyObjectType"), vars.get("$field.AnyObjectRowid"))));
-}
diff --git a/entity/ObjectRelation_entity/entityfields/targetobjectrowid/documentation.adoc b/entity/ObjectRelation_entity/entityfields/targetobjectrowid/documentation.adoc
deleted file mode 100644
index 336799b4617739da6a7435355cd9e7bde4e3650f..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/targetobjectrowid/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-This field is only filled when using the AnyObject Provider.
-
-Calculates the opposite side of the given AnyObject parameters.
diff --git a/entity/ObjectRelation_entity/entityfields/targetobjecttype/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/targetobjecttype/displayValueProcess.js
deleted file mode 100644
index 24c141470a2c2abc3d1f6f0f81af2ddbdbf9fbc0..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/targetobjecttype/displayValueProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.project");
-import("system.result");
-import("system.vars");
-
-var providerType = vars.getString("$param.ProviderType_param");
-
-// any object
-if (providerType == "any")
-{
- result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.AnyObjectType"))[1]);
-}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/targetobjecttype/documentation.adoc b/entity/ObjectRelation_entity/entityfields/targetobjecttype/documentation.adoc
deleted file mode 100644
index fba180b53ae87bb36854010f09dbb75125fd3159..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/targetobjecttype/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-This field is only filled when using the AnyObject Provider.
-
-Calculates the opposite side of the given AnyObject parameters.
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/user_edit/valueProcess.js b/entity/ObjectRelation_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 1581e18d9763043ae602b98658f87cb0a3b0c967..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/user_new/valueProcess.js b/entity/ObjectRelation_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 7c566863b493d778b72dea7d8822f6a59333e77d..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js b/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js
deleted file mode 100644
index f985eee1123c0fb78d105c2843f9557735b01831..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.db");
-import("Sql_lib");
-
-var fullCondition = SqlCondition.begin()
-
-// the parameters have to be present
-if (vars.exists("$param.ObjectType_param") && vars.exists("$param.ObjectRowid_param"))
-{
- var objectType = vars.getString("$param.ObjectType_param");
- var objectRowid = vars.getString("$param.ObjectRowid_param");
- if (objectType && objectRowid)
- {
- fullCondition.orSqlCondition(SqlCondition.begin()
- .andPrepare(["AB_OBJECTRELATIONTYPE", "OBJECT_TYPE", "type1"], objectType)
- .andPrepare("AB_OBJECTRELATION.OBJECT1_ROWID", objectRowid))
- .orSqlCondition(SqlCondition.begin()
- .andPrepare(["AB_OBJECTRELATIONTYPE", "OBJECT_TYPE", "type2"], objectType)
- .andPrepare("AB_OBJECTRELATION.OBJECT2_ROWID", objectRowid));
- }
-
-}
-
-result.string(db.translateCondition(fullCondition.build("1=2")));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/recordcontainers/db/fromClauseProcess.js b/entity/ObjectRelation_entity/recordcontainers/db/fromClauseProcess.js
deleted file mode 100644
index 1b526b9dcedf69e6198fa4e34138a39a7c390b8f..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/recordcontainers/db/fromClauseProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-
-result.string("AB_OBJECTRELATION \n\
- join AB_OBJECTRELATIONTYPE type1 on AB_OBJECTRELATIONTYPE1 = type1.AB_OBJECTRELATIONTYPEID \n\
- join AB_OBJECTRELATIONTYPE type2 on AB_OBJECTRELATIONTYPE2 = type2.AB_OBJECTRELATIONTYPEID");
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object1_type.value/expression.js b/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object1_type.value/expression.js
deleted file mode 100644
index e5b18cf00226b694da7e012b6424c939f70228a6..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object1_type.value/expression.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("type1.OBJECT_TYPE");
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object2_type.value/expression.js b/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object2_type.value/expression.js
deleted file mode 100644
index 13fa2a157f1b92f7c7727465280ef56d98580e20..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object2_type.value/expression.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("type2.OBJECT_TYPE");
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index abb40846551f37d8ec2a458a09e19b55276b0656..732a7815ac7d2253db4ed90aa3965728076c95b4 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,7 +1,7 @@
<?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>ObjectTree_entity</name>
- <title>Object tree</title>
+ <title>Object relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -38,6 +38,14 @@
<expose v="true" />
<mandatory v="true" />
</entityParameter>
+ <entityParameter>
+ <name>RelationType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>Uid_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -53,29 +61,20 @@
<entityField>
<name>PARENT_ID</name>
<searchable v="false" />
+ <tooltip></tooltip>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TITLE</name>
+ <title>Object</title>
<searchable v="false" />
</entityField>
<entityField>
<name>ICON</name>
+ <contentType>IMAGE</contentType>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/description/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>Selector</name>
- <title>Relationtype</title>
- <consumer>ObjectRelationTypes</consumer>
- <searchable v="true" />
- <state>EDITABLE</state>
- <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/selector/onValueChange.js</onValueChange>
- </entityField>
<entityConsumer>
<name>ObjectRelationTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -107,18 +106,95 @@
</entityField>
<entityField>
<name>TARGET_ID</name>
+ <title>Relation</title>
+ <consumer>Objects</consumer>
+ <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
<searchable v="false" />
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TARGET_CONTEXT</name>
<searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>INFO</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ <searchable v="false" />
+ <tooltipProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/info/tooltipProcess.js</tooltipProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECTRELATIONTYPEID</name>
+ <title>Relationtype</title>
+ <consumer>ObjectRelationTypes</consumer>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js</onValueChange>
</entityField>
+ <entityConsumer>
+ <name>Objects</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionGroup>
+ <name>alter</name>
+ <children>
+ <entityActionField>
+ <name>insert</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>edit</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+ <iconId>NEON:PENCIL</iconId>
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityParameter>
+ <name>RelationType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Uid_param</name>
+ <expose v="true" />
+ <description>Needed to load ONE Objectrelation together with ObjectId_param and ObjectType_param to determine the side</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
<recordFields>
<element>UID.value</element>
<element>TITLE.value</element>
@@ -126,7 +202,8 @@
<element>EXPANDED.value</element>
<element>TARGET_ID.value</element>
<element>TARGET_CONTEXT.value</element>
- <element>Selector.value</element>
+ <element>INFO.value</element>
+ <element>OBJECTRELATIONTYPEID.value</element>
</recordFields>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c18d22015d610e510b71019881de089a06d1632c
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js
@@ -0,0 +1,18 @@
+import("ObjectRelation_lib");
+import("system.neon");
+import("system.vars");
+
+if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+{
+ var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var uid = JSON.parse(selectedRows[0]);
+ var isObjectRelationNode = typeof uid[2] == "string";
+
+ if (isObjectRelationNode)
+ {
+ var params = {
+ "Uid_param" : selectedRows[0]
+ }
+ neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_EDIT, params);
+ }
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e46436ab939b94aa8d697e23d9d92390d1384404
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js
@@ -0,0 +1,25 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+{
+ var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var isObjectRelationNode = false;
+ if (selectedRows.length > 0)
+ {
+ var uid = JSON.parse(selectedRows[0]);
+ isObjectRelationNode = typeof uid[2] == "string";
+ }
+
+ if (isObjectRelationNode)
+ {
+ result.string(neon.COMPONENTSTATE_EDITABLE)
+ }
+ else
+ {
+ result.string(neon.COMPONENTSTATE_DISABLED)
+ }
+}
+else
+ result.string(neon.COMPONENTSTATE_DISABLED)
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2291f0b04c1ce88263f1ae7df7c42da85ee8b9ff
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
@@ -0,0 +1,34 @@
+import("system.logging");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+{
+ var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var isObjectRelationNode = false;
+ if (selectedRows.length > 0)
+ {
+ var uid = JSON.parse(selectedRows[0]);
+ isObjectRelationNode = typeof uid[2] == "string";
+
+ if (isObjectRelationNode)
+ {
+ parentId = uid[0];
+ parentObjectType = uid[3];
+ }
+ else
+ {
+ parentId = vars.getString("$param.ObjectId_param");
+ parentObjectType = vars.getString("$param.ObjectType_param");
+ }
+
+ var params = {
+ "ObjectId_param" : parentId,
+ "ObjectType_param" : parentObjectType,
+ "RelationType_param" : vars.get("$field.OBJECTRELATIONTYPEID")
+ };
+
+ neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+ }
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5e1e7308c70d180decdf001e23bdb853e3e1e4c4
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js
@@ -0,0 +1,26 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.neon");
+
+if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
+{
+ var selectedRows = JSON.parse(vars.get("$sys.selection"));
+ var isObjectRelationNode = false;
+ if (selectedRows.length > 0)
+ {
+ var uid = JSON.parse(selectedRows[0]);
+ isObjectRelationNode = typeof uid[2] == "string";
+
+ if (!isObjectRelationNode || isObjectRelationNode && uid[7] == 1)
+ {
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+ }
+ else
+ result.string(neon.COMPONENTSTATE_DISABLED);
+ }
+ else
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+ result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/valueProcess.js b/entity/ObjectTree_entity/entityfields/info/tooltipProcess.js
similarity index 51%
rename from entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/valueProcess.js
rename to entity/ObjectTree_entity/entityfields/info/tooltipProcess.js
index 0e35811c9fc30b9f87c3e4dda4235787fb0066f7..702c61b00fa47d188e32deb347b70106f4fb9d29 100644
--- a/entity/ObjectRelation_entity/entityfields/objects1/children/objecttype_param/valueProcess.js
+++ b/entity/ObjectTree_entity/entityfields/info/tooltipProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.OBJECT1_TYPE"))
\ No newline at end of file
+result.string(vars.get("$field.INFO"));
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e4ddc9dc5979726f1d5d93fc8e5973fcfaaedbc2
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("ObjectRelation_lib");
+
+if (vars.get("$field.OBJECTRELATIONTYPEID"))
+{
+ result.string(translate.text(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[1]));
+}
diff --git a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/onValueChange.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js
similarity index 77%
rename from entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/onValueChange.js
rename to entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js
index 0154c7d4a2a3a404ca83c2ec00078ea563ff425d..9264282cd7b4f9b9dca1cdd33aff00bb63064dd5 100644
--- a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/onValueChange.js
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js
@@ -25,14 +25,14 @@ if (relationTypeData[0])
if (relationTypeData[4] == "2")
{
- neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE2", relationTypeData[0]);
- neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE1", otherRelationTypeData[0]);
+ //neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE2", relationTypeData[0]);
+ //neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE1", otherRelationTypeData[0]);
}
else if (relationTypeData[4] == "1")
{
- neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE1", relationTypeData[0]);
- neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE2", otherRelationTypeData[0]);
+ //neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE1", relationTypeData[0]);
+ //neon.setFieldValue("$field.AB_OBJECTRELATIONTYPE2", otherRelationTypeData[0]);
}
- neon.setFieldValue("$field.mySide", otherRelationTypeData[4]);
+ // neon.setFieldValue("$field.MySide", otherRelationTypeData[4]);
}
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d9ab38c5c715f801518573a4c0d3814b0486a6e
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.exists("$param.RelationType_param") && vars.get("$param.RelationType_param") || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_AUTO);
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6dad72dac58144e1246329a26405c1de0f7e8845
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.RelationType_param") && vars.get("$param.RelationType_param"))
+{
+ result.string(vars.get("$param.RelationType_param"))
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js b/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..59596bc5946502edbb523a4d0a6f9d5f43cbe67b
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js
@@ -0,0 +1,21 @@
+import("Sql_lib");
+import("system.vars");
+import("system.result");
+import("system.db");
+import("ObjectRelation_lib");
+
+var relationTypeData = ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"));
+
+var sql1 = db.translateStatement(SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.OBJECT1_ROWID", "$field.PARENT_ID")
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", relationTypeData[7])
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", relationTypeData[8])
+ .buildSql("select OBJECT2_ROWID from AB_OBJECTRELATION", "1=2"));
+
+var sql2 = db.translateStatement(SqlCondition.begin()
+ .andPrepareVars("AB_OBJECTRELATION.OBJECT2_ROWID", "$field.PARENT_ID")
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", relationTypeData[7])
+ .andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", relationTypeData[8])
+ .buildSql("select OBJECT1_ROWID from AB_OBJECTRELATION", "1=2"));
+
+result.object([vars.get("$field.PARENT_ID")].concat(db.array(db.COLUMN, sql1 + " union " + sql2)));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object1/children/objecttype_param/valueProcess.js b/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
similarity index 50%
rename from entity/ObjectRelation_entity/entityfields/object1/children/objecttype_param/valueProcess.js
rename to entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
index 0e35811c9fc30b9f87c3e4dda4235787fb0066f7..b73f117c996323ede362e09f72d077c486603806 100644
--- a/entity/ObjectRelation_entity/entityfields/object1/children/objecttype_param/valueProcess.js
+++ b/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.OBJECT1_TYPE"))
\ No newline at end of file
+result.string(vars.get("$field.TARGET_CONTEXT"));
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js b/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7eed476d46447384559b14a62f4cfb3fd04f5475
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ObjectRelation_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ result.string(vars.get("$param.ObjectId_param"));
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/selector/onValueChange.js b/entity/ObjectTree_entity/entityfields/selector/onValueChange.js
deleted file mode 100644
index 821651c14e644cd4dd9345fca851737a023bcf09..0000000000000000000000000000000000000000
--- a/entity/ObjectTree_entity/entityfields/selector/onValueChange.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.neon");
-
-neon.refresh()
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js b/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..700dc7461b5f61b17ead3d2735ef8fd2eb7ac6f6
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ObjectRelation_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(ObjectRelationUtils.getRelationType(vars.get("$field.OBJECTRELATIONTYPEID"))[6]);
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js b/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d074689525fa0fc64cc41002e883c2c8cd5579f3
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.db");
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if (vars.get("$field.TARGET_ID") && vars.get("$field.TARGET_CONTEXT"))
+{
+ result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.TARGET_CONTEXT"), vars.get("$field.TARGET_ID"))));
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js b/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1309ba4e92dedd6284a0482f87b00c1c46a0f7c8
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+if (vars.get("$field.TARGET_CONTEXT"))
+{
+ result.string(ContextUtils.getContextName(vars.get("$field.TARGET_CONTEXT")));
+}
diff --git a/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js b/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..432b555ce843a3f52178d01c2cdef62b633ea8cd
--- /dev/null
+++ b/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_AUTO);
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 24743025b76832d687fc1cd69f5a5d55865b9a7b..850e7a7b8b59fae0b195912f17e30b23807f94f9 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,32 +1,62 @@
-import("system.translate");
-import("system.util");
+import("system.logging");
import("system.db");
-import("system.text");
+import("system.translate");
import("system.result");
import("system.vars");
-import("system.logging");
import("ObjectRelation_lib");
import("Context_lib");
import("Sql_lib");
-var relationTypesCache = {};
var tree = []
-var filter = JSON.parse(vars.get("$local.filter"))
-var selectedRelationType = null;
-if (filter)
+// uidParam: if only one row should be loaded
+var uidParam;
+if (vars.exists("$param.Uid_param") && vars.get("$param.Uid_param"))
+{
+ uidParam = vars.get("$param.Uid_param");
+}
+else if(vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0)
+{
+ uidParam = vars.get("$local.idvalues")[0];
+}
+
+if (uidParam)
{
- if (filter.childs.length > 0)
+ let uid = JSON.parse(uidParam);
+ let isObjectRelationNode = uid != null && typeof uid[2] == "string";
+
+ if (isObjectRelationNode)
{
- selectedRelationType = filter.childs[0].value;
+ let relationTypeData = ObjectRelationUtils.getRelationType(uid[2]);
+ _insertEntry(tree, _getEntryData(uid[0], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, uid[6]), "", 0, uid[3], relationTypeData[10], relationTypeData[4]);
+
}
}
+else
+{
+ var filter = JSON.parse(vars.get("$local.filter"))
+ var selectedRelationType = null;
+
+ if (filter)
+ {
+ if (filter.childs.length > 0)
+ {
+ selectedRelationType = filter.childs[0].value;
+ }
+ }
+ var originalObjectId = vars.get("$param.ObjectId_param");
+
+ _loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
+}
-_loadObjectRelationTree(vars.get("$param.ObjectId_param"), vars.get("$param.ObjectType_param"), selectedRelationType);
result.object(tree);
-function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer)
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData)
{
+ // prevent stack overflows
+ if (pLayer > 30)
+ return;
+
if (pLayer == undefined)
pLayer = 0;
@@ -41,7 +71,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
{
if (pObjectRelationTypeId)
{
- var relationTypeData = ObjectRelationUtils.getRelationType(pObjectRelationTypeId);
+ let relationTypeData = ObjectRelationUtils.getRelationType(pObjectRelationTypeId);
// if hirachy: get most top id else use the current currentObjectId
if (relationTypeData[4] == "1")
@@ -50,11 +80,11 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
relationTypeData = ObjectRelationUtils.getRelationType(relationTypeData[8]);
currentObjectId = _getRootID(currentObjectId, relationTypeData);
}
-
- let uids = _insertEntry(tree, [[currentObjectId, "", "", "", ""]], pNodeId, pLayer, pObjectType, relationTypeData)
+ // true to enable the insert button always --v
+ let uids = _insertEntry(tree, [[currentObjectId, "", "", "", "", relationTypeData[7]]], pNodeId, pLayer, pObjectType, selectedRelationType, true)
for (let i = 0; i < uids.length; i++)
{
- _loadObjectRelationTree(uids[i][0], uids[i][3], relationTypeData[0], uids[i], pLayer+1);
+ _loadObjectRelationTree(uids[i][0], uids[i][3], relationTypeData[0], uids[i], pLayer+1, relationTypeData);
}
}
else // no ObjectType chosen
@@ -64,7 +94,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
for (let i=0; i<relationTypes.length; i++)
{
- var data = _getEntryData(currentObjectId, relationTypes[i][0], relationTypes[i][3], relationTypes[i][7], relationTypes[i][8]);
+ var data = _getEntryData(currentObjectId, relationTypes[i][3], relationTypes[i][7], relationTypes[i][8]);
// if any subentry: show objectType
if (data.length > 0)
@@ -72,42 +102,68 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// TODO: Icons, BINDATA
// var icon = getIcon...
let uid = [currentObjectId, i, relationTypes[i]];
- tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, ""]);
+ tree.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, "", relationTypes[i][0]]);
- _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1);
+ _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1, relationTypes[i]);
}
}
}
}
else if (pLayer >= 1)
{
- var typeData = pNodeId[2];
- var typeId = typeData[0];
- var hierarchy = typeData[4];
- var destObjectType = typeData[6];
- var relationType1 = typeData[7];
- var relationType2 = typeData[8];
- var direction = typeData[3];
+ // if no relationType given, load from nodeId
+ if (!pRelationTypeData)
+ pRelationTypeData = pNodeId[2];
+ var thisRelationTypeId = pRelationTypeData[0];
+ var otherRelationTypeId = pRelationTypeData[10];
+ var hierarchy = pRelationTypeData[4];
+ var destObjectType = pRelationTypeData[6];
+ var relationType1 = pRelationTypeData[7];
+ var relationType2 = pRelationTypeData[8];
+ var direction = pRelationTypeData[3];
+
+ var relationTypeIdForNew = otherRelationTypeId;
if (hierarchy == "1")
{
- var myData = _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2)
+ var myData = _getEntryData(pNodeId[0], direction, relationType1, relationType2)
+
+
- // wenn typ-side 1 dann die eine Richtung, sonnst die andere?
- let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType, typeData)
+ // if hierarchy and selected RelationType -> use the selected one
+ if (selectedRelationType)
+ relationTypeIdForNew = selectedRelationType
+ else
+ relationTypeIdForNew = thisRelationTypeId;
+
+
+ let uids = _insertEntry(tree, myData, pNodeId, pLayer, destObjectType, relationTypeIdForNew, hierarchy)
for (let i = 0; i < uids.length; i++)
{
- _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1);
+ _loadObjectRelationTree(uids[i][0], uids[i][3], pObjectRelationTypeId, uids[i], pLayer+1, pRelationTypeData);
}
}
else
{
- // get ObjectRelationType from nodeId
- //if (!pObjectRelationTypeId)
- //{
- _insertEntry(tree, _getEntryData(pNodeId[0], typeId, direction, relationType1, relationType2), pNodeId, pLayer, destObjectType, typeData)
- //}
- // TODO: wenn relationtype selected
+ // pNodeId[4] is the previous NodeId and pNodeId[4][0] the previous ObjectId
+ var prevObjectId;
+ if (pNodeId[4] != undefined)
+ {
+ prevObjectId = pNodeId[4][0];
+ }
+
+ var entryData = _getEntryData(pNodeId[0], direction, relationType1, relationType2, prevObjectId, true);
+
+ if (direction == "same")
+ relationTypeIdForNew = thisRelationTypeId
+
+ // add both sides. Only one will succeed, because the prevObjectId will be filtered
+ _insertEntry(tree, entryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, hierarchy, 0);
+ if (direction == "same")
+ {
+ var otherEntryData = _getEntryData(pNodeId[0], "normal", relationType1, relationType2, prevObjectId, true);
+ _insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, hierarchy, 1);
+ }
}
}
}
@@ -115,13 +171,23 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
/**
* load data for a relation.
- * OBJECT_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE
+ * OBJECT_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, AB_OBJECTRELATIONTYPEID
+ *
+ * @param {String} pObjectId
+ * @param {String} pDirection
+ * @param {String} pRelationType1
+ * @param {String} pRelationType2
+ * @param {String} [pPrevId=undefined] Id of the previous node to exclude it
+ * @param {Boolean} [pNoRecursion=false] if false: select for direction "same" the other direction, if result is empty.
+ * @param {Boolean} [pObjectRelationId=false] provide if only one special node is needed
+ *
+ * @return {[][]}
*/
-function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, pRelationType2, pRecursion)
+function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pPrevId, pNoRecursion, pObjectRelationId)
{
if (pRelationType1 == undefined || pRelationType2 == undefined)
return [];
-
+
var myNum;
var otherNum;
@@ -136,32 +202,32 @@ function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, p
myNum = 1;
}
-
var cond = SqlCondition.begin()
.andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)
.andPrepare("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", pRelationType2)
- .andPrepare("AB_OBJECTRELATION.OBJECT" + myNum + "_ROWID", pObjectId);
-
+ .andPrepare("AB_OBJECTRELATION.OBJECT" + myNum + "_ROWID", pObjectId)
+ .andPrepareIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", pObjectRelationId);
+
// exclude previous node
- if (!pRelationTypeId)
+ if (!pPrevId)
cond.and("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID is not null");
else
- cond.andPrepare("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID", pObjectId, "# <> ?");
+ {
+ cond.andPrepare("AB_OBJECTRELATION.OBJECT" + otherNum + "_ROWID", pPrevId, "# <> ?");
+ }
// TODO: BINDATA?
// var image = getImageObject("Beziehung");
-
- // TODO: RELDESC gibts noch nicht
var data = db.table(cond.buildSql(
- "select OBJECT" + otherNum + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE \n\
+ "select OBJECT" + (pObjectRelationId ? myNum : otherNum) + "_ROWID, AB_OBJECTRELATIONID, OBJECT_TYPE, RELATION_TITLE, INFO, AB_OBJECTRELATIONTYPEID \n\
from AB_OBJECTRELATION \n\
join AB_OBJECTRELATIONTYPE on AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum + " and ","1=2", "", false));
-
- if (data.length == 0 && pDirection == "same" && !pRecursion)
+
+ // try again with other side for "same"
+ if (data.length == 0 && pDirection == "same" && !pNoRecursion || pObjectRelationId && data.length > 0 && !data[0][0])
{
- return _getEntryData (pObjectId, pRelationTypeId, "normal", pRelationType1, pRelationType2, true)
+ return _getEntryData(pObjectId, "normal", pRelationType1, pRelationType2, pPrevId, true, pObjectRelationId)
}
-
// TODO: BINDATA?
//for ( var i = 0; i < data.length; i++) data[i][2] = image[data[i][2]] == undefined ? "" : image[data[i][2]];
return data;
@@ -170,13 +236,23 @@ function _getEntryData(pObjectId, pRelationTypeId, pDirection, pRelationType1, p
function _getRelationTypes(pObjectType)
{
// TODO: load from entity when possible
- if (relationTypesCache[pObjectType] == undefined)
- relationTypesCache[pObjectType] = ObjectRelationUtils.getPossibleRelationTypes(pObjectType, true);
-
- return relationTypesCache[pObjectType];
+ return ObjectRelationUtils.getPossibleRelationTypes(pObjectType, true);
}
-function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelationTypeData)
+/**
+ * insert a new Entry
+ *
+ * @param {Array} pTree
+ * @param {Array[][]} pEntryData
+ * @param {Array[][]} pNodeId id of the parent
+ * @param {Integer} pLayer layernumber
+ * @param {String} pObjectType
+ * @param {String} pNewRelationTypeId the RelationType, a new relation should have, if this node is selected.
+ * @param {Integer} [pNum=undefined] optional number added to the key. Needed, if the key would not be unique.
+ *
+ * @return {Array[][]} the uids of the inserted data. Consists of [ObjectId, pEntryData-Index, AB_OBJECTRELATIONTYPEID, pObjectType (from param), pNodeId, objecttype (from entryId), objectrelationid, hierarchy]
+ */
+function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNewRelationTypeId, pHierarchy, pNum)
{
var expanded = true;
if (pLayer > 10) expanded = false;
@@ -185,10 +261,12 @@ function _insertEntry (pTree, pEntryData, pNodeId, pLayer, pObjectType, pRelatio
for(let i = 0; i < pEntryData.length; i++)
{
var display = db.cell(ContextUtils.getNameSql(pObjectType, pEntryData[i][0]));
- // TODO: Icon
- var uid = [pEntryData[i][0], i, pRelationTypeData, pObjectType, pNodeId, pEntryData[i][2]]
+ // TODO: Icon
+ var uid = [pEntryData[i][0], i, pEntryData[i][5], pObjectType, pNodeId, pEntryData[i][2], pEntryData[i][1], pHierarchy]
+ if (pNum)
+ uid.push(pNum);
uids.push(uid);
- pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, ""]);
+ pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, pEntryData[i][0], pObjectType, pEntryData[i][4], pNewRelationTypeId]);
}
return uids;
}
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..27ac27f8fe01dcffa3e2123c1e9f90978aa358a6
--- /dev/null
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,19 @@
+import("system.vars");
+import("system.neon");
+import("system.db");
+import("Sql_lib");
+
+
+var uid = JSON.parse(vars.get("$field.UID"));
+var isObjectRelationNode = typeof uid[2] == "string";
+
+if (isObjectRelationNode)
+{
+ var objectRelationId = uid[6];
+ db.deleteData("AB_OBJECTRELATION", SqlCondition.begin()
+ .andPrepareIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId)
+ .build("1=2"));
+
+ // Refresh otherwise the children of the deleted node would be moved to the root.
+ neon.refresh();
+}
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js b/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..9be46d3b15a8cba7ef2c661771a116404d4b0f16
--- /dev/null
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,47 @@
+import("system.util");
+import("ObjectRelation_lib");
+import("system.vars");
+import("system.db");
+
+selectedObjectRelationTypeId = vars.get("$field.OBJECTRELATIONTYPEID");
+if (selectedObjectRelationTypeId)
+{
+ relationTypeData = ObjectRelationUtils.getRelationType(selectedObjectRelationTypeId)
+ if (relationTypeData[0])
+ {
+ var relationType1 = relationTypeData[7];
+ var relationType2 = relationTypeData[8];
+ var side = relationTypeData[9];
+ var objectId1;
+ var objectId2;
+ var info = vars.get("$field.INFO");
+
+
+ if (side == "1")
+ {
+ objectId1 = vars.get("$field.TARGET_ID");
+ objectId2 = vars.get("$field.PARENT_ID");
+ }
+ else
+ {
+ objectId1 = vars.get("$field.PARENT_ID");
+ objectId2 = vars.get("$field.TARGET_ID");
+ }
+
+ db.insertData("AB_OBJECTRELATION", [
+ "AB_OBJECTRELATIONID",
+ "OBJECT1_ROWID",
+ "OBJECT2_ROWID",
+ "AB_OBJECTRELATIONTYPE1",
+ "AB_OBJECTRELATIONTYPE2",
+ "INFO"
+ ], null, [
+ util.getNewUUID(),
+ objectId1,
+ objectId2,
+ relationType1,
+ relationType2,
+ info
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js b/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..23a87592d8929a79aa3e55c6ffd11f4616999f6d
--- /dev/null
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,18 @@
+import("system.vars");
+import("system.neon");
+import("system.db");
+import("Sql_lib");
+
+
+var uid = JSON.parse(vars.get("$field.UID"));
+var isObjectRelationNode = typeof uid[2] == "string";
+
+if (isObjectRelationNode)
+{
+ var objectRelationId = uid[6];
+
+ db.updateData("AB_OBJECTRELATION", ["INFO"], null, [vars.get("$field.INFO")],
+ SqlCondition.begin()
+ .andPrepareIfSet("AB_OBJECTRELATION.AB_OBJECTRELATIONID", objectRelationId)
+ .build("1=2"));
+}
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 62d80564faf8ff52440f4514aa96a8e57ce7530d..649fb2c0f4c9b918e7245912d43ed74b40c57a42 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -9,12 +9,6 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>jdito</recordContainer>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityField>
<name>UID</name>
@@ -29,32 +23,6 @@
<mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>OneObject</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <documentation>%aditoprj%/entity/Object_entity/entityfields/oneobject/documentation.adoc</documentation>
- <recordContainer>jdito</recordContainer>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityProvider>
<entityProvider>
<name>AllObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
@@ -62,12 +30,6 @@
<documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
<dependencies>
- <entityDependency>
- <name>9810264a-4e53-4775-98eb-7025668c0021</name>
- <entityName>ObjectRelation_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
<entityName>TaskLink_entity</entityName>
@@ -88,17 +50,16 @@
</entityDependency>
</dependencies>
<children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="false" />
- <mandatory v="false" />
- </entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
</entityParameter>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="false" />
+ </entityParameter>
</children>
</entityProvider>
<entityConsumer>
@@ -164,6 +125,35 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>FilteredObjects</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
+ <entityName>ObjectTree_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Object_entity/entityfields/oneobject/documentation.adoc b/entity/Object_entity/entityfields/oneobject/documentation.adoc
deleted file mode 100644
index 628c21478017d70552888637466be8b427010c37..0000000000000000000000000000000000000000
--- a/entity/Object_entity/entityfields/oneobject/documentation.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-== OneObjects provider ==
-
-This provider returns one specific object.
\ No newline at end of file
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 4c8e5d685bc170924f901660acd523c9c34450c4..cc897167253658a76227405133616de5a988b233 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -1,18 +1,20 @@
+import("system.logging");
import("system.db");
import("system.vars");
import("system.result");
import("Context_lib");
+
if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"))
{
- if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
- {
- result.object(db.table(vars.get("$param.ObjectRowId_param"), ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowId_param"), false, undefined, false)));
- }
- else
- {
- result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined, false)))
- }
+ var excludedIds = [];
+ if (vars.exists("$param.ExcludedObjectIds_param") && vars.get("$param.ExcludedObjectIds_param"))
+ excludedIds = JSON.parse(vars.get("$param.ExcludedObjectIds_param"));
+
+ logging.log("aa22aa" + vars.get("$param.ExcludedObjectIds_param").toSource())
+ logging.log("aa22aa" + vars.get("$param.ObjectType_param").toSource())
+
+ result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined, false, excludedIds)))
}
else
{
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 26ca463bb4a9c341995c2e1f8fbee561ea0295a2..36e8bee336ba4f8af8ccd2b908feffe9ff9e4333 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -597,6 +597,7 @@
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
diff --git a/entity/Offer_entity/entityfields/status/valueProcess.js b/entity/Offer_entity/entityfields/status/valueProcess.js
index 7d4ed678a49b3ccfbd5d34fdb892fd6f0c8520a1..ef4ec27fb0c16db8e3b6a59b3723da26f78f54e8 100644
--- a/entity/Offer_entity/entityfields/status/valueProcess.js
+++ b/entity/Offer_entity/entityfields/status/valueProcess.js
@@ -2,5 +2,5 @@ import("system.neon");
import("system.vars");
import("system.result");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("70d27a1b-7233-481d-826f-01a13a4bb0b2"); //Open
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/tasks/stateProcess.js b/entity/Offer_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fca9129ea68cf45ad847604b3e6f12b25052ce36
--- /dev/null
+++ b/entity/Offer_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.OFFERID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBInsert.js b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
index 6b3c4033a05890bdd874ce4fa610333b06fdc538..c9c487029913a28d6eda69030fccfc6f6f3a3f5f 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
@@ -1,6 +1,6 @@
-import("system.neon");
-import("system.vars");
-import("Offer_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
- OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), vars.get("$field.OFFERID"));
+import("system.neon");
+import("system.vars");
+import("Offer_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
+ OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), vars.get("$field.OFFERID"));
diff --git a/entity/Order_entity/recordcontainers/db/onDBInsert.js b/entity/Order_entity/recordcontainers/db/onDBInsert.js
index f3f8fd6de5a6a1febfa39604a10cd0249ed35e89..940a4ff0f9a833f00b45814bab915e9ed2014fb6 100644
--- a/entity/Order_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Order_entity/recordcontainers/db/onDBInsert.js
@@ -1,12 +1,12 @@
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-import("Order_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferId_param"))
-{
- var orderId = vars.getString("$field.SALESORDERID");
- var offerId = vars.getString("$param.OfferId_param");
-
- OrderUtils.copyOfferItemsToOrder(offerId, orderId); //copy all offerItems
-}
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+import("Order_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferId_param"))
+{
+ var orderId = vars.getString("$field.SALESORDERID");
+ var offerId = vars.getString("$param.OfferId_param");
+
+ OrderUtils.copyOfferItemsToOrder(offerId, orderId); //copy all offerItems
+}
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index db55fdd66a2cbf35ab16e446c359f6140d554900..407d8b4db1d219a6f8a251555a60a03db0c8fec8 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -101,15 +101,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Organisation_entity/entityfields/image/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
<entityFieldGroup>
<name>CUSTOMERCODE_DISPLAY_fieldGroup</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js</valueProcess>
@@ -123,10 +114,6 @@
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
<entityParameter>
<name>WithPrivate_param</name>
<expose v="true" />
@@ -403,8 +390,6 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>ObjectRelation_entity</entityName>
- <fieldName>ObjectRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -550,6 +535,7 @@
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
@@ -576,7 +562,7 @@
</entityParameter>
<entityConsumer>
<name>ObjectTrees</name>
- <title>Relation tree</title>
+ <title>Object relation</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -643,10 +629,6 @@
</entityDependency>
</dependencies>
<children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<title></title>
@@ -708,10 +690,6 @@
<name>AttributeKeyId_param</name>
<expose v="true" />
</entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
<entityParameter>
<name>ExcludeOrganisationsByPersonId</name>
<expose v="false" />
@@ -783,6 +761,18 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/date_new_contact/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>PICTURE</name>
+ <title>Picture</title>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <displayValueProcess>%aditoprj%/entity/Organisation_entity/entityfields/picture/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>AvatarText_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -790,23 +780,30 @@
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBInsert>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <orderClauseProcess>%aditoprj%/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
- <name>47c6c065-ae0e-4cee-b913-335570e3221c</name>
+ <name>f745a13c-6fbe-4cab-99d8-3cb7d599005a</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>e6120ee7-e6c3-4f60-9327-417627ba1fac</name>
+ <name>31f03bd6-83c1-4185-a9a7-4e6d94469fd2</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
+ <linkInformation>
+ <name>695731e1-879d-4fb1-a1bb-56ecfd6f7c03</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -895,6 +892,14 @@
<name>DATE_NEW_CONTACT.value</name>
<recordfield>CONTACT.DATE_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESS_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PICTURE.value</name>
+ <recordfield>ORGANISATION.PICTURE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js b/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c88b7ab04f19f1ebdbb7cfbd189709d3fcd9cbfe
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/avatartext_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.getString("$field.NAME"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/image/onValueChange.js b/entity/Organisation_entity/entityfields/image/onValueChange.js
deleted file mode 100644
index 86a4f85653ae6eb9a622f17318dd0e4782e75ee3..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/image/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Entity_lib");
-
-// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
-FieldChanges.setChange("$field.IMAGE");
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/image/valueProcess.js b/entity/Organisation_entity/entityfields/image/valueProcess.js
deleted file mode 100644
index ff2e70283d1cbaf1fb96d168a926ea7aec635d2a..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/image/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Organisation_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
- result.string(OrgUtils.getImage(vars.get("$field.ORGANISATIONID"), vars.getString("$field.NAME")));
-}
diff --git a/entity/Organisation_entity/entityfields/picture/displayValueProcess.js b/entity/Organisation_entity/entityfields/picture/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a8bad702a846e9273db756ed1bb6c1c4781591dd
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/picture/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && !vars.get("$this.value"))
+ result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/tasks/stateProcess.js b/entity/Organisation_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2d6a0eb24444a21440ea2433c6acd0e252c6e68d
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.ORGANISATIONID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Organisation_entity/imageProcess.js b/entity/Organisation_entity/imageProcess.js
index c88b7ab04f19f1ebdbb7cfbd189709d3fcd9cbfe..ab4d712d459a7ea65b253daa74163d11a1b20099 100644
--- a/entity/Organisation_entity/imageProcess.js
+++ b/entity/Organisation_entity/imageProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string("TEXT:" + vars.getString("$field.NAME"));
\ No newline at end of file
+result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
index fd4f9ce328d42a3ef11efbd7b6454d99d6b3f30c..81779a42ee9e845df049275fd8bdf352063e1d4a 100644
--- a/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,3 +1,6 @@
import("system.result");
-result.string("ORGANISATION join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)");
\ No newline at end of file
+//ADDRESS is necessary to display standard address fast within organisation lists
+result.string("ORGANISATION \n\
+ join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)\n\
+ left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)");
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js b/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
deleted file mode 100644
index ba0e67422c062558e49b062c65e43e35fa5e2b95..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/recordcontainers/db/onDBInsert.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.logging");
-import("system.vars");
-
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
index d9103a1d8933ef575c9acbed85610134045afbf8..b2c37a2cc9c1428bba4d856394a6bc48df8ddcd3 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js
@@ -3,15 +3,7 @@ import("Organisation_lib");
import("Communication_lib");
import("Entity_lib");
-// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Container #1030023
-FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function(state, value){
- if (state == FieldChanges.STATE_CHANGED())
- OrgUtils.setImage(vars.get("$field.ORGANISATIONID"), value);
- else
- OrgUtils.removeImage(vars.get("$field.ORGANISATIONID"));
-});
-
-
+// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
var uid = vars.get("$sys.uid");
FieldChanges.assimilateChangeAndDispose("$field.STANDARD_EMAIL_COMMUNICATION", function(state, value){
CommUtil.setStandardMail(uid, value);
diff --git a/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js b/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4e5e1db97f786170e23f3951f9bf75bcd0f5cadd
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "ORGANISATION.CUSTOMERCODE": db.ASCENDING,
+ "ORGANISATION.NAME": db.ASCENDING
+ });
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..beac43f3d912a8f81208580f156bb766178124f7
--- /dev/null
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("PostalAddress_lib");
+import("system.result");
+
+var res = AddressUtils.formatOnelineSql();
+result.string(res);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 9d70fe16b142bdcb531fd687eff57a887dcea22f..ab30b489877f456ad1abccd29ec39b2723447741 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -73,15 +73,6 @@
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/image/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Person_entity/entityfields/image/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
<entityFieldGroup>
<name>NAME_fieldGroup</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
@@ -430,6 +421,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<consumer>EmailCommunications</consumer>
<searchable v="false" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
@@ -481,6 +477,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>Address</title>
<consumer>ContactAndOrganisationAddresses</consumer>
<searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
@@ -498,8 +495,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>ObjectRelation_entity</entityName>
- <fieldName>ObjectRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -622,6 +617,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
@@ -644,7 +640,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityConsumer>
<name>ObjectTrees</name>
- <title>Relation tree</title>
+ <title>Object relation</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -846,6 +842,18 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/additionalactivitytasklinks_param/valueProcess.js</valueProcess>
<description>PARAMETER</description>
</entityParameter>
+ <entityField>
+ <name>PICTURE</name>
+ <title>Picture</title>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/picture/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>AvatarText_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/avatartext_param/valueProcess.js</valueProcess>
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -853,29 +861,37 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Person_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBUpdate>%aditoprj%/entity/Person_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
- <name>cb2de42b-de48-4543-91d6-8d00af5c5736</name>
+ <name>3afdecb0-515e-43d2-872f-04c82ecca9ae</name>
<tableName>PERSON</tableName>
<primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>23fde8db-a3fe-421d-9e39-f6a0294e6883</name>
+ <name>217d431f-018c-4573-b786-d1b6b88f4b64</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>6766787e-d39b-4030-bd26-cacfcd80d386</name>
+ <name>19877118-eb80-4672-bd73-cf10dbbb052a</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
+ <linkInformation>
+ <name>64f188c2-e53d-44b5-9980-c867282eff7e</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -936,12 +952,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
- <recordfield></recordfield>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
- <recordfield></recordfield>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
@@ -1012,6 +1026,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>USER_NEW_CONTACT.value</name>
<recordfield>CONTACT.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESS_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PICTURE.value</name>
+ <recordfield>PERSON.PICTURE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js b/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
index bdc67e9f840a599793a8fc7d1dd7b9c88d193af4..0d3ba06fe9f697de38300dbff362f6e56d14b0ad 100644
--- a/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.getString("$field.PERSONID"));
\ No newline at end of file
+result.string(vars.getString("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/avatartext_param/valueProcess.js b/entity/Person_entity/entityfields/avatartext_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..07ab8d8c0fdef46bed683cebdd399fa91084d0bb
--- /dev/null
+++ b/entity/Person_entity/entityfields/avatartext_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME") + " " + vars.getString("$field.ORGANISATION_ID.displayValue")).trim());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/image/onValueChange.js b/entity/Person_entity/entityfields/image/onValueChange.js
deleted file mode 100644
index 86a4f85653ae6eb9a622f17318dd0e4782e75ee3..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/image/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Entity_lib");
-
-// TODO: also there is currently no good way to do updates with fields not connected to the record container. Workaround: imagevariable and update in onDBUpdate Process #1030023
-FieldChanges.setChange("$field.IMAGE");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/image/valueProcess.js b/entity/Person_entity/entityfields/image/valueProcess.js
deleted file mode 100644
index 2a70e90ebf7a93f7f0e9f2a1dcca3de0f9695080..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/image/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Person_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
- result.string(PersUtils.getImage(vars.get("$field.PERSONID"), (vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME")).trim()));
-}
diff --git a/entity/Person_entity/entityfields/picture/displayValueProcess.js b/entity/Person_entity/entityfields/picture/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a8bad702a846e9273db756ed1bb6c1c4781591dd
--- /dev/null
+++ b/entity/Person_entity/entityfields/picture/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && !vars.get("$this.value"))
+ result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/status/displayValueProcess.js b/entity/Person_entity/entityfields/status/displayValueProcess.js
index 4ce3577f00ef6af8c3cf3886f6a3d7a729b9e064..b9185cff9ec6fc9022ed92033e064118bfc493b7 100644
--- a/entity/Person_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/status/displayValueProcess.js
@@ -9,4 +9,4 @@ if (key)
var res = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), key);
result.string(res);
}
-
+
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/tasks/stateProcess.js b/entity/Person_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a33c7f3e00a9b4fdddcb9834e90446814be4cf5a
--- /dev/null
+++ b/entity/Person_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Person_entity/imageProcess.js b/entity/Person_entity/imageProcess.js
index 9d30ec1ce2a58d9eb87207bef231889d3878863f..ab4d712d459a7ea65b253daa74163d11a1b20099 100644
--- a/entity/Person_entity/imageProcess.js
+++ b/entity/Person_entity/imageProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string("TEXT:" + vars.getString("$field.FIRSTNAME") + " " + vars.getString("$field.LASTNAME"));
\ No newline at end of file
+result.string(vars.get("$param.AvatarText_param"));
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/fromClauseProcess.js b/entity/Person_entity/recordcontainers/db/fromClauseProcess.js
index ce2f7eb850a73316a2aecd84f0ef7c968124d5d9..96d05d16af027f62abf95a8cb65c6d30b71530cd 100644
--- a/entity/Person_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Person_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,4 +1,7 @@
import("system.vars");
import("system.result");
-result.string("PERSON join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID) join ORGANISATION on ORGANISATIONID = ORGANISATION_ID ");
\ No newline at end of file
+//ADDRESS is necessary to display standard address fast within contact lists
+result.string("PERSON \n\
+ join CONTACT on (CONTACT.PERSON_ID = PERSON.PERSONID) join ORGANISATION on ORGANISATIONID = ORGANISATION_ID\n\
+ left join ADDRESS on (ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID)");
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
index 4e3598b753a7b4f0a1de96f342e9e9ecf9e992bf..558fad5fb32a15ce823e8c00899b7b5cdf9eb622 100644
--- a/entity/Person_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -5,14 +5,6 @@ import("Entity_lib");
import("StandardObject_lib");
// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
-FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function(state, value){
- if (state == FieldChanges.STATE_CHANGED())
- PersUtils.setImage(vars.get("$field.PERSONID"), value);
- else
- PersUtils.removeImage(vars.get("$field.PERSONID"));
-});
-
-
var uid = vars.get("$sys.uid");
FieldChanges.assimilateChangeAndDispose("$field.STANDARD_EMAIL_COMMUNICATION", function(state, value){
CommUtil.setStandardMail(uid, value);
diff --git a/entity/Person_entity/recordcontainers/db/orderClauseProcess.js b/entity/Person_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d8ca41957b958679997fdc3f378c3920c1cb9ac
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.db");
+
+result.object({"PERSON.LASTNAME": db.ASCENDING,
+ "PERSON.FIRSTNAME": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..beac43f3d912a8f81208580f156bb766178124f7
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/address_id.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("PostalAddress_lib");
+import("system.result");
+
+var res = AddressUtils.formatOnelineSql();
+result.string(res);
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 4ed30005ec6fca26ba1211554a6118a3dca4dc95..f8474184d24ac58559ce37fe1aa4455afc5f16f4 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -395,6 +395,7 @@
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
diff --git a/entity/Product_entity/entityfields/tasks/stateProcess.js b/entity/Product_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..062f477b61b1ef7467fc25a4b5c84395116c3d29
--- /dev/null
+++ b/entity/Product_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.PRODUCTID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..70ffd19c8251db0ea1c0d4d9e296f2f3a0758826
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -0,0 +1,70 @@
+<?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>SalesprojectAnalyses_entity</name>
+ <title>Salesproject Analyses</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
+ <iconId>VAADIN:PIE_CHART</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>SORTING</name>
+ <title>Parent</title>
+ </entityField>
+ <entityField>
+ <name>X_PHASE</name>
+ <title>Phase</title>
+ </entityField>
+ <entityField>
+ <name>Y_COUNT</name>
+ <title>Count</title>
+ </entityField>
+ <entityField>
+ <name>OVERALL_TURNOVER</name>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OVERALL_FORECAST</name>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SENT_OFFERS</name>
+ <title>Sent offers</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPEN_SALESPROJECTS</name>
+ <title>Open salesprojects</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ <element>X_PHASE.value</element>
+ <element>Y_COUNT.value</element>
+ <element>SORTING.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectAnalyses_entity/documentation.adoc b/entity/SalesprojectAnalyses_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..75936e03b24fa56440b0e4979515af8edd40c694
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/documentation.adoc
@@ -0,0 +1,3 @@
+== Salesproject Analyses ==
+
+This entity provides analyses to display different things of all salesproject.
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d58be99a6a23f3797888dbc9fe370413dad3b9a1
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("system.logging");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var opensp = db.cell("select count(STATE) from SALESPROJECT \n\
+join AB_KEYWORD_ENTRY on KEYID = STATE and CONTAINER = 'SalesprojectState' and TITLE = 'Open' \n\
+group by KEYID, AB_KEYWORD_ENTRY.TITLE");
+
+result.string(opensp);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..451502e0d4d9f20a69b6847d49ff95695c04006a
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+import("system.datetime");
+
+result.string(translate.text("Forecast") + " " + datetime.toDate(vars.get("$sys.date"), "yyyy"));
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1f1ae8c0052bfa40c6ffb555ff4197450caf553
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("system.logging");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var forecast = db.cell(SqlCondition.begin()
+ .andPrepare("SALESPROJECT_FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+ .buildSql("select sum(VOLUME * 1000) from SALESPROJECT_FORECAST", "1=2"));
+
+result.string(forecast);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..03c0d039b7225ce79f92f89e9b98c8cce3ab5743
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.translate");
+import("system.datetime");
+
+result.string(translate.text("Turnover") + " " + datetime.toDate(vars.get("$sys.date"), "yyyy"));
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a08d40a129380b9383c59d1a175f75b5e31f5767
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("system.logging");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var turnover = db.cell(SqlCondition.begin()
+ .andPrepare("SALESORDER.SALESORDERDATE", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+ .buildSql("select sum(NET + VAT) from SALESORDER", "1=2"));
+
+result.string(turnover);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c415d73135ceb0683dd670668442589b62e5660a
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("system.logging");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var sentoffer = db.cell("select count(STATUS) from OFFER join AB_KEYWORD_ENTRY \n\
+on KEYID = STATUS and CONTAINER = 'OfferStatus' and TITLE = 'Sent' group by KEYID, AB_KEYWORD_ENTRY.TITLE");
+
+result.string(sentoffer);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e65797a6adb0da41ded6a02f5b1ba74a45d3c7d3
--- /dev/null
+++ b/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,34 @@
+import("system.vars");
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.translate");
+import("Data_lib");
+import("Keyword_lib");
+import("Money_lib");
+import("KeywordRegistry_basic");
+
+// load data
+
+var phases = db.table("select KEYID, AB_KEYWORD_ENTRY.TITLE, count(PHASE), AB_KEYWORD_ENTRY.SORTING \n\
+from SALESPROJECT join AB_KEYWORD_ENTRY on KEYID = PHASE and CONTAINER = 'SalesprojectPhase' and SORTING <> 7 \n\
+group by KEYID, AB_KEYWORD_ENTRY.TITLE, AB_KEYWORD_ENTRY.SORTING order by SORTING");
+
+for(i = 0; i < phases.length; i++){
+ if(phases[i][1] == "${SALESPROJECT_OFFER}"){
+ phases[i][1] = "Offer";
+ }
+}
+
+
+result.object(phases);
+
+
+
+
+
+
+
+
+
+
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b1499464e81d289a24eabf509113fdf0b114397f..fc82706d6730f269f6bb3b6e4c086aa88e2ae458 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -496,6 +496,7 @@
<name>Tasks</name>
<title>Tasks</title>
<fieldType>DEPENDENCY_OUT</fieldType>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
diff --git a/entity/Salesproject_entity/entityfields/phase/valueProcess.js b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
index 49280bb32c5fe3170d06cc0ccc1c36050105bd92..90b1c491d4c722c0d5712e697b0371aea23add3c 100644
--- a/entity/Salesproject_entity/entityfields/phase/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
@@ -1,6 +1,6 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("9f7d1fa9-7c09-4037-8f7c-8458def14d89"); //NQC
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/state/valueProcess.js b/entity/Salesproject_entity/entityfields/state/valueProcess.js
index 1bfcc5d651a3031c14925a8d82c1675066107519..abb032b5aee7f5975d2638190fb6f782adc4e219 100644
--- a/entity/Salesproject_entity/entityfields/state/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/state/valueProcess.js
@@ -2,5 +2,5 @@ import("system.neon");
import("system.vars");
import("system.result");
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string("483bcaeb-1e5b-4772-b54e-7d7d8aa65712"); //Open
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/tasks/stateProcess.js b/entity/Salesproject_entity/entityfields/tasks/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a5375f38fda775fd00271e774f45d992d491a98
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/tasks/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("ActivityTask_lib");
+import("Context_lib");
+
+if(TaskUtils.hasTasks(vars.get("$field.SALESPROJECTID"), ContextUtils.getCurrentContextId()))
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+else
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/StoredSelection_entity/StoredSelection_entity.aod b/entity/StoredSelection_entity/StoredSelection_entity.aod
deleted file mode 100644
index 66698e0d5000c21d5ce5ef440b2ca1f54fbd0232..0000000000000000000000000000000000000000
--- a/entity/StoredSelection_entity/StoredSelection_entity.aod
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>StoredSelection_entity</name>
- <title>Stored selections</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>Base64String_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>StoredSelections</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>1386345f-0ed8-4c82-b96d-a249775314ee</name>
- <entityName>Employee_entity</entityName>
- <fieldName>StoredSelections</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CONTEXT_NAME</name>
- <title>Module</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>SELECTION_TITLE</name>
- <title>Name</title>
- <state>READONLY</state>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <contentProcess>%aditoprj%/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>CONTEXT_NAME.value</element>
- <element>SELECTION_TITLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js b/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
deleted file mode 100644
index d92a27b39c76caada2055333b64b68dcef957d0d..0000000000000000000000000000000000000000
--- a/entity/StoredSelection_entity/recordcontainers/jdito/contentProcess.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("system.result");
-import("system.pack");
-import("system.util");
-import("system.vars");
-
-var records = [];
-if (vars.exists("$param.Base64String_param") && vars.get("$param.Base64String_param"))
-{
- var codedSelections = pack.gunzip(vars.get("$param.Base64String_param"));
-
- var selections = new XML(util.decodeBase64String(codedSelections));
- selections = selections.FRAME;
- for (let i in selections)
- {
- context = selections[i];
- var contextName = context.NAME;
- if (contextName)
- {
- var title = context.STORE.(ID == "#STORE_SAVED").ELEMENT.TITLE;
- for (let ii in title)
- {
- records.push([(contextName + title[ii]), contextName, title[ii]]);
- }
- }
- }
-}
-
-result.object(records);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/priority/valueProcess.js b/entity/Task_entity/entityfields/priority/valueProcess.js
index 97f66840686af1eee7e86efa71572140e845aa17..0639e8287e8797db0bd0a19c31781facd3409367 100644
--- a/entity/Task_entity/entityfields/priority/valueProcess.js
+++ b/entity/Task_entity/entityfields/priority/valueProcess.js
@@ -2,6 +2,7 @@ import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
+import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("09072b59-d12f-469b-acbd-18a28232ff70");
\ No newline at end of file
+ result.string($KeywordRegistry.taskPriority$low());
diff --git a/entity/Task_entity/entityfields/progress/valueProcess.js b/entity/Task_entity/entityfields/progress/valueProcess.js
index 50f7254139de095c53a876a40b2a86fbc83aad8f..854d3c94292f47f7eee1f245ceada6ec2704fee7 100644
--- a/entity/Task_entity/entityfields/progress/valueProcess.js
+++ b/entity/Task_entity/entityfields/progress/valueProcess.js
@@ -2,6 +2,7 @@ import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
+import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("ec92271b-eac2-4ec2-be24-ab4abde7e939");
\ No newline at end of file
+ result.string($KeywordRegistry.taskProgress$0());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/status/valueProcess.js b/entity/Task_entity/entityfields/status/valueProcess.js
index b3253f839febecf5f8d9d92bf7e79abe8e5f5c88..fe5d8581fd1d4c730aa95a9d23345b118513674c 100644
--- a/entity/Task_entity/entityfields/status/valueProcess.js
+++ b/entity/Task_entity/entityfields/status/valueProcess.js
@@ -2,6 +2,7 @@ import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
+import("KeywordRegistry_basic");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("21bc4d20-1a87-4247-8f7c-8d3a09631850");
\ No newline at end of file
+ result.string($KeywordRegistry.taskStatus$new());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/type/valueProcess.js b/entity/Task_entity/entityfields/type/valueProcess.js
index 68427766d13467b6bb55261aa6249df15cf8eacb..e1331380ae6b66c5317e8bb769149a68f057d83a 100644
--- a/entity/Task_entity/entityfields/type/valueProcess.js
+++ b/entity/Task_entity/entityfields/type/valueProcess.js
@@ -1,4 +1,5 @@
import("system.result");
+import("KeywordRegistry_basic");
// Sets the type to "Task" as default value.
-result.string("4dee8727-8299-422e-ae41-6cdf9de2dfd7");
\ No newline at end of file
+result.string($KeywordRegistry.taskType$Task());
\ No newline at end of file
diff --git a/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js b/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
index 8df31bc890c107c948cf1cfee8a8e72d23baf156..1e62e7551ccb20b0b0d7aca34f64b6e448b5dda7 100644
--- a/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Employee_lib");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Employee_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
diff --git a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
index e25db6b1024be40f497efdb97d94f7ff2ba0f925..cee26913021aaca4b49d84e0a50eca912e8a2799 100644
--- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
@@ -101,6 +101,9 @@ function _addMonth(pYear, pMonth, pData, pCategory)
function _addProducts(pYear, pMonth, pData, pCategory)
{
+ var monthDate = new Date(pYear, pMonth-1);
+ monthDate = datetime.toDate(monthDate.getTime(), "MMM yyyy", "UTC");
+
var groupcodeSums = {};
for (let i = 0; i < pData.length; i++)
@@ -131,6 +134,8 @@ function _addProducts(pYear, pMonth, pData, pCategory)
for (let groupcode in groupcodeSums)
{
if (groupcodeSums[groupcode]["sum"])
- chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"], groupcodeSums[groupcode]["sum"]]);
+ {
+ chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"] + " (" + monthDate.toString() + ")", groupcodeSums[groupcode]["sum"]]);
+ }
}
}
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d748c1a1ff8266f3083efd874299226099e7f5ff..229e6f961210acf0e1d632fbec86621a52623dca 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2685,9 +2685,162 @@
<entry>
<key>Username already exists!</key>
</entry>
+ <entry>
+ <key>Salesproject Phases</key>
+ </entry>
+ <entry>
+ <key>Turnover actual year</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year</key>
+ </entry>
<entry>
<key>This private person doeas already exist and can not be created once more.</key>
</entry>
+ <entry>
+ <key>Everyone</key>
+ </entry>
+ <entry>
+ <key>Project</key>
+ </entry>
+ <entry>
+ <key>Human resources</key>
+ </entry>
+ <entry>
+ <key>Project management</key>
+ </entry>
+ <entry>
+ <key>Office staff</key>
+ </entry>
+ <entry>
+ <key>Field staff</key>
+ </entry>
+ <entry>
+ <key>Resource</key>
+ </entry>
+ <entry>
+ <key>Human Resources</key>
+ </entry>
+ <entry>
+ <key>The title already exists!</key>
+ </entry>
+ <entry>
+ <key>Note</key>
+ </entry>
+ <entry>
+ <key>Email must be unique!</key>
+ </entry>
+ <entry>
+ <key>Project Management</key>
+ </entry>
+ <entry>
+ <key>Support</key>
+ </entry>
+ <entry>
+ <key>{$ADDRESS_IDENTIFIER}</key>
+ </entry>
+ <entry>
+ <key>Salesproject phases</key>
+ </entry>
+ <entry>
+ <key>Object type 1</key>
+ </entry>
+ <entry>
+ <key>Object type 2</key>
+ </entry>
+ <entry>
+ <key>Objectrelation type</key>
+ </entry>
+ <entry>
+ <key>Key figures</key>
+ </entry>
+ <entry>
+ <key>Delete all usage</key>
+ </entry>
+ <entry>
+ <key>Deleted all usages of \"%0\".</key>
+ </entry>
+ <entry>
+ <key>promotion target ofc</key>
+ </entry>
+ <entry>
+ <key>Successful</key>
+ </entry>
+ <entry>
+ <key>Relation type 1</key>
+ </entry>
+ <entry>
+ <key>Relation type 2</key>
+ </entry>
+ <entry>
+ <key>Relation type</key>
+ </entry>
+ <entry>
+ <key>Context 1</key>
+ </entry>
+ <entry>
+ <key>Context 2</key>
+ </entry>
+ <entry>
+ <key>Title 1</key>
+ </entry>
+ <entry>
+ <key>Title 2</key>
+ </entry>
+ <entry>
+ <key>Hierarchy</key>
+ </entry>
+ <entry>
+ <key>Object relation</key>
+ </entry>
+ <entry>
+ <key>Type 2 enabled</key>
+ </entry>
+ <entry>
+ <key>test1eee</key>
+ </entry>
+ <entry>
+ <key>Kennzahlen</key>
+ </entry>
+ <entry>
+ <key>Count</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year </key>
+ </entry>
+ <entry>
+ <key>test2</key>
+ </entry>
+ <entry>
+ <key>Picture</key>
+ </entry>
+ <entry>
+ <key>Chart</key>
+ </entry>
+ <entry>
+ <key>Salesproject Charts</key>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Tochter</key>
+ </entry>
+ <entry>
+ <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+ </entry>
+ <entry>
+ <key>Enable relation type 2</key>
+ </entry>
+ <entry>
+ <key>Salesproject Analyses</key>
+ </entry>
+ <entry>
+ <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
+ </entry>
+ <entry>
+ <key>ObjectRelationType</key>
+ </entry>
<entry>
<key>Documentmanagement</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 0735ec854ba2248eb7f2350b354a606f47d83f07..b8fe7995f96cf36efb54bde3464d85251b8f97f8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6,18 +6,38 @@
<country></country>
<variant></variant>
<keyValueMap>
+ <entry>
+ <key>Project management</key>
+ <value>Projektmanagement</value>
+ </entry>
<entry>
<key>Company</key>
<value>Firma</value>
</entry>
+ <entry>
+ <key>Picture</key>
+ <value>Bild</value>
+ </entry>
+ <entry>
+ <key>Office staff</key>
+ <value>Innendienst</value>
+ </entry>
<entry>
<key>Confirm password</key>
<value>Passwort prüfen</value>
</entry>
+ <entry>
+ <key>Human Resources</key>
+ <value>Personal</value>
+ </entry>
<entry>
<key>Entrydate (Day)</key>
<value>Eingangsdatum (Tag)</value>
</entry>
+ <entry>
+ <key>Salesproject phases</key>
+ <value>Vertriebsprojektphasen</value>
+ </entry>
<entry>
<key>Turnover</key>
<value>Umsatz</value>
@@ -26,6 +46,10 @@
<key>Discount %</key>
<value>Rabatt %</value>
</entry>
+ <entry>
+ <key>Email must be unique!</key>
+ <value>Die E-Mail-Adresse muss eindeutig sein!</value>
+ </entry>
<entry>
<key>E-Mail</key>
<value>E-Mail</value>
@@ -1079,6 +1103,10 @@
<key>My Activities</key>
<value>Meine Aktivitäten</value>
</entry>
+ <entry>
+ <key>Everyone</key>
+ <value>Jeder</value>
+ </entry>
<entry>
<key>Combobox Value</key>
<value>Combobox-Wert</value>
@@ -1213,6 +1241,10 @@
<entry>
<key>ISO 3166-1 alpha-2</key>
</entry>
+ <entry>
+ <key>Field staff</key>
+ <value>Außendienst</value>
+ </entry>
<entry>
<key>0.00</key>
</entry>
@@ -1581,6 +1613,9 @@
<entry>
<key>Kundenstammblatt</key>
</entry>
+ <entry>
+ <key>Key figures</key>
+ </entry>
<entry>
<key>Person</key>
</entry>
@@ -2107,6 +2142,10 @@
<key>Spain</key>
<value>Spanien</value>
</entry>
+ <entry>
+ <key>ObjectRelationType</key>
+ <value>Beziehungstyp</value>
+ </entry>
<entry>
<key>Palau</key>
<value>Palau</value>
@@ -2523,6 +2562,10 @@
<key>Christmas Island</key>
<value>Weihnachtsinsel</value>
</entry>
+ <entry>
+ <key>Project</key>
+ <value>Projekt</value>
+ </entry>
<entry>
<key>Netherlands</key>
<value>Niederlande</value>
@@ -2619,6 +2662,10 @@
<key>Congo (Democratic Republic of the)</key>
<value>Kongo (Demokratische Republik)</value>
</entry>
+ <entry>
+ <key>Resource</key>
+ <value>Ressource</value>
+ </entry>
<entry>
<key>Greece</key>
<value>Griechenland</value>
@@ -3223,6 +3270,7 @@
</entry>
<entry>
<key>Object tree</key>
+ <value>Beziehungen</value>
</entry>
<entry>
<key>&Aufg / Term (%0/%1)</key>
@@ -3479,6 +3527,142 @@
<key>This private person doeas already exist and can not be created once more.</key>
<value>Diese Privatperson existiert bereits und kann daher nicht noch ein mal angelegt werden.</value>
</entry>
+ <entry>
+ <key>The title already exists!</key>
+ </entry>
+ <entry>
+ <key>Human resources</key>
+ </entry>
+ <entry>
+ <key>Note</key>
+ </entry>
+ <entry>
+ <key>Project Management</key>
+ </entry>
+ <entry>
+ <key>Support</key>
+ </entry>
+ <entry>
+ <key>{$ADDRESS_IDENTIFIER}</key>
+ <value>Bezeichnung</value>
+ </entry>
+ <entry>
+ <key>Turnover actual year</key>
+ <value>Umsatz aktuelles Jahr</value>
+ </entry>
+ <entry>
+ <key>Forecast actual year</key>
+ <value>Forecast aktuelles Jahr</value>
+ </entry>
+ <entry>
+ <key>Salesproject Phases</key>
+ </entry>
+ <entry>
+ <key>Objectrelation type</key>
+ <value>Beziehungstyp</value>
+ </entry>
+ <entry>
+ <key>Kennzahlen</key>
+ </entry>
+ <entry>
+ <key>Count</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year </key>
+ </entry>
+ <entry>
+ <key>Chart</key>
+ </entry>
+ <entry>
+ <key>Salesproject Charts</key>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+ </entry>
+ <entry>
+ <key>test1eee</key>
+ </entry>
+ <entry>
+ <key>Object type 1</key>
+ <value>Typ 1</value>
+ </entry>
+ <entry>
+ <key>Object type 2</key>
+ <value>Typ 2</value>
+ </entry>
+ <entry>
+ <key>test2</key>
+ </entry>
+ <entry>
+ <key>Title 1</key>
+ <value>Titel 1</value>
+ </entry>
+ <entry>
+ <key>Title 2</key>
+ <value>Titel 2</value>
+ </entry>
+ <entry>
+ <key>Hierarchy</key>
+ <value>Hierarchie</value>
+ </entry>
+ <entry>
+ <key>Object relation</key>
+ <value>Beziehungen</value>
+ </entry>
+ <entry>
+ <key>Type 2 enabled</key>
+ <value>Typ 2 aktiviert</value>
+ </entry>
+ <entry>
+ <key>Relation type 1</key>
+ <value>Beziehungsart 1</value>
+ </entry>
+ <entry>
+ <key>Relation type 2</key>
+ <value>Beziehungsart 2</value>
+ </entry>
+ <entry>
+ <key>Relation type</key>
+ <value>Beziehungstyp</value>
+ </entry>
+ <entry>
+ <key>Context 1</key>
+ <value>Context 1</value>
+ </entry>
+ <entry>
+ <key>Context 2</key>
+ <value>Context 2</value>
+ </entry>
+ <entry>
+ <key>Tochter</key>
+ </entry>
+ <entry>
+ <key>Delete all usage</key>
+ <value>Lösche jede Verwendung</value>
+ </entry>
+ <entry>
+ <key>Deleted all usages of \"%0\".</key>
+ <value>Jede Verwendung von \"%0\" wurde gelöscht.</value>
+ </entry>
+ <entry>
+ <key>promotion target ofc</key>
+ </entry>
+ <entry>
+ <key>Successful</key>
+ </entry>
+ <entry>
+ <key>Enable relation type 2</key>
+ <value>Beziehungsart 2 aktiv</value>
+ </entry>
+ <entry>
+ <key>Salesproject Analyses</key>
+ </entry>
+ <entry>
+ <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 21778007d34f3ef60e50e5b6fd68a5c02a09db0c..1154262c40fa34dbf203fc73f72de099c9c0c220 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1038,6 +1038,9 @@
<entry>
<key>Seite</key>
</entry>
+ <entry>
+ <key>Note</key>
+ </entry>
<entry>
<key>Senden per E-Mail</key>
</entry>
@@ -2671,6 +2674,9 @@
<key>${MIN_MAX_ERROR} field: %0, value: %1, min: %2, max: %3</key>
<value>%0 has to be between %2 and %3.</value>
</entry>
+ <entry>
+ <key>The title already exists!</key>
+ </entry>
<entry>
<key>Password</key>
</entry>
@@ -2715,9 +2721,157 @@
<entry>
<key>Username already exists!</key>
</entry>
+ <entry>
+ <key>Salesproject Phases</key>
+ </entry>
+ <entry>
+ <key>Turnover actual year</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year</key>
+ </entry>
<entry>
<key>This private person doeas already exist and can not be created once more.</key>
</entry>
+ <entry>
+ <key>Everyone</key>
+ </entry>
+ <entry>
+ <key>Project</key>
+ </entry>
+ <entry>
+ <key>Human resources</key>
+ </entry>
+ <entry>
+ <key>Project management</key>
+ </entry>
+ <entry>
+ <key>Office staff</key>
+ </entry>
+ <entry>
+ <key>Field staff</key>
+ </entry>
+ <entry>
+ <key>Resource</key>
+ </entry>
+ <entry>
+ <key>Human Resources</key>
+ </entry>
+ <entry>
+ <key>Email must be unique!</key>
+ </entry>
+ <entry>
+ <key>Project Management</key>
+ </entry>
+ <entry>
+ <key>Support</key>
+ </entry>
+ <entry>
+ <key>{$ADDRESS_IDENTIFIER}</key>
+ <value>Identifier</value>
+ </entry>
+ <entry>
+ <key>Salesproject phases</key>
+ </entry>
+ <entry>
+ <key>Key figures</key>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Object type 1</key>
+ </entry>
+ <entry>
+ <key>Object type 2</key>
+ </entry>
+ <entry>
+ <key>Title 1</key>
+ </entry>
+ <entry>
+ <key>Title 2</key>
+ </entry>
+ <entry>
+ <key>Hierarchy</key>
+ </entry>
+ <entry>
+ <key>Object relation</key>
+ </entry>
+ <entry>
+ <key>Relation type 1</key>
+ </entry>
+ <entry>
+ <key>Relation type 2</key>
+ </entry>
+ <entry>
+ <key>Relation type</key>
+ </entry>
+ <entry>
+ <key>Context 1</key>
+ </entry>
+ <entry>
+ <key>Context 2</key>
+ </entry>
+ <entry>
+ <key>Delete all usage</key>
+ </entry>
+ <entry>
+ <key>Deleted all usages of \"%0\".</key>
+ </entry>
+ <entry>
+ <key>promotion target ofc</key>
+ </entry>
+ <entry>
+ <key>Successful</key>
+ </entry>
+ <entry>
+ <key>Objectrelation type</key>
+ </entry>
+ <entry>
+ <key>test1eee</key>
+ </entry>
+ <entry>
+ <key>Kennzahlen</key>
+ </entry>
+ <entry>
+ <key>Count</key>
+ </entry>
+ <entry>
+ <key>Forecast actual year </key>
+ </entry>
+ <entry>
+ <key>Type 2 enabled</key>
+ </entry>
+ <entry>
+ <key>test2</key>
+ </entry>
+ <entry>
+ <key>Picture</key>
+ </entry>
+ <entry>
+ <key>Chart</key>
+ </entry>
+ <entry>
+ <key>Salesproject Charts</key>
+ </entry>
+ <entry>
+ <key>Tochter</key>
+ </entry>
+ <entry>
+ <key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
+ </entry>
+ <entry>
+ <key>Enable relation type 2</key>
+ </entry>
+ <entry>
+ <key>Salesproject Analyses</key>
+ </entry>
+ <entry>
+ <key>Wichtigste Kennzahlen zu den Vertriebsprojekten.</key>
+ </entry>
+ <entry>
+ <key>ObjectRelationType</key>
+ </entry>
<entry>
<key>Documentmanagement</key>
</entry>
diff --git a/neonContext/Address/Address.aod b/neonContext/Address/Address.aod
index 62cf97f24928e402431a2ac83f30645c2f3ee9aa..87c5beb15bea545ae2a141faac7d78717b994320 100644
--- a/neonContext/Address/Address.aod
+++ b/neonContext/Address/Address.aod
@@ -3,19 +3,9 @@
<name>Address</name>
<title>Addresses</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>AddressFilter_view</filterview>
- <editview>AddressEdit_view</editview>
- <preview>AddressEdit_view</preview>
+ <lookupview>AddressLookup_view</lookupview>
<entity>Address_entity</entity>
<references>
- <neonViewReference>
- <name>f36427d6-75b7-4f67-9cd9-e391bca3166e</name>
- <view>AddressFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>306f9a88-42be-4838-9698-c6ac5c6a7f57</name>
- <view>AddressEdit_view</view>
- </neonViewReference>
<neonViewReference>
<name>0b476864-5342-4cb2-aa0c-f1ab29bb99b4</name>
<view>AddressList_view</view>
@@ -24,5 +14,9 @@
<name>f4c516c0-b9de-47df-91e4-43bdb3297fe7</name>
<view>AdressMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>77b182a7-2361-41a7-ae78-dc5285b41b97</name>
+ <view>AddressLookup_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/ObjectRelation/ObjectRelation.aod b/neonContext/ObjectRelation/ObjectRelation.aod
deleted file mode 100644
index ea16cff33f05f5f1638a7376279ffa11ec90a32b..0000000000000000000000000000000000000000
--- a/neonContext/ObjectRelation/ObjectRelation.aod
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>ObjectRelation</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>ObjectRelationFilter_view</filterview>
- <editview>ObjectRelationEdit_view</editview>
- <preview>ObjectRelationPreview_view</preview>
- <entity>ObjectRelation_entity</entity>
- <references>
- <neonViewReference>
- <name>dc0bd793-a472-4a7b-8394-06c4bc31258a</name>
- <view>ObjectRelationPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>30334c84-5e46-4a4e-a5c4-3c42d1cb109b</name>
- <view>ObjectRelationEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ec83a8eb-11a5-4544-8a06-47789704a626</name>
- <view>ObjectRelationFilter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonContext/ObjectRelationType/ObjectRelationType.aod b/neonContext/ObjectRelationType/ObjectRelationType.aod
index f3285ed72a72b2f7e2d2c18ddc921ce671c1717c..c90b46ece5109ab161d5df449e410baa5bcfc690 100644
--- a/neonContext/ObjectRelationType/ObjectRelationType.aod
+++ b/neonContext/ObjectRelationType/ObjectRelationType.aod
@@ -1,6 +1,20 @@
<?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>ObjectRelationType</name>
+ <title>Relation type</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:SPLIT</icon>
+ <filterview>ObjectRelationTypeFilter_view</filterview>
+ <editview>ObjectRelationTypeEdit_view</editview>
<entity>ObjectRelationType_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3bee0408-8a9b-4188-8ebf-0b9671bbf436</name>
+ <view>ObjectRelationTypeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>afb5b3c7-fb34-4511-8b72-34808d64e226</name>
+ <view>ObjectRelationTypeEdit_view</view>
+ </neonViewReference>
+ </references>
</neonContext>
diff --git a/neonContext/ObjectTree/ObjectTree.aod b/neonContext/ObjectTree/ObjectTree.aod
index b7ae46a2ca92572cedfa4c0abac241d2b1ed2b73..3a0bc38b2c9464edf2e3c6d8e510f00b7d7b2182 100644
--- a/neonContext/ObjectTree/ObjectTree.aod
+++ b/neonContext/ObjectTree/ObjectTree.aod
@@ -2,11 +2,22 @@
<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>ObjectTree</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>ObjectTreeFilter_view</filterview>
+ <editview>ObjectTreeEdit_view</editview>
+ <preview>ObjectTreePreview</preview>
<entity>ObjectTree_entity</entity>
<references>
<neonViewReference>
<name>0c9fc36e-e3f7-4198-b675-5d9ddb177611</name>
- <view>ObjectTree_view</view>
+ <view>ObjectTreeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1122516a-5f1c-4f08-9995-02acaee2a0cd</name>
+ <view>ObjectTreeEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>1caa61e2-0e59-47bd-a996-db49867e3908</name>
+ <view>ObjectTreePreview</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Offer/Offer.aod b/neonContext/Offer/Offer.aod
index e1d68da5ca5cac83a93742e7ee2cdd8e82dbede4..ff88eb5a2d7980c3abf9393624b544b07a813d0d 100644
--- a/neonContext/Offer/Offer.aod
+++ b/neonContext/Offer/Offer.aod
@@ -28,7 +28,7 @@
</neonViewReference>
<neonViewReference>
<name>a68c9d63-aff4-4e82-af23-72d20c2b6b76</name>
- <view>OfferDetail_view</view>
+ <view>OfferCoverLetter_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/StoredSelection/StoredSelection.aod b/neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
similarity index 53%
rename from neonContext/StoredSelection/StoredSelection.aod
rename to neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
index b758aed2aa3f95619ca280233109a7d76774ea31..712d9ac63b328dc3ce8ad4d8392833abb7997703 100644
--- a/neonContext/StoredSelection/StoredSelection.aod
+++ b/neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod
@@ -1,12 +1,16 @@
-<?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>StoredSelection</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>StoredSelection_entity</entity>
- <references>
- <neonViewReference>
- <name>8ab7727b-5dc7-47bb-9034-079d84ede3a3</name>
- <view>StoredSelectionFilter_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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>SalesprojectAnalyses</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>SalesprojectAnalyses_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>c50b2e10-86ca-4a5b-83d4-946a78c18786</name>
+ <view>SalesprojectPhases_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ccb97c28-966a-4206-b981-140e87e680bf</name>
+ <view>SalesprojectScoreCard_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index a72954dbb87ada62bfc9d77bcc94cc3eb9ae224f..d78d8f15560ea90feedb14ff60cd19f30c526c75 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -12,61 +12,61 @@
<defaultDashlets>
<neonDashlet>
<name>Dashlet</name>
- <viewName>SalesprojectFilter_view</viewName>
- <configName>OpenSalesprojectsDashlet</configName>
+ <viewName>SalesprojectScoreCard_view</viewName>
+ <configName>KeyFigures</configName>
<uiConfiguration>
<name>uiConfiguration</name>
- <xPos v="0" />
+ <xPos v="1" />
<yPos v="0" />
<colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
- <name>Dashlet2</name>
- <viewName>OfferFilter_view</viewName>
- <configName>SendOffersDashlet</configName>
+ <name>Dashlet4</name>
+ <viewName>OrganisationFilter_view</viewName>
+ <configName>AllOrgsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
- <xPos v="1" />
+ <xPos v="2" />
<yPos v="0" />
<colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
- <name>Dashlet3</name>
- <viewName>ContractFilter_view</viewName>
- <configName>AllContractsDashlet</configName>
+ <name>Dashlet5</name>
+ <viewName>TurnoverChart_view</viewName>
+ <configName>TurnoverDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
<xPos v="0" />
- <yPos v="5" />
+ <yPos v="0" />
<colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
- <name>Dashlet4</name>
- <viewName>OrganisationFilter_view</viewName>
- <configName>AllOrgsDashlet</configName>
+ <name>Dashlet2</name>
+ <viewName>SalesprojectFilter_view</viewName>
+ <configName>OpenSalesprojectsDashlet</configName>
<uiConfiguration>
<name>uiConfiguration</name>
- <xPos v="2" />
- <yPos v="0" />
- <colspan v="1" />
+ <xPos v="1" />
+ <yPos v="5" />
+ <colspan v="2" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
<neonDashlet>
- <name>Dashlet5</name>
- <viewName>TurnoverChart_view</viewName>
- <configName>TurnoverDashlet</configName>
+ <name>Dashlet3</name>
+ <viewName>SalesprojectPhases_view</viewName>
+ <configName>Salesproject phases</configName>
<uiConfiguration>
<name>uiConfiguration</name>
- <xPos v="1" />
+ <xPos v="0" />
<yPos v="5" />
- <colspan v="2" />
+ <colspan v="1" />
<rowspan v="5" />
</uiConfiguration>
</neonDashlet>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 2c3545b72cc7e0f89575c7432d02f82a3a23412c..7bb44f0e160cc3ab64d04b20a51bb0c93b34f698 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -14,6 +14,7 @@
<editMode v="false" />
<showDrawer v="true" />
<drawerCaption>Detail</drawerCaption>
+ <hideLabels v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 4c155db5b281108f72ce4799f924109087ab815a..0baa8a57551446a1b41fc43aff6da1974c8a0425 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -38,6 +38,10 @@
<name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
<entityField>CITY</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>6af52273-25bf-4286-83cc-217aea94ad09</name>
+ <entityField>ADDRIDENTIFIER</entityField>
+ </neonTableColumn>
</columns>
</titledListViewTemplate>
</children>
diff --git a/neonView/AddressFilter_view/AddressFilter_view.aod b/neonView/AddressLookup_view/AddressLookup_view.aod
similarity index 51%
rename from neonView/AddressFilter_view/AddressFilter_view.aod
rename to neonView/AddressLookup_view/AddressLookup_view.aod
index 4f6d79febe3e5488e1fb90a84140531c996bac5d..84a197811b5c31e788561505537c4b9c354cfeae 100644
--- a/neonView/AddressFilter_view/AddressFilter_view.aod
+++ b/neonView/AddressLookup_view/AddressLookup_view.aod
@@ -1,8 +1,7 @@
<?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>AddressFilter_view</name>
+ <name>AddressLookup_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
@@ -10,33 +9,49 @@
</layout>
<children>
<tableViewTemplate>
- <name>Addresses</name>
+ <name>DataTable</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>852583d4-1883-4b36-963f-6f3a4df63a89</name>
+ <name>297a27f0-51a0-40d7-a2eb-28fc2b9e5730</name>
+ <entityField>IS_STANDARD_ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>07e3bcf0-30aa-4745-8dd6-ed79dd2d0fa0</name>
<entityField>ADDR_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>10e9e08f-db9b-4789-a4b4-b2a0a750b069</name>
+ <name>e6d9ced9-eea3-4cdf-9751-74c8f206282f</name>
<entityField>COUNTRY</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>32b8b6f0-bdbc-4a4b-b98c-0a22861b0e6c</name>
+ <name>570039fc-c27a-4b06-a93e-16cc712a3d0c</name>
<entityField>ADDRESS</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>9d93662b-f024-4b0b-a37e-6cc88afb9dd2</name>
+ <name>26ca52ce-91e7-4e76-a37e-6db28b967beb</name>
<entityField>BUILDINGNO</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>10e9e08f-db9b-4789-a4b4-b1a0a750b169</name>
+ <name>a54d6306-e9be-41db-9d1c-abeebe5ce77b</name>
<entityField>ZIP</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>57247c5c-6498-420b-b288-68ca316cf7f2</name>
+ <name>6a07479c-b4d3-4946-993e-e6ce7dd825ba</name>
<entityField>CITY</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>820b6ffc-7e56-4982-8f39-4443b0ada876</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>24f73ac8-ac90-4beb-83fe-bdaa2d0806b6</name>
+ <entityField>ADDRIDENTIFIER</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9651a718-ab01-4c97-8da0-6e7133f26466</name>
+ <entityField>#PROVIDER</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index 3f827b56968e1515a287c3bdd093d90f53e48baf..dbec2da120f3c7ad0d96b8e42326b6c48cd6c6e3 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -36,6 +36,10 @@
<name>fafca2d6-c2dd-4b66-b1ff-1d6ba451827b</name>
<entityField>CITY</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>481496b8-d611-4b4a-9c5e-1d28a7136a2d</name>
+ <entityField>ADDRIDENTIFIER</entityField>
+ </neonTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index 4806bb86beea998393eba2f5e4cebbac3a1c69d3..88007b4a1c2a3ad67ae4732cbaf982f3f0118bf5 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -2,7 +2,7 @@
<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>DocumentFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="false" />
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
index 9d89615fa4e2538be132137725f8fdf77e50b3c6..71614eff593bccfb770ea91b005d958a6feecad7 100644
--- a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -14,17 +14,13 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>fdd5320e-a8c0-4043-a88e-aeba1ca02cd1</name>
- <entityField>UID</entityField>
+ <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
+ <entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
<entityField>ISACTIVE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
<entityField>FIRSTNAME</entityField>
@@ -33,6 +29,10 @@
<name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
<entityField>LASTNAME</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>9c030b62-bf17-4be1-bcc6-87b304a618c0</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
<entityField>EMAIL_ADDRESS</entityField>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index a11de42475c354c9b1c019cd96f898b0cf038fa8..88171ca8fcb9cc79b14de3c3d8590240268af14a 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -19,7 +19,7 @@
</neonTableColumn>
<neonTableColumn>
<name>3e3552f9-9591-45ae-a0bb-a85210c2b382</name>
- <entityField>UID</entityField>
+ <entityField>TITLE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>307dfdad-a0b2-436f-b8a1-9825821dba0c</name>
diff --git a/neonView/EmployeeMain_view/EmployeeMain_view.aod b/neonView/EmployeeMain_view/EmployeeMain_view.aod
index ce9851ad9aed43497e71f8f2ca8afff081a3bc5b..1cbb84296df85b58403b1279cf5f4a87241b3118 100644
--- a/neonView/EmployeeMain_view/EmployeeMain_view.aod
+++ b/neonView/EmployeeMain_view/EmployeeMain_view.aod
@@ -34,10 +34,5 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>aaca4c8c-7953-43d8-9390-53b78d86863a</name>
- <entityField>StoredSelections</entityField>
- <view>StoredSelectionFilter_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/EmployeePreview_view/EmployeePreview_view.aod b/neonView/EmployeePreview_view/EmployeePreview_view.aod
index cbad6667101afd8d381dcc04c3dca3fdb1cf05ba..198c613625f55b8cf69b2094f843b9876ad4fc3e 100644
--- a/neonView/EmployeePreview_view/EmployeePreview_view.aod
+++ b/neonView/EmployeePreview_view/EmployeePreview_view.aod
@@ -12,7 +12,7 @@
<name>Header</name>
<iconField>IMAGE</iconField>
<titleField>NAME_fieldGroup</titleField>
- <subtitleField>UID</subtitleField>
+ <subtitleField>TITLE</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
index f91bb0b4e7ba1e7a54efe308364e6b341095d7b2..8f7c8f87db423237460233b64988a383db6003a7 100644
--- a/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
+++ b/neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod
@@ -3,9 +3,9 @@
<name>EmployeeRoleEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<genericMultipleViewTemplate>
diff --git a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod b/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
deleted file mode 100644
index d0895c5772622b5ae8c0bf56410325d0f37b5240..0000000000000000000000000000000000000000
--- a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>ObjectRelationFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>ObjectRelations</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>02c397e9-092b-4df0-be67-0fa3a1b02432</name>
- <entityField>selectedObjectRelationTypeIdProxy</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ab25081c-cb63-4d28-87d0-e4c022aac878</name>
- <entityField>rowIdProxy</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/AddressEdit_view/AddressEdit_view.aod b/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
similarity index 56%
rename from neonView/AddressEdit_view/AddressEdit_view.aod
rename to neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
index 55e151a9ebc66f5e1af24812ad49fecbd82e3919..6560a70b55a6184da2e9bb2fcfd0cf2ca821d37f 100644
--- a/neonView/AddressEdit_view/AddressEdit_view.aod
+++ b/neonView/ObjectRelationTypeEdit_view/ObjectRelationTypeEdit_view.aod
@@ -1,6 +1,6 @@
<?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>AddressEdit_view</name>
+ <name>ObjectRelationTypeEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -9,33 +9,33 @@
</layout>
<children>
<genericViewTemplate>
- <name>Edit</name>
- <showDrawer v="true" />
+ <name>Info</name>
+ <editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>b510378e-dfd3-4cec-bc2e-84b72aebb2b6</name>
- <entityField>ADDR_TYPE</entityField>
+ <name>adb2c427-89fd-4f8d-abae-39c8273c9916</name>
+ <entityField>SOURCE_RELATION_TITLE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>d8a7a16b-9d7f-44d7-bbb1-b0404d5b8b8f</name>
- <entityField>COUNTRY</entityField>
+ <name>ffaf9de0-6866-4d0a-80af-42b57169d83e</name>
+ <entityField>SOURCE_OBJECT_TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>c70668f3-6722-4a90-86d6-0d89be06dbe1</name>
- <entityField>ADDRESS</entityField>
+ <name>8c839d7f-31c2-4339-a74a-ff5fb83288df</name>
+ <entityField>Type2Enabled_proxy</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>0eac157d-de3d-4ff0-9ac2-1927b33c854a</name>
- <entityField>BUILDINGNO</entityField>
+ <name>0fd227e4-2896-4ce3-b699-8e5ce82a2862</name>
+ <entityField>DEST_RELATION_TITLE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>c70677f3-6722-4a90-86d6-0d89be06dbe1</name>
- <entityField>ZIP</entityField>
+ <name>e7578539-f60d-4136-af56-9fd587ed34ec</name>
+ <entityField>DEST_OBJECT_TYPE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>fafca9d6-c6dd-4b66-b1ff-1d6ba451827b</name>
- <entityField>CITY</entityField>
+ <name>945f613e-ce96-419d-8a71-f3196e41e444</name>
+ <entityField>HIERARCHY</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod b/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..474bfcaaf5f51ab1861982ad275bc228d867326e
--- /dev/null
+++ b/neonView/ObjectRelationTypeFilter_view/ObjectRelationTypeFilter_view.aod
@@ -0,0 +1,38 @@
+<?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>ObjectRelationTypeFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>RelationTypes</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>e526e3fb-2776-42f9-b75e-67a5dc7bde9d</name>
+ <entityField>SOURCE_RELATION_TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>89ee84eb-b50b-47e4-863c-7537c8a2c1d0</name>
+ <entityField>SOURCE_OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2230c73a-f5d9-44bb-bcfa-67d42a24881b</name>
+ <entityField>DEST_RELATION_TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>755d8ce7-3995-457c-b5f2-39f5aae361f6</name>
+ <entityField>DEST_OBJECT_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3e9e27c1-e971-4431-9f47-1d8fe436be76</name>
+ <entityField>HIERARCHY</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod b/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
similarity index 62%
rename from neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
rename to neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
index 83e9082f7f1584e9a4894dd77c267a813beafd87..472f2ae6756a22dc87731ca9a58aebddefba22a3 100644
--- a/neonView/ObjectRelationEdit_view/ObjectRelationEdit_view.aod
+++ b/neonView/ObjectTreeEdit_view/ObjectTreeEdit_view.aod
@@ -1,6 +1,6 @@
<?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>ObjectRelationEdit_view</name>
+ <name>ObjectTreeEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -14,12 +14,16 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>c3ef719e-2453-4216-a13a-1c1debafe410</name>
- <entityField>selectedObjectRelationTypeIdProxy</entityField>
+ <name>fd656c16-ef80-479f-a106-4741fb86c95f</name>
+ <entityField>OBJECTRELATIONTYPEID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>f60a0e0d-c3a9-4ab7-9b52-b33f5bb61d31</name>
- <entityField>rowIdProxy</entityField>
+ <name>81ec0bf6-132c-4046-b770-f65da3cd4b6e</name>
+ <entityField>TARGET_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>04579da5-0609-4a43-97dd-9e773ec1a29b</name>
+ <entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/ObjectTree_view/ObjectTree_view.aod b/neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
similarity index 80%
rename from neonView/ObjectTree_view/ObjectTree_view.aod
rename to neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
index a6e80e32a7f2926a5b5fe483e17b06818c750df3..36498203200d5587def0786af4a0ec1a15c76ceb 100644
--- a/neonView/ObjectTree_view/ObjectTree_view.aod
+++ b/neonView/ObjectTreeFilter_view/ObjectTreeFilter_view.aod
@@ -1,6 +1,6 @@
<?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>ObjectTree_view</name>
+ <name>ObjectTreeFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
@@ -12,10 +12,12 @@
<treeViewTemplate>
<name>ObjectRelations</name>
<parentField>PARENT_ID</parentField>
+ <favoriteActionGroup1>alter</favoriteActionGroup1>
<nodeExpandedField>EXPANDED</nodeExpandedField>
<titleField>TITLE</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
+ <descriptionField>INFO</descriptionField>
<iconField>ICON</iconField>
+ <hideContentSearch v="true" />
<entityField>#ENTITY</entityField>
</treeViewTemplate>
</children>
diff --git a/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod b/neonView/ObjectTreePreview/ObjectTreePreview.aod
similarity index 56%
rename from neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod
rename to neonView/ObjectTreePreview/ObjectTreePreview.aod
index 6e5496348316ec265eda9c40167c3750dc10bcba..b6b2c90c68a7ba9c2b8376378700684acb382a10 100644
--- a/neonView/ObjectRelationPreview_view/ObjectRelationPreview_view.aod
+++ b/neonView/ObjectTreePreview/ObjectTreePreview.aod
@@ -1,6 +1,6 @@
<?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>ObjectRelationPreview_view</name>
+ <name>ObjectTreePreview</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -9,17 +9,22 @@
</layout>
<children>
<genericViewTemplate>
- <name>Objects</name>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Info</drawerCaption>
<entityField>#ENTITY</entityField>
- <title>Object</title>
<fields>
<entityFieldLink>
- <name>8b21eea2-b6ec-492f-9bfe-4937b61ba1ef</name>
- <entityField>OBJECT1_ROWID</entityField>
+ <name>a7ff1a5c-1ea5-4904-a802-b3da55c07341</name>
+ <entityField>OBJECTRELATIONTYPEID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>eabe1737-7a31-4181-8c32-bda6a9f7d7e9</name>
- <entityField>OBJECT2_ROWID</entityField>
+ <name>0b612a60-d882-4def-b569-7146e1b1ccb6</name>
+ <entityField>TARGET_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6ed4e675-b1f5-4790-97d1-d015f87f37e4</name>
+ <entityField>INFO</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/OfferDetail_view/OfferDetail_view.aod b/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
similarity index 68%
rename from neonView/OfferDetail_view/OfferDetail_view.aod
rename to neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
index a465d174bc221a0fa4ada807e8f2cb3aa9d104d3..3eb7add5eefa24bba18d5cee1d847b29ddb3118a 100644
--- a/neonView/OfferDetail_view/OfferDetail_view.aod
+++ b/neonView/OfferCoverLetter_view/OfferCoverLetter_view.aod
@@ -1,7 +1,7 @@
<?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>OfferDetail_view</name>
- <title>Details</title>
+ <name>OfferCoverLetter_view</name>
+ <title>Cover letter</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -12,18 +12,10 @@
<genericViewTemplate>
<name>Details</name>
<showDrawer v="true" />
- <drawerCaption>Detail</drawerCaption>
+ <drawerCaption>Cover letter</drawerCaption>
<entityField>#ENTITY</entityField>
<title></title>
<fields>
- <entityFieldLink>
- <name>f0d0c68a-8437-4d9e-b852-575efaa984e8</name>
- <entityField>DELIVERYTERMS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c66f5e5b-82ad-4f93-9951-d96dfb802dbe</name>
- <entityField>PAYMENTTERMS</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>ab742325-7d03-4dfd-8afb-779dd8da805b</name>
<entityField>INFO</entityField>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index fd194c1b379bf81e5201f48d3f4bf360ff3fb234..ea4a89a44810d450579b611e28b0e28cf923ff86 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -22,7 +22,7 @@
<neonViewReference>
<name>e6b12eed-d67e-467c-9302-f6340f901235</name>
<entityField>#ENTITY</entityField>
- <view>OfferDetail_view</view>
+ <view>OfferCoverLetter_view</view>
</neonViewReference>
<neonViewReference>
<name>a3702740-418d-40d5-9415-788542c14abb</name>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 5a36edbfc7aa6617c5da3e4dffde6d27c92f7ffd..5ebc5733ab8f4abba5d853538e634828874a9593 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -82,6 +82,14 @@
<name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name>
<entityField>SALESPROJECT_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>59daee43-0e79-49d8-a36a-5ce4c491def9</name>
+ <entityField>PAYMENTTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a3a9ee30-bdd2-4907-b215-d4b4adcc0f1d</name>
+ <entityField>DELIVERYTERMS</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index a1a8f1e6e43c8b1a338e8fc80ec6d43bf23ba640..0be0dd2053fa814caca8b0954dac6a4380772042 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -36,7 +36,7 @@
<columns>
<neonTableColumn>
<name>2008e7ac-9e6a-4104-9d5b-da60a10a1c02</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>a290a2ca-3236-4eb0-bf51-99f99d8414d6</name>
diff --git a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index 0264632ac4600085158cbd17926f2cef2b6c834e..ba23ce75d87d07174812cbe14ef41cffdd104bb1 100644
--- a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -14,7 +14,7 @@
<columns>
<neonTableColumn>
<name>8c14a108-c672-4b48-bd10-b5ca2e777168</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>c2b34d5e-cefa-4bea-88bb-b62874956c19</name>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index b8cddb7e650c4318fcb91b17830f4cef59ceaf90..af17888c14a947777afbc2d620121e72bba2695e 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -45,15 +45,10 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>ab7d3db4-af9d-4903-b28a-6347f2512a54</name>
- <entityField>ObjectRelations</entityField>
- <view>ObjectRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
<entityField>ObjectTrees</entityField>
- <view>ObjectTree_view</view>
+ <view>ObjectTreeFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>39c98ccb-7f77-4df0-818f-1f302f69fec4</name>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index 220f2e9911fc74fc5aff5c28d7b87e1ee5a4c936..37be5f599a73966439a01de1bc475ad38996b106 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -10,7 +10,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>IMAGE</iconField>
+ <iconField>PICTURE</iconField>
<titleField>NAME</titleField>
<descriptionField>CUSTOMERCODE_DISPLAY_fieldGroup</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index 4f25712128eefa63b3d9b5315c195bb00da8294f..fe94380f9869ce7deafca8ce11d3541eeec36754 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -37,7 +37,7 @@
<columns>
<neonTableColumn>
<name>210cc6ab-5123-4d8a-8f2e-a6cd91d494ef</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>125d04cc-5c7a-4c38-bd0f-b5d02d21067d</name>
diff --git a/neonView/PersonLookup_view/PersonLookup_view.aod b/neonView/PersonLookup_view/PersonLookup_view.aod
index bce42f9faba68007ad25e80920d3eed6611a7d68..9d5267529859cd20da454c829fb587f75c00f88e 100644
--- a/neonView/PersonLookup_view/PersonLookup_view.aod
+++ b/neonView/PersonLookup_view/PersonLookup_view.aod
@@ -14,7 +14,7 @@
<columns>
<neonTableColumn>
<name>9541c336-10e9-4767-b6e5-52b6108d967a</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>876baf47-81c8-477a-951c-18df2dd4d972</name>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 25df37d62a0216130cfc95f225e8dd86d085fd95..6720704e06d6404674dfcbb9408080701567e088 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -34,15 +34,10 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>a713a58e-eae0-4657-9cb0-ffffbd41d4ab</name>
- <entityField>ObjectRelations</entityField>
- <view>ObjectRelationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
<entityField>ObjectTrees</entityField>
- <view>ObjectTree_view</view>
+ <view>ObjectTreeFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>be48c6fe-1837-4c40-aef1-130fc1a5c544</name>
diff --git a/neonView/PersonPreview_view/PersonPreview_view.aod b/neonView/PersonPreview_view/PersonPreview_view.aod
index 6b4a7a3769cf170879b641a062b84e31cd273eed..dea509d10e2d57637e8d05b9b5c0c48dec837aab 100644
--- a/neonView/PersonPreview_view/PersonPreview_view.aod
+++ b/neonView/PersonPreview_view/PersonPreview_view.aod
@@ -10,7 +10,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>IMAGE</iconField>
+ <iconField>PICTURE</iconField>
<titleField>FULL_NAME_fieldGroup</titleField>
<descriptionField>ORGANISATION_ID</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index 570e2fae64725087b35b18285e7c46a838a626d9..30b81a27aac3ade30157dd6216b1acad3b3da580 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -14,7 +14,7 @@
<columns>
<neonTableColumn>
<name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name>
- <entityField>IMAGE</entityField>
+ <entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name>
diff --git a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c4de8f137b681cd664e873800f2cafad6ce4c5ee
--- /dev/null
+++ b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
@@ -0,0 +1,55 @@
+<?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>SalesprojectPhases_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>Salesproject phases</name>
+ <title>Salesproject phases</title>
+ <description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
+ <fragment>SalesprojectAnalyses/full</fragment>
+ <singleton v="true" />
+ <icon>VAADIN:FUNNEL</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>chart</name>
+ <title>Chart</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <singleDataChartViewTemplate>
+ <name>PhaseFunnelChart</name>
+ <chartType>FUNNEL</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <parentField></parentField>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ <singleDataChartViewTemplate>
+ <name>PhasePieChart</name>
+ <chartType>PIE</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <parentField></parentField>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ <singleDataChartViewTemplate>
+ <name>PhasePyramidChart</name>
+ <chartType>PYRAMID</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..70df58282a0c2c6a7395d606ce4cc0600ba4e92c
--- /dev/null
+++ b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
@@ -0,0 +1,50 @@
+<?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>SalesprojectScoreCard_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>KeyFigures</name>
+ <title>Key figures</title>
+ <description>Wichtigste Kennzahlen zu den Vertriebsprojekten.</description>
+ <fragment>SalesprojectAnalyses/full</fragment>
+ <singleton v="true" />
+ <icon>VAADIN:GRID_BIG</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <scoreCardViewTemplate>
+ <name>KeyFigures</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>44449f24-ed9d-4053-8202-db4b43032067</name>
+ <entityField>OVERALL_TURNOVER</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3377fe1b-1f29-4c49-88c8-7a1b1ee6d0ce</name>
+ <entityField>OVERALL_FORECAST</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2ba5a5e7-0ae6-4001-84a6-9444730d6611</name>
+ <entityField>OPEN_SALESPROJECTS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f98b6e67-7337-45ac-b9e6-9d36241ae828</name>
+ <entityField>SENT_OFFERS</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod b/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
deleted file mode 100644
index 0fc464bb786585f4a76ea8683c3f7d21c835bab1..0000000000000000000000000000000000000000
--- a/neonView/StoredSelectionFilter_view/StoredSelectionFilter_view.aod
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>StoredSelectionFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Table</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>713574de-2d9c-4006-93a3-3860fb145c26</name>
- <entityField>CONTEXT_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4cc4d5ff-24cf-46d9-9941-cda11e445a17</name>
- <entityField>SELECTION_TITLE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index 9ddf2b46691744e3504279915e0467a8803b26cc..2e727ddd7fa99013db59b9d8d51ea7a94aa5d32a 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -3,6 +3,7 @@
<name>TimetrackingFilter_view</name>
<title>Timetracking</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml b/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
deleted file mode 100644
index 04d875917753fe320147e9b378b9cfcd42fc74d8..0000000000000000000000000000000000000000
--- a/others/db_changes/Data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
+++ /dev/null
@@ -1,41 +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="d.lechner" id="documentTemplateType-1">
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-423e-b130-dp88b2b518ad"/>
- <column name="KEYID" value="LET"/>
- <column name="TITLE" value="Letter"/>
- <column name="CONTAINER" value="DocumentTemplateType"/>
- <column name="SORTING" valueNumeric="0"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="6f4c6e49-36ca-4b98-ba83-c507203wawal"/>
- <column name="KEYID" value="MAI"/>
- <column name="TITLE" value="Mail"/>
- <column name="CONTAINER" value="DocumentTemplateType"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="bb386131-ee36-9771-b458-6751f137a941"/>
- <column name="KEYID" value="ATT"/>
- <column name="TITLE" value="Attachment"/>
- <column name="CONTAINER" value="DocumentTemplateType"/>
- <column name="SORTING" valueNumeric="2"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="bb38aa51-ee36-9771-b458-6751f137a941"/>
- <column name="KEYID" value="TEX"/>
- <column name="TITLE" value="Text Modular"/>
- <column name="CONTAINER" value="DocumentTemplateType"/>
- <column name="SORTING" valueNumeric="3"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- </changeSet>
-</databaseChangeLog>
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 4228e5d38db37b07d9a0329cc3577b69893815c2..8f7de2b78e5f70871594f05d7cf2f9c83b04c845 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.util");
import("system.datetime");
@@ -82,6 +83,25 @@ TaskUtils.createNewTask = function(pRowId, pAdditionalLinks, pParentContext, pPa
_ActivityTaskUtils._createNew("Task", pRowId, pAdditionalLinks, pParentContext, pParentId)
}
+/**
+ * Create a new task
+ */
+TaskUtils.hasTasks = function(pRowId, pObjectType)
+{
+ if (pRowId != "" && pObjectType != "")
+ {
+ var cond = SqlCondition.begin().andPrepare("TASKLINK.OBJECT_TYPE", pObjectType)
+ .andPrepare("TASKLINK.OBJECT_ROWID", pRowId);
+ var taskCount = db.cell(cond.buildSql("select count(*) from TASKLINK"));
+ if (taskCount != "0")
+ return true;
+ else
+ return false;
+ }
+ else
+ return true;
+}
+
/**
* add the links to the link-table in new mode
*
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 08b0fba8f927bb1a913d8a2a65c8d4adf20f383a..af3d24d9585b86cd16d243fb69b02a0087e47aaf 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.util");
import("system.datetime");
import("system.translate");
@@ -51,8 +50,8 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
attrCond.andSqlCondition(filteredIdsCondition);
}
- if (!pIncludeGroups)
- attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
+// if (!pIncludeGroups)
+// attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql));
@@ -377,8 +376,8 @@ $AttributeTypes.BOOLEAN = {
toString : function () {return this.keyword},
keyword : "BOOLEAN",
contentType : "BOOLEAN",
- databaseField : "BOOL_VALUE",
- entityField : "BOOL_VALUE",
+ databaseField : "INT_VALUE",
+ entityField : "INT_VALUE",
getViewValue : function (pValue)
{
return pValue == "1" ? translate.text("Yes") : translate.text("No");
@@ -416,14 +415,6 @@ $AttributeTypes.KEYWORD = {
return KeywordUtils.getViewValue(pKeyword, pValue);
}
};
-$AttributeTypes.MEMO = {
- toString : function () {return this.keyword},
- keyword : "MEMO",
- contentType : "TEXT",
- databaseField : "MEMO_VALUE",
- entityField : "MEMO_VALUE"
-};
-
function AttributeTypeUtil () {}
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index e08292ee5163cb70023156b4be664f6efd6e7c59..82ea3eef6b21f0e6a8541a7021808c027235e9ed 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -375,14 +375,14 @@ ContextUtils.getNameSql = function(pContextId, pRowId)
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
-ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive, pWithState)
+ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pExcludedObjectIds)
{
var selectMap = ContextUtils.getSelectMap();
var ownContextSelector = selectMap[pContextId];
var cond = SqlCondition.begin();
- if (pRowId)
+ if (pContactId)
{
- cond.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.contactIdField, pRowId)
+ cond.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.contactIdField, pContactId)
}
if (pActive != undefined)
@@ -401,6 +401,19 @@ ContextUtils.getContextDataSql = function(pContextId, pRowId, pWithDate, pActive
cond.andSqlCondition(condSub);
}
}
+
+ if (pExcludedObjectIds)
+ {
+ var exludedIdsCond = new SqlCondition()
+
+ pExcludedObjectIds.forEach(function(id)
+ {
+ this.andPrepare(ownContextSelector.tableName + "." + ownContextSelector.idField, id, "# <> ?");
+ }, exludedIdsCond)
+
+ cond.andSqlCondition(exludedIdsCond);
+ }
+
var dateColumn = "";
if (pWithDate === true)
dateColumn = ", " + (ownContextSelector.creationDateField || "''");
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index ef3273b495502a48ea29ed752400895251dd08a8..dac86b25c4f2515a8db0a6b58585a9026a6f1c46 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -1,3 +1,5 @@
+import("system.db");
+import("Sql_lib");
import("system.tools");
/**
@@ -29,4 +31,83 @@ EmployeeUtils.getCurrentUserName = function ()
{
var user = tools.getCurrentUser();
return user ? user[tools.TITLE] : null;
+}
+
+EmployeeUtils.sliceUserId = function (pUserId)
+{
+ return pUserId.substr(10, 36);
+}
+
+/**
+ * generates a username from the firstname and lastname with the given structure
+ *
+ * @param {String} pFirstName
+ * @param {String} pLastName
+ * @param {String} pStructure the structure of the username, special characters:
+ * f - one letter of the firstname in lowercase
+ * F - one letter of the firstname in uppsercase
+ * l - one letter of the lastname in lowercase
+ * L - one letter of the lastname in uppsercase
+ * f+ - the complete firstname in lowercase
+ * F+ - the complete firstname
+ * l+ - the complete lastname in lowercae
+ * L+ - the complete lastname
+ *
+ * @return {String} the generated username
+ */
+EmployeeUtils.generateUserName = function (pFirstName, pLastName, pStructure)
+{
+ if (!pStructure || (!pFirstName && !pLastName))
+ return null;
+
+ var firstNameIndex = 0;
+ var lastNameIndex = 0;
+ var userName = pStructure.replace(/(f\+|l\+|f|l)/ig, function (type)
+ {
+ switch (type)
+ {
+ case "f+":
+ return pFirstName.toLowerCase() || "";
+ case "F+":
+ return pFirstName || "";
+ case "l+":
+ return pLastName.toLowerCase() || "";
+ case "L+":
+ return pLastName || "";
+ case "f":
+ return pFirstName.charAt(firstNameIndex++).toLowerCase() || "";
+ case "F":
+ return pFirstName.charAt(firstNameIndex++).toUpperCase() || "";
+ case "l":
+ return pLastName.charAt(lastNameIndex++).toLowerCase() || "";
+ case "L":
+ return pLastName.charAt(lastNameIndex++).toUpperCase() || "";
+ }
+ });
+
+ return userName;
+}
+
+/**
+ * checks if an employee is used somewhere
+ *
+ * @param {String} pContactId the contact id of the user
+ *
+ * @return {boolean} if the employee has relations
+ */
+EmployeeUtils.hasRelations = function (pContactId)
+{
+ //sql queries with selects on tables where an employee can be used
+ var queries = [
+ SqlCondition.begin()
+ .andPrepare("ACTIVITY.CREATOR", pContactId)
+ .buildSql("select 1 from ACTIVITY"),
+ SqlCondition.begin()
+ .andPrepare("TIMETRACKING.CONTACT_ID", pContactId)
+ .buildSql("select 1 from TIMETRACKING")
+ ];
+ return queries.some(function (sql)
+ {
+ return db.cell(sql) != "";
+ });
}
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 7f6b2df6ecd8d43fe1b75b70c5e98bbbe72b9b40..a769ba53b15331c9c695ab8f0b25b1d727ce18ee 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -36,7 +36,9 @@ $KeywordRegistry.offerStatus = function(){return "OfferStatus";};
$KeywordRegistry.organisationType = function(){return "OrganisationType";};
$KeywordRegistry.personGender = function(){return "PersonGender";};
$KeywordRegistry.taskStatus = function(){return "TaskStatus";};
+$KeywordRegistry.taskStatus$new = function(){return "21bc4d20-1a87-4247-8f7c-8d3a09631850";};
$KeywordRegistry.taskType = function(){return "TaskType";};
+$KeywordRegistry.taskType$Task = function(){return "4dee8727-8299-422e-ae41-6cdf9de2dfd7";};
$KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
$KeywordRegistry.productPricelist$standardList = function(){return "02553fc7-4611-4914-8ff5-0b7c4e7531c9";};
@@ -58,7 +60,9 @@ $KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"
$KeywordRegistry.salesprojectState = function(){return "SalesprojectState";};
$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
$KeywordRegistry.taskPriority = function(){return "TaskPriority";};
+$KeywordRegistry.taskPriority$low = function(){return "09072b59-d12f-469b-acbd-18a28232ff70";};
$KeywordRegistry.taskProgress = function(){return "TaskProgress";};
+$KeywordRegistry.taskProgress$0 = function(){return "ec92271b-eac2-4ec2-be24-ab4abde7e939";};
$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState";};
$KeywordRegistry.objectRelationType = function(){return "ObjectRelationType";};
$KeywordRegistry.deliveryTerm = function(){return "DeliveryTerm";};
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
index a3d375d5c3642ad0f4a71dd9c437dbe30b977fa8..336694ba5c9a214c14842ea3d212c2f632b5d8e9 100644
--- a/process/ObjectRelation_lib/process.js
+++ b/process/ObjectRelation_lib/process.js
@@ -1,4 +1,4 @@
-import("system.logging");
+import("Sql_lib");
import("system.db");
/**
@@ -10,97 +10,98 @@ import("system.db");
function ObjectRelationUtils() {}
/**
- * Get all possible relationTypes by a objectType.
+ * Get all possible relationTypes by a objectType. (objectrelationtypeId and title)
* Normally it only returns the id and title. If you set pFullInfo to true, you will get additional information, too.
*
- * @param {String} pObjectType the object type to load the relation types for.]
- * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side
+ * @param {String} [pObjectType=undefined] the object type to load the relation types for.]
+ * @param {Boolean} [pFullInfo=false] return also RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side, objectrelationtypeId, other title
+ * @param {Boolean} [pOnlyFirstSide=false] load all types only for the first side.
+ * @param {String} [pRelationTypeId=undefined] load only the specified relationType
+ * @param {Boolean} [pDummyField=false] empty dummy-field needed for Type2Enabled_proxy-field in ObjectRelationType_entity to get changes of the Type2Enabled_proxy-field in the onUpdate Process
*
* @return {String[][]}
*/
-ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo)
+ObjectRelationUtils.getPossibleRelationTypes = function(pObjectType, pFullInfo, pOnlyFirstSide, pRelationTypeId, pDummyField)
{
var sql = " from AB_OBJECTRELATIONTYPE main \n\
- left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
- where case when type2.OBJECT_TYPE is null then ( ? = main.OBJECT_TYPE) else ( ? = type2.OBJECT_TYPE) end"
+ left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) ";
+ var cond = "";
- // only id and title:
- if (pFullInfo == undefined || pFullInfo == false)
+ var params = [];
+
+ if (pObjectType)
+ {
+ cond = "where case when type2.OBJECT_TYPE is null then main.OBJECT_TYPE else type2.OBJECT_TYPE end = ? "
+ params.push([pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]]);
+ }
+
+ if (pRelationTypeId)
{
- pFullInfo = [];
+ if (!cond)
+ cond = "where ";
+ else
+ cond += " and ";
- return (db.table(
- ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE" + sql,
- [
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- ]
- ]));
+ cond += " main.AB_OBJECTRELATIONTYPEID = ? ";
+ params.push([pRelationTypeId, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["AB_OBJECTRELATIONTYPEID"])[0]]);
+ }
+
+ if (pOnlyFirstSide == "1")
+ {
+ if (!cond)
+ cond = "where ";
+ else
+ cond += " and ";
+ cond += " main.SIDE = 1 "
}
- // full info:
- var relationTypes = (db.table(
- ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
+ sql += cond;
+
+ // only id and title:
+ if (pFullInfo == undefined || pFullInfo == false)
+ {
+ sql = "select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE" + sql;
+ }
+ else
+ {
+ sql = "select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
case when type2.AB_OBJECTRELATIONTYPEID is null then 'same' \n\
when main.SIDE = 1 then 'normal'\n\
else 'reverse'\n\
end direction,\n\
main.HIERARCHY, \n\
- type2.OBJECT_TYPE objectType, \n\
- main.OBJECT_TYPE objectType, \n\
+ type2.OBJECT_TYPE destObjectType, \n\
+ main.OBJECT_TYPE sourceObjectType, \n\
-- typeId of Object2\n\
case when main.SIDE = 1 then main.AB_OBJECTRELATIONTYPEID\n\
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId1,\n\
-- typeId of Object1\n\
case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
- main.SIDE" + sql,
- [
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- [pObjectType, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
- ]
- ]));
-
- return relationTypes;
+ main.SIDE,\n\
+ case when type2.AB_OBJECTRELATIONTYPEID is null then main.AB_OBJECTRELATIONTYPEID else type2.AB_OBJECTRELATIONTYPEID end,\n\
+ type2.RELATION_TITLE" + (pDummyField ? ", ''" : "") + sql;
+ }
+
+ // full info:
+ return (db.table([sql, params]));
}
/**
- * Get all possible relationTypes by a objectType.
- * returns the id, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side
+ * Get relationType by a RelationTypeId.
+ * returns the objectrelationtypeId, title, RELATION_TYPE, direction (normal, reverse, same), hierarchy, OBJECT_TYPE dest, OBJECT_TYPE source, objectrelationtypeId1, objectrelationtypeId2, side,objectrelationtypeId, other title
*
- * @param {String} pObjectTypeId the object type to load the relation types for.]
+ * @param {String} pRelationTypeId the RelationTypeId to load the full relation type for.
+ * @param {Boolean} [pDummyField=false] empty dummy-field needed for Type2Enabled_proxy-field in ObjectRelationType_entity to get changes of the Type2Enabled_proxy-field in the onUpdate Process
*
* @return {String[][]}
*/
-ObjectRelationUtils.getRelationType = function(pObjectTypeId)
+ObjectRelationUtils.getRelationType = function(pRelationTypeId, pDummyField)
{
- // TODO: funktionen evtl. zusammenfassen
- var sql = " from AB_OBJECTRELATIONTYPE main \n\
- left join AB_OBJECTRELATIONTYPE type2 on (type2.AB_OBJECTRELATIONTYPEID <> main.AB_OBJECTRELATIONTYPEID and type2.RELATION_TYPE = main.RELATION_TYPE) \n\
- where main.AB_OBJECTRELATIONTYPEID = ?"
-
- // full info:
- var relationType = (db.array(db.ROW,
- ["select main.AB_OBJECTRELATIONTYPEID, main.RELATION_TITLE, main.RELATION_TYPE, \n\
- case when type2.AB_OBJECTRELATIONTYPEID is null then 'same' \n\
- when main.SIDE = 1 then 'normal'\n\
- else 'reverse'\n\
- end direction,\n\
- main.HIERARCHY, \n\
- type2.OBJECT_TYPE objectType, \n\
- main.OBJECT_TYPE objectType, \n\
- -- typeId of Object2\n\
- case when main.SIDE = 1 then main.AB_OBJECTRELATIONTYPEID\n\
- else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId1,\n\
- -- typeId of Object1\n\
- case when type2.AB_OBJECTRELATIONTYPEID is null or main.SIDE = 2 then main.AB_OBJECTRELATIONTYPEID\n\
- else type2.AB_OBJECTRELATIONTYPEID end objectrelationtypeId2, \n\
- main.SIDE" + sql,
- [
- [pObjectTypeId, db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["AB_OBJECTRELATIONTYPEID"])[0]],
- ]
- ]));
-
- return relationType;
+ var data = ObjectRelationUtils.getPossibleRelationTypes(undefined, true, false, pRelationTypeId, pDummyField);
+ if (data.length > 0)
+ return data[0];
+ else
+ return [];
}
\ No newline at end of file
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index f3f2b67f1bd8e6dd44e583a7c2a9052d2e6ee5d7..bee94a606c965fe9d760c7ada0475ece7858fd8a 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -22,14 +22,28 @@ function AddressUtils(){}
* @param {String} pBuildingNo
* @param {String} pZipCode
* @param {String} pCity
+ * @param {String} pAddressIdentifier
*
* @return {String}
*/
-AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZipCode, pCity)
+AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier)
{
- return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity]);
+ return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity, pAddressIdentifier]);
};
+/**
+ * format the Address in one line as a sql statement
+ *
+ * @return {String} sql expression that can be used within a select statement
+ */
+AddressUtils.formatOnelineSql = function ()
+{
+ var maskingHelper = new SqlMaskingUtils();
+ var sqlExpression = maskingHelper.concat(["ADDRESS.COUNTRY", "ADDRESS.ADDRESS", "ADDRESS.BUILDINGNO", "ADDRESS.ZIP", "ADDRESS.CITY", "ADDRESS.ADDRIDENTIFIER"], ", ");
+ return sqlExpression;
+};
+
+
/**
* returns the formatted address by the ADDRESSID as one line
*
@@ -45,7 +59,7 @@ AddressUtils.getFormattedOnlineAddressById = function(pAddressId)
var addr = "";
if (addrId)
{
- var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY from ADDRESS ";
+ var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.ADDRIDENTIFIER from ADDRESS ";
var addrData = db.array(db.ROW,
SqlCondition.begin()
.andPrepare("ADDRESS.ADDRESSID", addrId)
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 52d5ba43de3bab4e62f9dd882bb9e4f165da0012..4e39fc12e4b74103b26e936065aa1367993c2427 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -3,6 +3,7 @@ import("system.db");
import("Keyword_lib");
import("KeywordRegistry_basic");
import("Contact_lib");
+import("Communication_lib");
function StandardObject (pObjectType, pObjectID, pScopeType, pScopeID) {
if (!this._isValidType("object", pObjectType))
@@ -245,8 +246,8 @@ StandardObject.prototype._getCompanyStandardAddress = function (pOrganisationID)
StandardObject.prototype._hasStandardCommunicationByMedium = function (pContactID, pMediumCategory) {
var dbResult = db.array(db.COLUMN, "select CHAR_VALUE from COMMUNICATION"
+ " left join AB_KEYWORD_ENTRY on KEYID = MEDIUM_ID"
- + " left join AB_KEYWORD_ATTRIBUTERELATION on AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRYID and AB_KEYWORD_ATTRIBUTE_ID = '7250ff28-1d48-41cc-bb36-8c33ace341bb'"
- + " where STANDARD = 1 and CONTACT_ID = '" + pContactID + "'");
+ + " left join AB_KEYWORD_ATTRIBUTERELATION on AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRYID"
+ + " where STANDARD = 1 and CONTACT_ID = '" + pContactID + "' and KEYID in ('" + CommUtil.getMediumIdsByCategory(pMediumCategory).join("', '") + "')");
return dbResult.indexOf(pMediumCategory) !== -1;
}
diff --git a/role/PROJECT_Administrator/PROJECT_Administrator.aod b/role/PROJECT_Administrator/PROJECT_Administrator.aod
new file mode 100644
index 0000000000000000000000000000000000000000..49266936de0d7480ee3bcb1c58c4c1d84b0e9a05
--- /dev/null
+++ b/role/PROJECT_Administrator/PROJECT_Administrator.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Administrator</name>
+ <title>Administrator</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Everyone/PROJECT_Everyone.aod b/role/PROJECT_Everyone/PROJECT_Everyone.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f14d5573e8636f6ba242e101e0debbafbd7e23ef
--- /dev/null
+++ b/role/PROJECT_Everyone/PROJECT_Everyone.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Everyone</name>
+ <title>Everyone</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_FieldStaff/PROJECT_FieldStaff.aod b/role/PROJECT_FieldStaff/PROJECT_FieldStaff.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5dafdb429b00e80d5240f8919a1c2807fffc6ad8
--- /dev/null
+++ b/role/PROJECT_FieldStaff/PROJECT_FieldStaff.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_FieldStaff</name>
+ <title>Field staff</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_HumanResources/PROJECT_HumanResources.aod b/role/PROJECT_HumanResources/PROJECT_HumanResources.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3f8a7fd6594d4240ab99cefaf74299c5e7f04150
--- /dev/null
+++ b/role/PROJECT_HumanResources/PROJECT_HumanResources.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_HumanResources</name>
+ <title>Human Resources</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Marketing/PROJECT_Marketing.aod b/role/PROJECT_Marketing/PROJECT_Marketing.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f28c9ae8f6709bd9259e4c27e44eff8960812378
--- /dev/null
+++ b/role/PROJECT_Marketing/PROJECT_Marketing.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Marketing</name>
+ <title>Marketing</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_OfficeStaff/PROJECT_OfficeStaff.aod b/role/PROJECT_OfficeStaff/PROJECT_OfficeStaff.aod
new file mode 100644
index 0000000000000000000000000000000000000000..9b70512446b0341a4d9faf6500f963b548f1c745
--- /dev/null
+++ b/role/PROJECT_OfficeStaff/PROJECT_OfficeStaff.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_OfficeStaff</name>
+ <title>Office staff</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Project/PROJECT_Project.aod b/role/PROJECT_Project/PROJECT_Project.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ecc4f7aae414ccb4a5666e7e85517cbb967e2d8a
--- /dev/null
+++ b/role/PROJECT_Project/PROJECT_Project.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Project</name>
+ <title>Project</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_ProjectManagement/PROJECT_ProjectManagement.aod b/role/PROJECT_ProjectManagement/PROJECT_ProjectManagement.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8016375c8bea14a5dcbf700fef8d73a2594f49eb
--- /dev/null
+++ b/role/PROJECT_ProjectManagement/PROJECT_ProjectManagement.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_ProjectManagement</name>
+ <title>Project Management</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Resource/PROJECT_Resource.aod b/role/PROJECT_Resource/PROJECT_Resource.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e6904e26c263922ce1ebc0fd76ffb6fd708170fd
--- /dev/null
+++ b/role/PROJECT_Resource/PROJECT_Resource.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Resource</name>
+ <title>Resource</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Service/PROJECT_Service.aod b/role/PROJECT_Service/PROJECT_Service.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7d586ddd20ca149d4848ed62e3ef19a747831c53
--- /dev/null
+++ b/role/PROJECT_Service/PROJECT_Service.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Service</name>
+ <title>Service</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>
diff --git a/role/PROJECT_Support/PROJECT_Support.aod b/role/PROJECT_Support/PROJECT_Support.aod
new file mode 100644
index 0000000000000000000000000000000000000000..39c787876828fb6d9faeb1e18e1270c6a862fad1
--- /dev/null
+++ b/role/PROJECT_Support/PROJECT_Support.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role 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/role/1.2.0">
+ <name>PROJECT_Support</name>
+ <title>Support</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+</role>