From 547b6ea0f7a8bc895c33ad9f5d3da80b6a0eca97 Mon Sep 17 00:00:00 2001
From: Vinzent Broens <v.broens@adito.de>
Date: Mon, 15 Nov 2021 12:56:41 +0100
Subject: [PATCH] fix PersonEditServiceTicket_view
---
neonContext/Person/Person.aod | 4 +-
.../PersonEditServiceTicket_view.aod} | 43 ++++----
.../PersonEditSupportTicket_View.aod | 101 ------------------
.../SupportTicketEdit_view.aod | 2 +-
neonView/TaskEdit_view/TaskEdit_view.aod | 2 +-
5 files changed, 25 insertions(+), 127 deletions(-)
rename neonView/{PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod => PersonEditServiceTicket_view/PersonEditServiceTicket_view.aod} (68%)
delete mode 100644 neonView/PersonEditSupportTicket_View/PersonEditSupportTicket_View.aod
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 56284adde9..d3418a6c76 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -72,8 +72,8 @@
<view>PersonFilterOverlay_view</view>
</neonViewReference>
<neonViewReference>
- <name>f69538b6-2565-4dc9-a418-f5a35af4fec8</name>
- <view>PersonEditSupportTicket_View</view>
+ <name>c6d05179-57e7-4465-84fc-b28c6fc45c48</name>
+ <view>PersonEditServiceTicket_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod b/neonView/PersonEditServiceTicket_view/PersonEditServiceTicket_view.aod
similarity index 68%
rename from neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
rename to neonView/PersonEditServiceTicket_view/PersonEditServiceTicket_view.aod
index 34e32d3850..9c8b45924a 100644
--- a/neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod
+++ b/neonView/PersonEditServiceTicket_view/PersonEditServiceTicket_view.aod
@@ -1,19 +1,19 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>PersonEditServiceTicket_View</name>
+ <name>PersonEditServiceTicket_view</name>
<title>Contact & Serviceticket</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:TICKET</icon>
- <quickEntry v="9" />
+ <quickEntry v="10" />
<layout>
<headerFooterLayout>
<name>layout</name>
- <header>a6b55bfc-7b0c-4020-a78d-18ee9a1d2b26</header>
+ <header>b63cf1a8-dee4-4831-990c-3cfa81ffec38</header>
</headerFooterLayout>
</layout>
<children>
<neonViewReference>
- <name>929f4179-21b1-4246-a3f7-9fd8a1994592</name>
+ <name>b63cf1a8-dee4-4831-990c-3cfa81ffec38</name>
<entityField>DuplicatesPerson</entityField>
<view>DuplicateEdit_view</view>
</neonViewReference>
@@ -21,79 +21,78 @@
<name>Edit</name>
<editMode v="true" />
<showDrawer v="false" />
- <entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>d8d04e36-de46-48a3-994a-fa72d1f2ea89</name>
+ <name>bfca475d-d5f3-4989-9c97-97486858e535</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>7a647c90-3a1c-4f8d-9ecd-6bdf35ab2f80</name>
+ <name>892d8f91-26ac-4ca0-bf35-6b19fda97fa2</name>
<entityField>ORGANISATION_CONTACTID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>8f7b95e8-e15e-4d9b-960a-ecd142c71c9e</name>
+ <name>41db4934-7878-4d90-9f09-a8cce6c691ad</name>
<entityField>SALUTATION</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>413db0e9-00e8-4fd0-9bdc-8100509e622f</name>
+ <name>6161fa85-e38f-4dc4-b56a-99988975c7c9</name>
<entityField>TITLE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>ac32ab06-5b8f-460d-b136-384e879dd5c1</name>
+ <name>e6443a17-9131-43d7-b3f0-0b334e3f2839</name>
<entityField>FIRSTNAME</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>7222d731-80e0-4ef1-9761-e31dce4ed782</name>
+ <name>225ccde3-434b-4ece-adc2-9b063ad459a4</name>
<entityField>MIDDLENAME</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>a5ad1cc7-8e97-4828-8eaa-02d0876af35b</name>
+ <name>e9ca2fdd-2a28-4e83-8b5e-60b379796cf5</name>
<entityField>LASTNAME</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>35861eb9-59c3-4317-8164-ee7c53ce397e</name>
+ <name>67e4bb14-dcc6-40b5-91c8-2f18bc31b982</name>
<entityField>GENDER</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>74de507e-75e0-4957-a4fb-7070fa3c5a4a</name>
+ <name>76ac3cd7-ccc2-4901-a434-51b7f550cd58</name>
<entityField>DATEOFBIRTH</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>f8ec0e41-7ead-4c80-878c-df75ce5fce34</name>
+ <name>a126702e-c31b-4865-ac93-41fe2e1232ff</name>
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>16b3b029-eed3-45b7-94b0-446c89d70594</name>
+ <name>063539aa-124d-4d18-9065-56c8ed7ecbcb</name>
<entityField>DEPARTMENT</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>720ba110-faa2-4c64-823b-82a2089f337c</name>
+ <name>6b0b1a61-187c-40d6-a8a4-888705083850</name>
<entityField>CONTACTROLE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>7bad6e30-fda3-4ee4-858c-712a60437397</name>
+ <name>c3a10612-0cc4-427e-971b-e1d86826711e</name>
<entityField>POSITION</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
- <name>78dcb8dc-61c3-4cf9-a37b-28dbeeb27001</name>
+ <name>9c46713e-fb05-4f11-8c83-8c98577f5820</name>
<entityField>PersAddresses</entityField>
<view>AdressMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
- <name>fc64789f-b4c6-401e-86e3-f484451c7689</name>
+ <name>fe6dc272-17d6-4ef7-8647-76bd4db446c0</name>
<entityField>Communications</entityField>
<view>CommunicationMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
- <name>520f3056-2a24-4469-a86f-76ba80090829</name>
+ <name>55bfa833-0696-46da-a6d1-ae5f147ce881</name>
<entityField>Attributes</entityField>
<view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
- <name>dff4c15b-27f6-4c54-921a-d7bb8498a08f</name>
+ <name>384e523d-2706-458d-9435-bc95df295ec5</name>
<entityField>Servicetickets</entityField>
<view>SupportTicketMultiEdit_view</view>
</neonViewReference>
diff --git a/neonView/PersonEditSupportTicket_View/PersonEditSupportTicket_View.aod b/neonView/PersonEditSupportTicket_View/PersonEditSupportTicket_View.aod
deleted file mode 100644
index 34e32d3850..0000000000
--- a/neonView/PersonEditSupportTicket_View/PersonEditSupportTicket_View.aod
+++ /dev/null
@@ -1,101 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>PersonEditServiceTicket_View</name>
- <title>Contact & Serviceticket</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:TICKET</icon>
- <quickEntry v="9" />
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>a6b55bfc-7b0c-4020-a78d-18ee9a1d2b26</header>
- </headerFooterLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>929f4179-21b1-4246-a3f7-9fd8a1994592</name>
- <entityField>DuplicatesPerson</entityField>
- <view>DuplicateEdit_view</view>
- </neonViewReference>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <showDrawer v="false" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>d8d04e36-de46-48a3-994a-fa72d1f2ea89</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7a647c90-3a1c-4f8d-9ecd-6bdf35ab2f80</name>
- <entityField>ORGANISATION_CONTACTID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8f7b95e8-e15e-4d9b-960a-ecd142c71c9e</name>
- <entityField>SALUTATION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>413db0e9-00e8-4fd0-9bdc-8100509e622f</name>
- <entityField>TITLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ac32ab06-5b8f-460d-b136-384e879dd5c1</name>
- <entityField>FIRSTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7222d731-80e0-4ef1-9761-e31dce4ed782</name>
- <entityField>MIDDLENAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>a5ad1cc7-8e97-4828-8eaa-02d0876af35b</name>
- <entityField>LASTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>35861eb9-59c3-4317-8164-ee7c53ce397e</name>
- <entityField>GENDER</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>74de507e-75e0-4957-a4fb-7070fa3c5a4a</name>
- <entityField>DATEOFBIRTH</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f8ec0e41-7ead-4c80-878c-df75ce5fce34</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>16b3b029-eed3-45b7-94b0-446c89d70594</name>
- <entityField>DEPARTMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>720ba110-faa2-4c64-823b-82a2089f337c</name>
- <entityField>CONTACTROLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7bad6e30-fda3-4ee4-858c-712a60437397</name>
- <entityField>POSITION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>78dcb8dc-61c3-4cf9-a37b-28dbeeb27001</name>
- <entityField>PersAddresses</entityField>
- <view>AdressMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>fc64789f-b4c6-401e-86e3-f484451c7689</name>
- <entityField>Communications</entityField>
- <view>CommunicationMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>520f3056-2a24-4469-a86f-76ba80090829</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationMultiEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>dff4c15b-27f6-4c54-921a-d7bb8498a08f</name>
- <entityField>Servicetickets</entityField>
- <view>SupportTicketMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod b/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod
index 01cf28df8d..3915633357 100644
--- a/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod
+++ b/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod
@@ -4,7 +4,7 @@
<title>Service ticket</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:TICKET</icon>
- <quickEntry v="8" />
+ <quickEntry v="9" />
<layout>
<noneLayout>
<name>layout</name>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 88f578ec22..2977011577 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -4,7 +4,7 @@
<title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:TASKS</icon>
- <quickEntry v="7" />
+ <quickEntry v="8" />
<layout>
<boxLayout>
<name>layout</name>
--
GitLab