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

FSN#37004 ins_srtcontrole autorisatie

Browse Source 
svn path=/Website/branches/v2016.2/; revision=30916
This commit is contained in:
Jos Groot Lipman
2016-09-29 14:00:05 +00:00
parent 6df7d5922d
commit 09b7b9f6c6
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
APPL/INS/ins_search.asp
View File

@@ -300,20 +300,25 @@ var authparams = user.checkAutorisation(autfunction);
if (insInspect) // Ook inspectiezoekvelden if (insInspect) // Ook inspectiezoekvelden
{ {
if (ctrdisc_key > 0)
var ctr_disc_sql = " = " + ctrdisc_key;
else
ctr_disc_sql = " IN (SELECT w.ins_discipline_key"
+ " FROM fac_v_webgebruiker w"
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.prs_perslid_key = " + user_key + ")";
if (ctrdisc_key == -1) if (ctrdisc_key == -1)
{ {
// <!-- Controle Type --> // <!-- Controle Type -->
sql = "SELECT ins_discipline_key" sql = "SELECT ins_discipline_key"
+ " , ins_discipline_omschrijving" + " , ins_discipline_omschrijving"
+ " FROM ctr_discipline" + " FROM ctr_discipline"
+ " WHERE ins_discipline_key IN (SELECT w.ins_discipline_key" + " WHERE ins_discipline_key " + ctr_disc_sql
+ " FROM fac_v_webgebruiker w"
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.prs_perslid_key = " + user_key + ")"
+ " ORDER BY 2"; + " ORDER BY 2";
FCLTselector("ctr_discipline", FCLTselector("ctr_discipline",
sql, sql,
@@ -334,7 +339,8 @@ var authparams = user.checkAutorisation(autfunction);
+ " ins_srtcontrole_periode" + " ins_srtcontrole_periode"
+ " FROM ins_srtcontrole isc, ins_v_allsrtinstallatie asi" + " FROM ins_srtcontrole isc, ins_v_allsrtinstallatie asi"
+ " WHERE asi.ins_srtinstallatie_key = isc.ins_srtinstallatie_key" + " WHERE asi.ins_srtinstallatie_key = isc.ins_srtinstallatie_key"
+ " AND asi.niveau = isc.ins_srtcontrole_niveau" + " AND asi.niveau = isc.ins_srtcontrole_niveau"
+ " AND ctr_discipline_key " + ctr_disc_sql
+ " ORDER BY UPPER("+lcl.xsql('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key')+")"; + " ORDER BY UPPER("+lcl.xsql('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key')+")";
FCLTselector("sel_srtcontrole", FCLTselector("sel_srtcontrole",
sql, sql,
@@ -347,9 +353,10 @@ var authparams = user.checkAutorisation(autfunction);
+ " , COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)" + " , COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)"
+ " FROM ins_srtcontrole isc" + " FROM ins_srtcontrole isc"
+ " , ins_srtcontroledl_xcp xcp" + " , ins_srtcontroledl_xcp xcp"
+ " WHERE isc.ins_srtcontrole_key = xcp.ins_srtcontrole_key" + " WHERE isc.ins_srtcontrole_key = xcp.ins_srtcontrole_key(+)"
+ " AND ctr_discipline_key " + ctr_disc_sql
+ " AND COALESCE (xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep) IS NOT NULL" + " AND COALESCE (xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep) IS NOT NULL"
+ " ORDER BY UPPER (COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep))"; + " ORDER BY UPPER (COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep))";
FCLTselector("groep", FCLTselector("groep",
sql, sql,
{ label: L("ins_srtcontrole_groep"), { label: L("ins_srtcontrole_groep"),

4
APPL/INS/ins_xcp.asp
View File

@@ -638,8 +638,8 @@ if (srtcont_key > 0)
+ " , fac_functie f" + " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key " + " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'" + " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9" + " AND w.fac_gebruiker_prs_level_write < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9" + " AND w.fac_gebruiker_alg_level_write < 9"
+ " AND w.prs_perslid_key = " + user_key + ")" + " AND w.prs_perslid_key = " + user_key + ")"
+ " GROUP BY di.ins_srtcontrole_key" + " GROUP BY di.ins_srtcontrole_key"
+ " , di.ins_srtcontrole_omschrijving" + " , di.ins_srtcontrole_omschrijving"