From 54372015e4117782749852e03de6b94bca973b81 Mon Sep 17 00:00:00 2001 From: Markus Escher <m.escher@adito.de> Date: Mon, 10 Dec 2018 17:31:34 +0100 Subject: [PATCH] change ORGID to RELATIONID --- entity/Org_entity/Org_entity.aod | 2 +- .../{orgid => relationid}/valueProcess.js | 3 +- .../db_changes/data/example_org/ORG_gfk.xml | 6 +- .../data/example_org/ORG_kaeltetechnik.xml | 20 +++++++ .../data/example_org/ORG_lichtenstein.xml | 20 +++++++ .../db_changes/data/example_org/ORG_mass.xml | 60 ------------------- .../db_changes/data/example_org/ORG_mnf.xml | 20 +++++++ .../data/example_org/ORG_pichelmaier.xml | 20 +++++++ .../data/example_pers/PERS_muller.xml | 2 +- .../data/example_pers/PERS_pfiffig.xml | 2 +- .../data/example_pers/PERS_sommer.xml | 2 +- others/db_changes/masterChangelog.xml | 29 ++------- 12 files changed, 93 insertions(+), 93 deletions(-) rename entity/Org_entity/entityfields/{orgid => relationid}/valueProcess.js (69%) create mode 100644 others/db_changes/data/example_org/ORG_kaeltetechnik.xml create mode 100644 others/db_changes/data/example_org/ORG_lichtenstein.xml create mode 100644 others/db_changes/data/example_org/ORG_mnf.xml create mode 100644 others/db_changes/data/example_org/ORG_pichelmaier.xml diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod index 3a9ec8b288..ead5ce36a9 100644 --- a/entity/Org_entity/Org_entity.aod +++ b/entity/Org_entity/Org_entity.aod @@ -44,7 +44,6 @@ <entityField> <name>ORGID</name> <searchable v="false" /> - <valueProcess>%aditoprj%/entity/Org_entity/entityfields/orgid/valueProcess.js</valueProcess> </entityField> <entityField> <name>ORG_USER_EDIT</name> @@ -84,6 +83,7 @@ <entityField> <name>RELATIONID</name> <searchable v="false" /> + <valueProcess>%aditoprj%/entity/Org_entity/entityfields/relationid/valueProcess.js</valueProcess> </entityField> <entityField> <name>STATUS</name> diff --git a/entity/Org_entity/entityfields/orgid/valueProcess.js b/entity/Org_entity/entityfields/relationid/valueProcess.js similarity index 69% rename from entity/Org_entity/entityfields/orgid/valueProcess.js rename to entity/Org_entity/entityfields/relationid/valueProcess.js index 5be18c3983..c8bd25cbee 100644 --- a/entity/Org_entity/entityfields/orgid/valueProcess.js +++ b/entity/Org_entity/entityfields/relationid/valueProcess.js @@ -1,7 +1,6 @@ -import("system.util"); import("system.vars"); import("system.result"); import("system.neon"); if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW) - result.string(util.getNewUUID()); \ No newline at end of file + result.string(vars.get("$field.ORGID")); \ No newline at end of file diff --git a/others/db_changes/data/example_org/ORG_gfk.xml b/others/db_changes/data/example_org/ORG_gfk.xml index cab309e2ba..11417a36f7 100644 --- a/others/db_changes/data/example_org/ORG_gfk.xml +++ b/others/db_changes/data/example_org/ORG_gfk.xml @@ -2,7 +2,7 @@ <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> <changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb"> <insert tableName="ORG"> - <column name="ORGID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/> + <column name="ORGID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/> <column name="USER_NEW" value="admin"/> <column name="DATE_NEW" valueDate="2018-06-13T09:03:43"/> <column name="NAME" value="Gfk AG"/> @@ -13,7 +13,7 @@ <column name="RELATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/> <column name="USER_NEW" value="admin"/> <column name="DATE_NEW" valueDate="2018-06-13T09:03:43"/> - <column name="ORG_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/> + <column name="ORG_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/> <column name="LANGUAGE" value="de-DE"/> <column name="STATUS" valueNumeric="1"/> </insert> @@ -189,7 +189,7 @@ <delete tableName="ORG"> <where>ORGID = ?</where> <whereParams> - <param value="328b8a8b-c053-447a-bc69-17965b6a60ae" /> + <param value="b219b58a-f120-42d8-9a64-0b176501eac7" /> </whereParams> </delete> </rollback> diff --git a/others/db_changes/data/example_org/ORG_kaeltetechnik.xml b/others/db_changes/data/example_org/ORG_kaeltetechnik.xml new file mode 100644 index 0000000000..0faa7f6208 --- /dev/null +++ b/others/db_changes/data/example_org/ORG_kaeltetechnik.xml @@ -0,0 +1,20 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> +<changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb"> + <insert tableName="ORG"> + <column name="ORGID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/> + <column name="NAME" value="International Kältetechnik AG "/> + <column name="CUSTOMERCODE" value="00000004"/> + <column name="DATE_NEW" valueDate="2018-09-14T03:03:43"/> + <column name="USER_NEW" value="admin"/> + </insert> + <insert tableName="RELATION"> + <column name="RELATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/> + <column name="USER_NEW" value="admin"/> + <column name="DATE_NEW" valueDate="2018-09-14T03:03:43"/> + <column name="ORG_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/> + <column name="LANGUAGE" value="de-DE"/> + <column name="STATUS" valueNumeric="1"/> + </insert> +</changeSet> +</databaseChangeLog> diff --git a/others/db_changes/data/example_org/ORG_lichtenstein.xml b/others/db_changes/data/example_org/ORG_lichtenstein.xml new file mode 100644 index 0000000000..526db93d4f --- /dev/null +++ b/others/db_changes/data/example_org/ORG_lichtenstein.xml @@ -0,0 +1,20 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> +<changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb"> + <insert tableName="ORG"> + <column name="ORGID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/> + <column name="NAME" value="Lichtenstein Document Solutions GmbH "/> + <column name="CUSTOMERCODE" value="00000003"/> + <column name="DATE_NEW" valueDate="2018-09-13T03:03:43"/> + <column name="USER_NEW" value="admin"/> + </insert> + <insert tableName="RELATION"> + <column name="RELATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/> + <column name="USER_NEW" value="admin"/> + <column name="DATE_NEW" valueDate="2018-09-13T03:03:43"/> + <column name="ORG_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/> + <column name="LANGUAGE" value="de-DE"/> + <column name="STATUS" valueNumeric="1"/> + </insert> +</changeSet> +</databaseChangeLog> diff --git a/others/db_changes/data/example_org/ORG_mass.xml b/others/db_changes/data/example_org/ORG_mass.xml index 0ebd764f25..bab80b6d40 100644 --- a/others/db_changes/data/example_org/ORG_mass.xml +++ b/others/db_changes/data/example_org/ORG_mass.xml @@ -1,66 +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 author="j.goderbauer" id="ded084f6-174d-49a9-a829-f49590c1cc85"> - <insert tableName="ORG"> - <column name="ORGID" value="e5a0bbdb-6cc4-4889-97ab-dc5143fbeac2"/> - <column name="NAME" value="MNF Versicherung"/> - <column name="CUSTOMERCODE" value="00000002"/> - <column name="DATE_NEW" valueDate="2018-09-12T03:03:43"/> - <column name="USER_NEW" value="admin"/> - </insert> - <insert tableName="RELATION"> - <column name="RELATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/> - <column name="USER_NEW" value="admin"/> - <column name="DATE_NEW" valueDate="2018-09-12T03:03:43"/> - <column name="ORG_ID" value="e5a0bbdb-6cc4-4889-97ab-dc5143fbeac2"/> - <column name="LANGUAGE" value="de-DE"/> - <column name="STATUS" valueNumeric="1"/> - </insert> - <insert tableName="ORG"> - <column name="ORGID" value="d140e41d-9f56-4e74-9aac-f048e10bcea2"/> - <column name="NAME" value="Lichtenstein Document Solutions GmbH "/> - <column name="CUSTOMERCODE" value="00000003"/> - <column name="DATE_NEW" valueDate="2018-09-13T03:03:43"/> - <column name="USER_NEW" value="admin"/> - </insert> - <insert tableName="RELATION"> - <column name="RELATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/> - <column name="USER_NEW" value="admin"/> - <column name="DATE_NEW" valueDate="2018-09-13T03:03:43"/> - <column name="ORG_ID" value="d140e41d-9f56-4e74-9aac-f048e10bcea2"/> - <column name="LANGUAGE" value="de-DE"/> - <column name="STATUS" valueNumeric="1"/> - </insert> - <insert tableName="ORG"> - <column name="ORGID" value="d6a328ba-cb1f-4676-aa08-41762153876a"/> - <column name="NAME" value="International Kältetechnik AG "/> - <column name="CUSTOMERCODE" value="00000004"/> - <column name="DATE_NEW" valueDate="2018-09-14T03:03:43"/> - <column name="USER_NEW" value="admin"/> - </insert> - <insert tableName="RELATION"> - <column name="RELATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/> - <column name="USER_NEW" value="admin"/> - <column name="DATE_NEW" valueDate="2018-09-14T03:03:43"/> - <column name="ORG_ID" value="d6a328ba-cb1f-4676-aa08-41762153876a"/> - <column name="LANGUAGE" value="de-DE"/> - <column name="STATUS" valueNumeric="1"/> - </insert> - <insert tableName="ORG"> - <column name="ORGID" value="d9a4c4e4-fd34-4256-921d-dd681d862b42"/> - <column name="NAME" value="Pichelmaier Financial AG "/> - <column name="CUSTOMERCODE" value="00000005"/> - <column name="DATE_NEW" valueDate="2018-09-15T03:03:43"/> - <column name="USER_NEW" value="admin"/> - </insert> - <insert tableName="RELATION"> - <column name="RELATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/> - <column name="USER_NEW" value="admin"/> - <column name="DATE_NEW" valueDate="2018-09-15T03:03:43"/> - <column name="ORG_ID" value="d9a4c4e4-fd34-4256-921d-dd681d862b42"/> - <column name="LANGUAGE" value="de-DE"/> - <column name="STATUS" valueNumeric="1"/> - </insert> <insert tableName="ORG"> <column name="ORGID" value="f7310676-b0c6-412d-917f-3b21ad80d610"/> <column name="NAME" value="Sieber Kältetechnik "/> diff --git a/others/db_changes/data/example_org/ORG_mnf.xml b/others/db_changes/data/example_org/ORG_mnf.xml new file mode 100644 index 0000000000..c66c7434e9 --- /dev/null +++ b/others/db_changes/data/example_org/ORG_mnf.xml @@ -0,0 +1,20 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> +<changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb"> + <insert tableName="ORG"> + <column name="ORGID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/> + <column name="NAME" value="MNF Versicherung"/> + <column name="CUSTOMERCODE" value="00000002"/> + <column name="DATE_NEW" valueDate="2018-09-12T03:03:43"/> + <column name="USER_NEW" value="admin"/> + </insert> + <insert tableName="RELATION"> + <column name="RELATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/> + <column name="USER_NEW" value="admin"/> + <column name="DATE_NEW" valueDate="2018-09-12T03:03:43"/> + <column name="ORG_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/> + <column name="LANGUAGE" value="de-DE"/> + <column name="STATUS" valueNumeric="1"/> + </insert> +</changeSet> +</databaseChangeLog> diff --git a/others/db_changes/data/example_org/ORG_pichelmaier.xml b/others/db_changes/data/example_org/ORG_pichelmaier.xml new file mode 100644 index 0000000000..0d52d0a410 --- /dev/null +++ b/others/db_changes/data/example_org/ORG_pichelmaier.xml @@ -0,0 +1,20 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> +<changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb"> + <insert tableName="ORG"> + <column name="ORGID" value="fd082db5-be43-4219-a705-588f9c06e59b"/> + <column name="NAME" value="Pichelmaier Financial AG "/> + <column name="CUSTOMERCODE" value="00000005"/> + <column name="DATE_NEW" valueDate="2018-09-15T03:03:43"/> + <column name="USER_NEW" value="admin"/> + </insert> + <insert tableName="RELATION"> + <column name="RELATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/> + <column name="USER_NEW" value="admin"/> + <column name="DATE_NEW" valueDate="2018-09-15T03:03:43"/> + <column name="ORG_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/> + <column name="LANGUAGE" value="de-DE"/> + <column name="STATUS" valueNumeric="1"/> + </insert> +</changeSet> +</databaseChangeLog> diff --git a/others/db_changes/data/example_pers/PERS_muller.xml b/others/db_changes/data/example_pers/PERS_muller.xml index 07213ecdd3..ca0bf47bb7 100644 --- a/others/db_changes/data/example_pers/PERS_muller.xml +++ b/others/db_changes/data/example_pers/PERS_muller.xml @@ -17,7 +17,7 @@ <column name="LANGUAGE" value="de-DE"/> <column name="RELATIONID" value="73d72702-e7f5-11e8-9f32-f2801f1b9fd1"/> <column name="PERS_ID" value="73d72202-e7f5-11e8-9f32-f2801f1b9fd1"/> - <column name="ORG_ID" value="0"/> + <column name="ORG_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/> <column name="DATE_NEW" valueDate="2018-07-02T00:00:00"/> <column name="USER_NEW" value="admin"/> <column name="STATUS" valueNumeric="1"/> diff --git a/others/db_changes/data/example_pers/PERS_pfiffig.xml b/others/db_changes/data/example_pers/PERS_pfiffig.xml index 8825b71f09..7abd97f39e 100644 --- a/others/db_changes/data/example_pers/PERS_pfiffig.xml +++ b/others/db_changes/data/example_pers/PERS_pfiffig.xml @@ -17,7 +17,7 @@ <column name="LANGUAGE" value="de-DE"/> <column name="RELATIONID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/> <column name="PERS_ID" value="efc45d11-a40d-59e0-a24c-afcb6095d2cb"/> - <column name="ORG_ID" value="0"/> + <column name="ORG_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/> <column name="DATE_NEW" valueDate="2018-07-02T00:00:00"/> <column name="USER_NEW" value="admin"/> <column name="STATUS" valueNumeric="1"/> diff --git a/others/db_changes/data/example_pers/PERS_sommer.xml b/others/db_changes/data/example_pers/PERS_sommer.xml index 2d15acd600..5e30b999b9 100644 --- a/others/db_changes/data/example_pers/PERS_sommer.xml +++ b/others/db_changes/data/example_pers/PERS_sommer.xml @@ -17,7 +17,7 @@ <column name="LANGUAGE" value="de-DE"/> <column name="RELATIONID" value="56e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/> <column name="PERS_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/> - <column name="ORG_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/> + <column name="ORG_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/> <column name="DATE_NEW" valueDate="2018-07-02T00:00:00"/> <column name="USER_NEW" value="admin"/> <column name="STATUS" valueNumeric="1"/> diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml index 2f11bdfc70..d870801eb8 100644 --- a/others/db_changes/masterChangelog.xml +++ b/others/db_changes/masterChangelog.xml @@ -24,41 +24,22 @@ <include file="struct/create_countryinfo.xml"/> <include file="data/example_org/ORG_privat.xml"/> <include file="data/example_org/ORG_gfk.xml"/> + <include file="data/example_org/ORG_mnf.xml"/> + <include file="data/example_org/ORG_lichtenstein.xml"/> + <include file="data/example_org/ORG_kaeltetechnik.xml"/> + <include file="data/example_org/ORG_pichelmaier.xml"/> <include file="data/example_pers/PERS_pfiffig.xml"/> <include file="data/example_pers/PERS_sommer.xml"/> <include file="data/example_pers/PERS_muller.xml"/> <include file="data/example_pers/PERS_leicht.xml"/> <include file="data/example_pers/PERS_kanzler.xml"/> <include file="data/example_pers/PERS_gruener.xml"/> - <include file="data/example_pers/PERS_schmitt.xml"/> - <include file="data/example_pers/PERS_carolin.xml"/> - <include file="data/example_pers/PERS_braun.xml"/> - <include file="data/example_pers/PERS_saubermann.xml"/> - <include file="data/example_pers/PERS_rieber.xml"/> - <include file="data/example_pers/PERS_robert_sommer.xml"/> - <include file="data/example_pers/PERS_vogel.xml"/> - <include file="data/example_pers/PERS_haller.xml"/> - <include file="data/example_pers/PERS_petersen.xml"/> - <include file="data/example_pers/PERS_hausler.xml"/> - <include file="data/example_pers/PERS_hinterecker.xml"/> - <include file="data/example_pers/PERS_stone.xml"/> - <include file="data/example_pers/PERS_miller.xml"/> - <include file="data/example_pers/PERS_grenzer.xml"/> - <include file="data/example_pers/PERS_reisecker.xml"/> - <include file="data/example_pers/PERS_hugenmaier.xml"/> - <include file="data/example_pers/PERS_kormann.xml"/> - <include file="data/example_pers/PERS_thaler.xml"/> - <include file="data/example_pers/PERS_traum.xml"/> - <include file="data/example_pers/PERS_hamann.xml"/> - <include file="data/example_pers/PERS_walter.xml"/> - <include file="data/example_pers/PERS_andre.xml"/> <include file="data/example_contract/CONTRACT_42154311.xml"/> <include file="data/example_contract/CONTRACT_42154312.xml"/> <include file="data/example_contract/CONTRACT_42154313.xml"/> <include file="data/example_contract/CONTRACT_42154314.xml"/> <include file="data/example_contract/CONTRACT_42154315.xml"/> - <include file="data/example_product/PRODUCT_42154311.xml"/> - <include file="data/example_org/ORG_mass.xml"/> + <include file="data/example_product/PRODUCT_42154311.xml"/> <include file="data/example_salesproject/SALESPROJECT_gfk.xml"/> <include file="data/example_salesproject/SALESPROJECT_jkl.xml"/> <include file="data/example_history/example_history_gfk.xml"/> -- GitLab