diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod index a3e061e2370b6fb63d9937cf112d5c958de5231b..c22b1728ab31d9395dfada924c3e0d9c34ebf219 100644 --- a/entity/District_entity/District_entity.aod +++ b/entity/District_entity/District_entity.aod @@ -317,6 +317,10 @@ </entityParameter> </children> </entityConsumer> + <entityParameter> + <name>ResponsibleDistrictsOfCurrentUser_param</name> + <expose v="true" /> + </entityParameter> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/District_entity/recordcontainers/db/conditionProcess.js b/entity/District_entity/recordcontainers/db/conditionProcess.js index 8329757ab9cf0a152de9c68fc67fcb16ffcb921e..309e53986efe9dbb08ce02ffa3f0e2db7f03115a 100644 --- a/entity/District_entity/recordcontainers/db/conditionProcess.js +++ b/entity/District_entity/recordcontainers/db/conditionProcess.js @@ -1,8 +1,21 @@ +import("Employee_lib"); import("system.result"); import("system.vars"); import("Sql_lib"); -var onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param"); + +var responsibleDistrictsOfCurrentUser = vars.get("$param.ResponsibleDistrictsOfCurrentUser_param"); +var onlyResponsibleParam; +if(responsibleDistrictsOfCurrentUser == "true") +{ + onlyResponsibleParam = EmployeeUtils.getCurrentContactId(); + +} +else +{ + onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param"); +} + var cond = newWhere(); if (onlyResponsibleParam) { diff --git a/neonView/DistrictList_view/DistrictList_view.aod b/neonView/DistrictList_view/DistrictList_view.aod index 5306a53d6ea0762781f32bf0fc6666cd8f9e1df5..6adf2529d0b58f1abbe91be34fa99bf9cd917318 100644 --- a/neonView/DistrictList_view/DistrictList_view.aod +++ b/neonView/DistrictList_view/DistrictList_view.aod @@ -14,6 +14,12 @@ <title>District</title> </neonDashletCategory> </categories> + <parameters> + <neonDashletParameter> + <name>ResponsibleDistrictsOfCurrentUser_param</name> + <value>true</value> + </neonDashletParameter> + </parameters> </neonDashletConfiguration> </dashletConfigurations> <layout> diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod index 7e88568ac761047866b5e5bfc6167662e731a85b..110c8c17c7842d1c38cc806636021b5fa563cb90 100644 --- a/neonView/PersonMain_view/PersonMain_view.aod +++ b/neonView/PersonMain_view/PersonMain_view.aod @@ -44,11 +44,6 @@ <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>19a5f9ed-228d-4352-9e82-e7aa690648e9</name> <entityField>DistrictResponsibles</entityField>