diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod index bffe4b62579551292476806217a2fc719a0d038d..539afbb9acee2eb62046f015b99e1295f43464db 100644 --- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod +++ b/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> diff --git a/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js b/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..916fbbd300758fdb197ee31bb0958a12d87f6670 --- /dev/null +++ b/entity/DistrictResponsible_entity/entityfields/departmentattributename/stateProcess.js @@ -0,0 +1,9 @@ +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 diff --git a/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js b/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..edf41e1e25b2d2bdbf2228fc282340a351439bee --- /dev/null +++ b/entity/DistrictResponsible_entity/entityfields/employee_contact_id/displayValueProcess.js @@ -0,0 +1,5 @@ +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 diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js index 2dd8e6a8686055b27892337fab5ddaf48e405703..b00816d2ee0ad97051b1eea0039089480095d0e6 100644 --- a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js +++ b/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 diff --git a/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod b/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod index 7e50b1a7240dcc1ac96b3236f2c5811c2b31a705..c1deba893d69a31f4656fc0959d7510422c5171a 100644 --- a/neonView/DistrictResponsiblePreviewList_view/DistrictResponsiblePreviewList_view.aod +++ b/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>