#1058859: Removed departmentAttributeName field from multiEditView (department...

#1058859: Removed departmentAttributeName field from multiEditView (department is now visible in EmployeeLookup_view)
#1058859: Set EMPLOYEE_CONTACT_ID to full width.

entity/DistrictResponsible_entity/entityfields/departmentattributename/documentation.adoc

+Used in DistrictPreview_view and also in the contentProcess of the JDito RC from Member_entity.
\ No newline at end of file

entity/District_entity/District_entity.aod

@@ -80,6 +80,7 @@
       <name>ResponsibleDistricts</name>
       <lookupIdfield>DISTRICTID</lookupIdfield>
       <documentation>%aditoprj%/entity/District_entity/entityfields/responsibledistricts/documentation.adoc</documentation>
+      <titlePlural>Responsible Districts</titlePlural>
       <recordContainer>db</recordContainer>
       <dependencies>
         <entityDependency>

entity/Person_entity/Person_entity.aod

@@ -1313,6 +1313,8 @@
     </entityProvider>
     <entityConsumer>
       <name>Districts</name>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/districts/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>District_entity</entityName>

entity/Person_entity/entityfields/districts/stateProcess.js

+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Employee_lib");
+
+
+if (EmployeeUtils.isUser(vars.get("$field.CONTACTID")))
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file

neonContext/Person/Person.aod

@@ -63,9 +63,5 @@
       <name>2a6c44be-53e2-469e-84b3-615841bd4430</name>
       <view>PersonDuplicateEditview_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>93a274f8-8d73-4e18-b77c-a7eda6028116</name>
-      <view>PersonDistricts_view</view>
-    </neonViewReference>
   </references>
 </neonContext>

neonView/DistrictResponsibleMultiEdit_view/DistrictResponsibleMultiEdit_view.aod

@@ -13,13 +13,10 @@
       <name>genericViewTemplate</name>
       <entityField>#ENTITY</entityField>
       <columns>
-        <neonGenericMultipleTableColumn>
-          <name>e1988e26-68a4-4a96-a484-4d9f7506505d</name>
-          <entityField>departmentAttributeName</entityField>
-        </neonGenericMultipleTableColumn>
         <neonGenericMultipleTableColumn>
           <name>2c588be3-a0df-4c3f-9632-574e5b975073</name>
           <entityField>EMPLOYEE_CONTACT_ID</entityField>
+          <fullWidth v="true" />
         </neonGenericMultipleTableColumn>
       </columns>
     </genericMultipleViewTemplate>

neonView/EmployeeLookup_view/EmployeeLookup_view.aod

@@ -24,6 +24,10 @@
           <name>7c1a3e27-e7da-4e50-bef0-e987d9e1c4c8</name>
           <entityField>LASTNAME</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>bda739a9-24b9-4f58-8a28-9eed99f8bcc2</name>
+          <entityField>DEPARTMENT</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>

neonView/PersonDistricts_view/PersonDistricts_view.aod

-<?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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>PersonDistricts_view</name>
-  <title>Responsible Districts</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <layout>
-    <noneLayout>
-      <name>layout</name>
-    </noneLayout>
-  </layout>
-  <children>
-    <neonViewReference>
-      <name>c461b0a2-316c-481f-9697-0b24adbcf8bc</name>
-      <entityField>Districts</entityField>
-      <view>DistrictList_view</view>
-    </neonViewReference>
-  </children>
-</neonView>

neonView/PersonMain_view/PersonMain_view.aod

@@ -44,16 +44,16 @@
       <entityField>#ENTITY</entityField>
       <view>PersonAttributeRestriction_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>1f6cf193-61c3-4681-bafd-c7f9c906cdf6</name>
+      <entityField>Districts</entityField>
+      <view>DistrictList_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
       <entityField>Documents</entityField>
       <view>DocumentFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>f826f154-bf7f-4c7e-9ce2-3105cc629851</name>
-      <entityField>#ENTITY</entityField>
-      <view>PersonDistricts_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
       <entityField>LogHistories</entityField>