Skip to content
Snippets Groups Projects
Commit d5de513e authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

merged 2020.1 into #1059391-NotificationCenter

parents 71bc5f51 d1f9573d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 357 additions and 287 deletions
.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
+ 2
− 2
View file @ d5de513e
......@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
<renameColumn
columnDataType="CHAR(36)"
newColumnName="ORGANISATION_CONTACT_ID"
columnDataType="CHAR"
oldColumnName="ORGANISATION_ID"
newColumnName="ORGANISATION_CONTACT_ID"
tableName="VISITPLANENTRY"/>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml 0 → 100644
+ 10
− 0
View file @ d5de513e
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="s.listl" id="2f2d806c-8aab-42f0-91c2-c7d15322d89f">
<addColumn tableName="ADDRESS">
<column name="LAT" type="DECIMAL(10,8)"/>
<column name="LON" type="DECIMAL(11,8)"/>
</addColumn>
</changeSet>
</databaseChangeLog>
.liquibase/Data_alias/basic/2020.1.3/changelog.xml
+ 2
− 2
View file @ d5de513e
......@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
<include file="DeleteNotificationtypeKeywords.xml" relativeToChangelogFile="true" />
<!-- disabled the following script since it is WIP-->
<!--<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />-->
<include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
.liquibase/Data_alias/basic/_demoData/changelog.xml
+ 1
− 1
View file @ d5de513e
......@@ -50,5 +50,5 @@
<include file="generatedData/exporttemplatefield.xml" relativeToChangelogFile="true"/>
<include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
<include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
<include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>
<!--<include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>-->
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
+ 21
− 21
View file @ d5de513e
......@@ -6,8 +6,8 @@
<column name="AB_OBJECTRELATIONID" value="03c855e5-f236-4e39-b886-91832b3a53fb"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
<column name="OBJECT1_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="OBJECT2_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="OBJECT1_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
......@@ -20,43 +20,43 @@
<column name="AB_OBJECTRELATIONID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
<column name="OBJECT1_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="390cd4d2-8231-4dbc-ac9d-0ea7aecc6ef6"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="OBJECT1_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT1_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
<column name="AB_OBJECTRELATIONTYPE1" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
<column name="AB_OBJECTRELATIONTYPE2" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
<column name="OBJECT1_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT1_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
<column name="OBJECT1_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="OBJECT1_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
<column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
<column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
<column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="63ecd05d-f2e5-4957-a496-96a87451a78f"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="OBJECT1_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT2_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT2_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
......@@ -69,29 +69,29 @@
<column name="AB_OBJECTRELATIONID" value="c8aa4abb-a274-43d6-a067-ee935c443bfb"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
<column name="OBJECT1_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="OBJECT2_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="OBJECT1_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="cfbbce3e-1c0d-4d05-9ccf-8232f7eaaf02"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="OBJECT1_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="OBJECT2_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="d4454686-8d4e-42d9-9df8-61f19c69ce93"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
<column name="OBJECT1_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT2_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
<column name="OBJECT1_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
<column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT1_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
+ 1
− 1
View file @ d5de513e
......@@ -14,7 +14,7 @@
<insert tableName="campaignparticipantlog">
<column name="CAMPAIGNPARTICIPANTLOGID" value="732cb81a-5971-488c-82ea-cf0f3c7c9587"/>
<column name="CAMPAIGNPARTICIPANT_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
<column name="CAMPAIGNSTEP_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="CAMPAIGNSTEP_ID" value="0168b2eb-048e-4308-9c3c-f7ad9dcc9647"/>
<column name="CAMPAIGN_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
<column name="DATE_NEW" valueDate="2019-11-15T10:45:26"/>
<column name="USER_NEW" value="Admin"/>
......
.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
+ 1
− 1
View file @ d5de513e
......@@ -4,7 +4,7 @@
<delete tableName="dsgvoinfo"/>
<insert tableName="dsgvoinfo">
<column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
<column name="DATASOURCE" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="DATASOURCE" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="DSGVOINFOID" value="6b117aad-02f4-4746-985a-de931059b72e"/>
<column name="TRANSMISSION" value="DSGVONONE"/>
</insert>
......
.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
+ 20
− 20
View file @ d5de513e
......@@ -14,7 +14,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:17:51"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
<column name="NAME" value="Bucher Unternehmensgruppe"/>
<column name="ORGANISATIONID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="ORGANISATIONID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -25,7 +25,7 @@
<column name="INFO" value="Automobilvermietung"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Sevent SE"/>
<column name="ORGANISATIONID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
<column name="ORGANISATIONID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -35,7 +35,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
<column name="KIND" value="ORGMANUF"/>
<column name="NAME" value="Netro AG"/>
<column name="ORGANISATIONID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="ORGANISATIONID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -45,7 +45,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
<column name="KIND" value="ORGMANUF"/>
<column name="NAME" value="Aquire GmbH"/>
<column name="ORGANISATIONID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="ORGANISATIONID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -54,7 +54,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:28:03"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
<column name="NAME" value="Waken Neuser SE"/>
<column name="ORGANISATIONID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
<column name="ORGANISATIONID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -65,7 +65,7 @@
<column name="INFO" value="Die Transatlantik Logistic Gruppe ist ein Zusammenschluss aus mehreren Logistik Unternehmen. Über 3.000 Mitarbeiter sind bei dem europäischen Logistikriesen beschäftigt. "/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Transatlantik Logistics GmbH"/>
<column name="ORGANISATIONID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="ORGANISATIONID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -75,7 +75,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
<column name="KIND" value="ORGPARTNER"/>
<column name="NAME" value="Schild AG"/>
<column name="ORGANISATIONID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
<column name="ORGANISATIONID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -85,7 +85,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Firmengruppe Matthias Bogen"/>
<column name="ORGANISATIONID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
<column name="ORGANISATIONID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -95,7 +95,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="SuperBauer AG"/>
<column name="ORGANISATIONID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
<column name="ORGANISATIONID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -104,7 +104,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:21:07"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
<column name="NAME" value="Kronen AG"/>
<column name="ORGANISATIONID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="ORGANISATIONID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -114,7 +114,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="meine Firma"/>
<column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="ORGANISATIONID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -124,7 +124,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="JPM Touristik GmbH"/>
<column name="ORGANISATIONID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
<column name="ORGANISATIONID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -135,7 +135,7 @@
<column name="INFO" value="Die Industrial Steal AG ist einer der führenden Stahlhersteller weltweit. Das Unternehmen agiert mit über 5.000 Mitarbeitern in über 30 Ländern. "/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Industrial Steel AG"/>
<column name="ORGANISATIONID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="ORGANISATIONID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -145,7 +145,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Grobbe-Werk GmbH"/>
<column name="ORGANISATIONID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
<column name="ORGANISATIONID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -154,7 +154,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:24:53"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="MNF Versicherung"/>
<column name="ORGANISATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="ORGANISATIONID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -163,7 +163,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:21:44"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="Lichtenstein Document Solutions GmbH&#10;"/>
<column name="ORGANISATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="ORGANISATIONID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -172,7 +172,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:20:08"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="International Kältetechnik AG&#10;"/>
<column name="ORGANISATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="ORGANISATIONID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -182,7 +182,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Glob Group"/>
<column name="ORGANISATIONID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
<column name="ORGANISATIONID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -193,7 +193,7 @@
<column name="INFO" value="Die Skyscraper Bau GmbH zählt zu den führenden Unternehmen in der Baubranche. Mit ihrem breiten Portfolio überzeugen sie regelmäßig und diversifizieren sich von ihren Mitbewerbern. "/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Skyscraper Bau GmbH"/>
<column name="ORGANISATIONID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="ORGANISATIONID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......@@ -202,7 +202,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:25:36"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="Pichelmaier Financial AG&#13;&#10;"/>
<column name="ORGANISATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="ORGANISATIONID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
......
.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
+ 4
− 4
View file @ d5de513e
......@@ -9,7 +9,7 @@
<column name="TASK_ID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
</insert>
<insert tableName="tasklink">
<column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="44c1f582-7681-4f6f-b592-6221ebbdee52"/>
<column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
......@@ -21,7 +21,7 @@
<column name="TASK_ID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
</insert>
<insert tableName="tasklink">
<column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="6c2f84af-ff2e-4b70-b4d0-607a2bd0d941"/>
<column name="TASK_ID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
......@@ -33,13 +33,13 @@
<column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
</insert>
<insert tableName="tasklink">
<column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="b618fb87-d39d-41d8-be41-2b03bce29538"/>
<column name="TASK_ID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
</insert>
<insert tableName="tasklink">
<column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
<column name="TASK_ID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
......
.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+ 7
− 7
View file @ d5de513e
......@@ -15,7 +15,7 @@
<column name="ENTRYDATE" valueDate="2020-05-18"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
<column name="ORGANISATION_CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name ="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
......@@ -25,7 +25,7 @@
<column name="ENTRYDATE" valueDate="2020-05-19"/>
<column name="BEGIN_TIME" value="14:00"/>
<column name="END_TIME" value="17:00"/>
<column name="ORGANISATION_CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="ORGANISATION_CONTACT_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name ="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
......@@ -35,7 +35,7 @@
<column name="ENTRYDATE" valueDate="2020-05-19"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
<column name="ORGANISATION_CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="ORGANISATION_CONTACT_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name ="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
......@@ -45,7 +45,7 @@
<column name="ENTRYDATE" valueDate="2020-05-20"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
<column name="ORGANISATION_CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
<column name="ORGANISATION_CONTACT_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name ="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
......@@ -64,7 +64,7 @@
<column name="ENTRYDATE" valueDate="2020-05-25"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
<column name="ORGANISATION_CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
</insert>
......@@ -73,7 +73,7 @@
<column name="ENTRYDATE" valueDate="2020-05-26"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
<column name="ORGANISATION_CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="ORGANISATION_CONTACT_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
</insert>
......@@ -82,7 +82,7 @@
<column name="ENTRYDATE" valueDate="2020-05-27"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
<column name="ORGANISATION_CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="ORGANISATION_CONTACT_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
</insert>
......
aliasDefinition/Data_alias/Data_alias.aod
+ 28
− 0
View file @ d5de513e
......@@ -1143,6 +1143,34 @@
<title>Creation user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>LON</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="3" />
<size v="11" />
<scale v="8" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>LAT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="3" />
<size v="10" />
<scale v="8" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......
entity/Address_entity/Address_entity.aod
+ 20
− 0
View file @ d5de513e
......@@ -469,6 +469,18 @@
<name>ReplaceStandardAddress_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>LAT</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/lat/documentation.adoc</documentation>
<title>Latitude</title>
<contentType>NUMBER</contentType>
</entityField>
<entityField>
<name>LON</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/lon/documentation.adoc</documentation>
<title>Longitude</title>
<contentType>NUMBER</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -577,6 +589,14 @@
<name>COUNTRY.displayValue</name>
<expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/country.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LAT.value</name>
<recordfield>ADDRESS.LAT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>LON.value</name>
<recordfield>ADDRESS.LON</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Address_entity/documentation.adoc
+ 1
− 0
View file @ d5de513e
......@@ -7,6 +7,7 @@ an entity for logic behind a postal address
The entity manages storing postal addresses and provides features like validation.
Every `CONTACT` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
The geographical location of an address can be stored in the fields 'LAT' (latitude) and 'LON' (longitude).
Webservice Validation: See WsValidation_lib
To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
......
entity/Address_entity/entityfields/lat/documentation.adoc 0 → 100644
+ 5
− 0
View file @ d5de513e
= Latitude
The field "LAT" is used to store the geolocation latitude of the address.
Currently, the field is not filled with data, this will be implemented in the future.
\ No newline at end of file
entity/Address_entity/entityfields/lon/documentation.adoc 0 → 100644
+ 5
− 0
View file @ d5de513e
= Longitude
The field "LON" is used to store the geolocation longitude of the address.
Currently, the field is not filled with data, this will be implemented in the future.
\ No newline at end of file
entity/Contract_entity/recordcontainers/index/query.js
+ 15
− 14
View file @ d5de513e
......@@ -8,20 +8,21 @@ import("Sql_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
var querySelect = newSelect("CONTRACTID " //as "_uid_"
+ ", " + sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | ") //as "_title_"
+ ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'",
KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) //as "_description_"
+ ", CONTRACTCODE "
+ ", CONTACT.ORGANISATION_ID" //as CONTACT_ORG_ID
+ ", ORGANISATION.NAME" //as "CONTACT_ORG_ID.displayValue"
+ ", CONTRACT.CONTACT_ID")
.from("CONTRACT")
.join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID")
.join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
var querySelect = newSelect([
"CONTRACTID", //#UID
sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | "), //#TITLE
sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'",
KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]), //#DESCRIPTION
"CONTRACTCODE",
"CONTACT.ORGANISATION_ID", //CONTACT_ORG_ID
"ORGANISATION.NAME", //CONTACT_ORG_ID.displayValue
"CONTRACT.CONTACT_ID"
])
.from("CONTRACT")
.join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID")
.join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID");
if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) {
querySelect.where("CONTRACT.CONTRACTID", vars.get("$local.idvalue"), SqlBuilder.IN())
}
if (vars.exists("$local.idvalue"))
querySelect.whereIfSet("CONTRACT.CONTRACTID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect.toString());
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment