Merge branch '#1065531-FixDistrictsPreviewResponsibles' into '2020.2.0'

#1065531 fix districts preview responsibles

See merge request xrm/basic!402

entity/DistrictResponsible_entity/DistrictResponsible_entity.aod

@@ -25,6 +25,7 @@
       <consumer>Employees</consumer>
       <linkedContext>Person</linkedContext>
       <selectionMode>SINGLE</selectionMode>
+      <displayValueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>DISTRICT_ID</name>
@@ -148,6 +149,7 @@
       <name>departmentAttributeName</name>
       <title>Department</title>
       <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/departmentattributename/valueProcess.js</valueProcess>
     </entityField>
     <entityProvider>
@@ -262,10 +264,6 @@
           <recordfield>DISTRICTRESPONSIBLE.DATE_NEW</recordfield>
           <isFilterable v="true" />
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>EMPLOYEE_CONTACT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DEPARTMENT_ATTRIBUTE_ID.displayValue</name>
           <recordfield>DISTRICTRESPONSIBLE.DEPARTMENT_ATTRIBUTE_ID</recordfield>
@@ -282,6 +280,10 @@
           <name>DISTRICT_ID.displayValue</name>
           <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/district_id.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>EMPLOYEE_CONTACT_ID.displayValue</name>
+          <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js

+import("system.result");
+import("system.neon");
+import("system.vars");
+
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file

entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js

+import("system.result");
+import("system.vars");
+import("Contact_lib");
+
+result.string(ContactUtils.getFullTitleByContactId(vars.get("$field.EMPLOYEE_CONTACT_ID"), false));
\ No newline at end of file

entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js

@@ -8,9 +8,4 @@ var contact = Contact.createWithColumnPreset();
 var renderer = new ContactTitleRenderer(contact, ContactTitleRenderer.OPTIONS.NoOption);
 var selectExpression = renderer.asSql();
 
-result.string(newSelect(selectExpression)
-                .from("CONTACT")
-                .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
-                .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
-                .where("CONTACT.CONTACTID = DISTRICTRESPONSIBLE.EMPLOYEE_CONTACT_ID")
-                .toString());
+result.string(newSelect(selectExpression));
\ No newline at end of file

neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod

@@ -17,7 +17,7 @@
         <neonTitledListTableColumn>
           <name>007d67c4-146b-4202-a677-4390059b4a0a</name>
           <entityField>EMPLOYEE_CONTACT_ID</entityField>
-          <fullWidth v="false" />
+          <fullWidth v="true" />
         </neonTitledListTableColumn>
       </columns>
     </titledListViewTemplate>