admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARAI#40661: ARAI - Is combinatie MLDBOF en behandelaar bij opdracht wel.

Browse Source 
svn path=/Website/trunk/; revision=37694
This commit is contained in:
Maykel Geerdink
2018-04-18 11:17:34 +00:00
parent 4920506548
commit 7d30cfad0c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MLD/opdr_search.asp
View File

@@ -604,7 +604,7 @@ oRs.close();
// <!-- Behandelaar -->
if (planbord)
{
var filtClause = getFiltClausePersoon(justClose && exhandler? "BEHOC" : "BEHO", {});
var filtClause = getFiltClausePersoon(justClose && exhandler? "BEHOC" : "BEHO", {planbord: true, justClose: justClose});
// Dan alleen die personen tonen die vallen onder de afdelingen die behoren bij de kostenplaatsen waarvoor ik gemandateerd ben
if (authparams.PRSreadlevel == 0) // Bedrijf niveau zit niet in prs_v_afdeling_familie

14
APPL/Shared/Suggest/persoonFilter.inc
View File

@@ -66,11 +66,17 @@ function getFiltClausePersoon(pfiltcode, params)
lfiltClause = " AND p.prs_perslid_key IN (SELECT prs_perslid_key"
+ " FROM mld_opdr o"
+ " WHERE prs_perslid_key IS NOT NULL"
+ (params.planbord
? " AND o.mld_statusopdr_key IN (3, 4, 5, 8, 10)"
: "")
+ (params.justClose
? " AND (o.mld_statusopdr_key NOT IN (3, 10) OR o.mld_statusopdr_key_refiat IS NOT NULL)"
: "")
+ (pfiltcode == 'BEHOC'
? " AND o.mld_uitvoerende_keys in (SELECT prs_bedrijf_key"
+ " FROM prs_contactpersoon cp"
+ " WHERE cp.prs_contactpersoon_verwijder is null"
+ " AND cp.prs_perslid_key = " + user_key + ")"
? " AND o.mld_uitvoerende_keys IN (SELECT prs_bedrijf_key"
+ " FROM prs_contactpersoon cp"
+ " WHERE cp.prs_contactpersoon_verwijder is null"
+ " AND cp.prs_perslid_key = " + user_key + ")"
: "")
+ " )";
break;