[Projekt: xRM-Service][TicketNr.: 2001395][Schnellerfassung fixen]

entity/Person_entity/Person_entity.aod

@@ -1371,7 +1371,7 @@
       <iconId>VAADIN:TICKET</iconId>
     </entityActionField>
     <entityConsumer>
-      <name>Serviceticket</name>
+      <name>Servicetickets</name>
       <dependency>
         <name>dependency</name>
         <entityName>SupportTicket_entity</entityName>
@@ -1380,11 +1380,11 @@
       <children>
         <entityParameter>
           <name>ReturnEmpty_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/serviceticket/children/returnempty_param/valueProcess.js</valueProcess>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js</valueProcess>
         </entityParameter>
         <entityParameter>
           <name>TaskRequestorContactId_param</name>
-          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/serviceticket/children/taskrequestorcontactid_param/valueProcess.js</valueProcess>
+          <valueProcess>%aditoprj%/entity/Person_entity/entityfields/servicetickets/children/taskrequestorcontactid_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
     </entityConsumer>

entity/QuickEntry_entity/QuickEntry_entity.aod

@@ -228,6 +228,24 @@
       <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/personcontactids_param/valueProcess.js</valueProcess>
       <documentation>%aditoprj%/entity/QuickEntry_entity/entityfields/personcontactids_param/documentation.adoc</documentation>
     </entityParameter>
+    <entityConsumer>
+      <name>Servicetickets</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>SupportTicket_entity</entityName>
+        <fieldName>SupportTickets</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>TaskRequestorContactId_param</name>
+          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/servicetickets/children/taskrequestorcontactid_param/valueProcess.js</valueProcess>
+        </entityParameter>
+        <entityParameter>
+          <name>ReturnEmpty_param</name>
+          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js

+import("system.result");
+
+
+result.string( false);
\ No newline at end of file

entity/QuickEntry_entity/entityfields/servicetickets/children/taskrequestorcontactid_param/valueProcess.js

+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.UID"));
\ No newline at end of file

entity/SupportTicket_entity/grantDeleteProcess.js

@@ -2,13 +2,13 @@ import("system.result");
 import("system.vars");
 import("system.result");
 import("KeywordRegistry_basic");
+import("system.neon");
 
-if (vars.get ("$field.TASK_STATUS") != $KeywordRegistry.taskStatus$ended())
+if (vars.get ("$field.TASK_STATUS") != $KeywordRegistry.taskStatus$ended() && vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
 {
    result.string(false); 
 }
 else
 {
    result.string(true); 
-}
-
+}
\ No newline at end of file

neonView/PersonEditServiceTicket_View/PersonEditServiceTicket_View.aod

@@ -6,92 +6,95 @@
   <icon>VAADIN:TICKET</icon>
   <quickEntry v="9" />
   <layout>
-    <boxLayout>
+    <headerFooterLayout>
       <name>layout</name>
-    </boxLayout>
+      <header>a6b55bfc-7b0c-4020-a78d-18ee9a1d2b26</header>
+    </headerFooterLayout>
   </layout>
   <children>
     <neonViewReference>
-      <name>929f4179-21b1-4246-a3f7-9fd8a1994592</name>
-      <entityField>Duplicates</entityField>
+      <name>a6b55bfc-7b0c-4020-a78d-18ee9a1d2b26</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>6840caee-2c3b-41d1-ae41-7af5ad69ebfd</name>
+          <name>d8d04e36-de46-48a3-994a-fa72d1f2ea89</name>
           <entityField>LANGUAGE</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>de5463b3-96a3-4308-a4ef-e30769b60fd0</name>
+          <name>7a647c90-3a1c-4f8d-9ecd-6bdf35ab2f80</name>
           <entityField>ORGANISATION_CONTACTID</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>8ffede76-3c48-4bb6-b9ca-cfeafe4b6367</name>
+          <name>8f7b95e8-e15e-4d9b-960a-ecd142c71c9e</name>
           <entityField>SALUTATION</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>3d2ce75f-bd3d-4a59-aa2f-6568c6c939c0</name>
+          <name>413db0e9-00e8-4fd0-9bdc-8100509e622f</name>
           <entityField>TITLE</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>8a220c81-e598-4fd9-9f55-e6473e6330ca</name>
+          <name>ac32ab06-5b8f-460d-b136-384e879dd5c1</name>
           <entityField>FIRSTNAME</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>5278489b-f0dd-4f77-bba3-1964553aedc8</name>
+          <name>7222d731-80e0-4ef1-9761-e31dce4ed782</name>
           <entityField>MIDDLENAME</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>7f4c81d5-85e7-4ef0-9184-db27af81c700</name>
+          <name>a5ad1cc7-8e97-4828-8eaa-02d0876af35b</name>
           <entityField>LASTNAME</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>3be97ef2-4b3c-48c3-a6aa-116005201eaf</name>
+          <name>35861eb9-59c3-4317-8164-ee7c53ce397e</name>
           <entityField>GENDER</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>8b6970d1-5960-4cdd-9cbb-b77bd766cb77</name>
+          <name>74de507e-75e0-4957-a4fb-7070fa3c5a4a</name>
           <entityField>DATEOFBIRTH</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>413d6a67-e5c8-4766-9864-daeea5d21861</name>
+          <name>f8ec0e41-7ead-4c80-878c-df75ce5fce34</name>
           <entityField>STATUS</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>ebd212b6-8c43-430f-806c-5cf141d111c9</name>
+          <name>16b3b029-eed3-45b7-94b0-446c89d70594</name>
           <entityField>DEPARTMENT</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>f4e16d1a-bacf-43c6-9d51-86334e734315</name>
+          <name>720ba110-faa2-4c64-823b-82a2089f337c</name>
           <entityField>CONTACTROLE</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>4e75b44d-0b7d-434f-8111-50386e52820f</name>
+          <name>7bad6e30-fda3-4ee4-858c-712a60437397</name>
           <entityField>POSITION</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
-      <name>fcdc2c2e-5853-41a7-924b-23b4fa10efa1</name>
+      <name>78dcb8dc-61c3-4cf9-a37b-28dbeeb27001</name>
       <entityField>PersAddresses</entityField>
       <view>AdressMultiEdit_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>dd9b747d-92a1-4de0-9bd6-7c58678ef36d</name>
+      <name>fc64789f-b4c6-401e-86e3-f484451c7689</name>
       <entityField>Communications</entityField>
       <view>CommunicationMultiEdit_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>03bcf168-d5ef-4732-8622-00358954cbb1</name>
+      <name>520f3056-2a24-4469-a86f-76ba80090829</name>
       <entityField>Attributes</entityField>
       <view>AttributeRelationMultiEdit_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>dff4c15b-27f6-4c54-921a-d7bb8498a08f</name>
-      <entityField>Serviceticket</entityField>
+      <entityField>Servicetickets</entityField>
       <view>SupportTicketMultiEdit_view</view>
     </neonViewReference>
   </children>

neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod

@@ -78,5 +78,10 @@
       <entityField>Activities</entityField>
       <view>ActivityMultiEdit_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>ad2e41fc-e1e3-4907-9d23-7f3e3c4a026b</name>
+      <entityField>Servicetickets</entityField>
+      <view>SupportTicketMultiEdit_view</view>
+    </neonViewReference>
   </children>
 </neonView>