diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod index 136ad209d51d2aa4aa2062c4f1be559dbd5c2769..e27931c27462e8374e6fd3412a15c642e5d653c2 100644 --- a/entity/Organisation_entity/Organisation_entity.aod +++ b/entity/Organisation_entity/Organisation_entity.aod @@ -1035,6 +1035,10 @@ <entityField> <name>STANDARD_CITY</name> </entityField> + <entityField> + <name>ORGANISATION_REPORT_DATA</name> + <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js</valueProcess> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..83e68135601c412aa0c26368f31bcc5e3f14a18f --- /dev/null +++ b/entity/Organisation_entity/entityfields/organisation_report_data/valueProcess.js @@ -0,0 +1,9 @@ +import("system.vars"); +import("system.result"); +import("Organisation_lib"); + +var reportData = OrgUtils.buildOrgReport(vars.get("$field.ORGANISATIONID")) + +if (reportData != null) { + result.string(reportData[1]); +} \ No newline at end of file diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod index 53f784596ef6c257bb44f88e1b265a7aeb72242a..956f247c2277e85bca16c3278e05e6ef2d4bf434 100644 --- a/neonContext/Organisation/Organisation.aod +++ b/neonContext/Organisation/Organisation.aod @@ -55,5 +55,9 @@ <name>a97ac17d-171b-4c9a-83fa-bb5a466c7b20</name> <view>OrganisationDuplicateEditview_view</view> </neonViewReference> + <neonViewReference> + <name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name> + <view>OrganisationReport_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/OrganisationReport_view/OrganisationReport_view.aod b/neonView/OrganisationReport_view/OrganisationReport_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..0853ebf242c635392adf93b2b8cc412598f1a33b --- /dev/null +++ b/neonView/OrganisationReport_view/OrganisationReport_view.aod @@ -0,0 +1,17 @@ +<?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.4" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.4"> + <name>OrganisationReport_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <reportViewTemplate> + <name>Report</name> + <reportData>ORGANISATION_REPORT_DATA</reportData> + <entityField>#ENTITY</entityField> + </reportViewTemplate> + </children> +</neonView>