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

TAYL#80979 Eigen Objecten zichtbaar in ins_list.asp

Browse Source 
svn path=/Website/trunk/; revision=64447
This commit is contained in:
Erik Groener
2024-04-30 09:12:17 +00:00
parent 812291e273
commit 0001cd98c3
1 changed files with 29 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
APPL/PDA/ins_list.asp
View File

@@ -85,7 +85,7 @@ if (disc_key > -1)
var ins_key = getQParamInt("ins_key", -1);
var mld_key = getQParamInt("mld_key", -1);
var afd_key = getQParamInt("afd_key", -1);
var prs_key = getQParamInt("prs_key", -1);
var prs_key = getQParamInt("prs_key", getQParamInt("self", 0) == 1 ? user_key : -1);
var ins_parent_key = getQParamInt("ins_parent_key", -1);
var grp_sel = getQParamUTF8("grp", "");
var all_grp = getQParam("cnd", (S("cnd_gebreken_srtdisc_key") > -1 ? "1" : "0")) == "1";
@@ -193,6 +193,7 @@ var canAdd = authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9;
+ "&grp=" + safe.urlUTF8(oRs(fronto ? "ins_groep_oms" : "ins_srtgroep_omschrijving").Value)
+ (ruimte_key>-1 ? "&ruimte_key="+ ruimte_key : "")
+ (disc_key>-1 ? "&disc="+ disc_key : "")
+ (prs_key>-1 ? "&prs_key="+ prs_key : "")
+ (return_from.length ? "&return_from="+safe.url(return_from) : "");
}
else
@@ -261,15 +262,15 @@ var canAdd = authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9;
+ "&nbsp;" + safe.html(L("lcl_ins_deel_mjb_score1") + ": " + oRs("ins_deel_mjb_score1").Value) + "<br>";
}
var plaats_eigenaar_icon = "";
switch (oRs("ins_alg_ruimte_type").Value)
{
case "R" : plaats_eigenaar_icon = I("fa-dot-circle") + "&nbsp;"; break;
case "T" : plaats_eigenaar_icon = I("fa-road") + "&nbsp;"; break;
case "W" : plaats_eigenaar_icon = I("fa-user-circle") + "&nbsp;"; break;
case "A" : plaats_eigenaar_icon = I("fa-users") + "&nbsp;"; break;
case "P" : plaats_eigenaar_icon = I("fa-user") + "&nbsp;"; break;
}
return "<div class='listbodykop'>" + remark + plaats_eigenaar_icon + safe.html(oRs("plaats_eigenaar").Value) + "</div>";
switch (oRs("ins_alg_ruimte_type").Value)
{
case "R" : plaats_eigenaar_icon = I("fa-dot-circle") + "&nbsp;"; break;
case "T" : plaats_eigenaar_icon = I("fa-road") + "&nbsp;"; break;
case "W" : plaats_eigenaar_icon = I("fa-user-circle") + "&nbsp;"; break;
case "A" : plaats_eigenaar_icon = I("fa-users") + "&nbsp;"; break;
case "P" : plaats_eigenaar_icon = I("fa-user") + "&nbsp;"; break;
}
return "<div class='listbodykop'>" + remark + plaats_eigenaar_icon + safe.html(oRs("plaats_eigenaar").Value) + "</div>";
}
};
function fnAside(oRs)
@@ -589,9 +590,9 @@ var canAdd = authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9;
// Persoonsgebonden objecten
// Neemt de ORG-scope mee, maar ook de plaatscope via de werkplekken:
// als de persoon binnen de scope een wp heeft, dan wordt die getoond
var sqlP = " SELECT ins_deel_omschrijving"
+ " , ins_srtdeel_key"
+ " , ins_deel_opmerking"
var sqlP = " SELECT id.ins_deel_omschrijving"
+ " , id.ins_srtdeel_key"
+ " , id.ins_deel_opmerking"
+ " , pf.prs_perslid_naam_friendly plaats_eigenaar"
+ " , id.ins_deel_key"
+ " , (SELECT MAX('R') FROM res_deel rd WHERE rd.res_deel_verwijder IS NULL AND rd.res_ins_deel_key = id.ins_deel_key) reserveerbaar"
@@ -601,45 +602,19 @@ var canAdd = authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9;
+ " , id.ins_deel_mjb_score2"
+ " FROM ins_deel id"
+ " , prs_v_perslid_fullnames_all pf"
+ " , prs_perslid p"
+ " , prs_bedrijf b"
+ " , prs_v_afdeling_boom boom"
+ " ,prs_perslidwerkplek pwp"
+ " ,alg_v_onrgoed_boom aog"
+ " ,prs_werkplek w"
+ " ,alg_locatie l"
+ " ,alg_district di"
+ " WHERE id.ins_alg_ruimte_key = pf.prs_perslid_key"
+ " AND id.ins_alg_ruimte_type = 'P'"
+ " AND p.prs_afdeling_key = boom.prs_afdeling_key"
+ " AND boom.prs_bedrijf_key = b.prs_bedrijf_key"
+ " AND p.prs_perslid_key = pf.prs_perslid_key"
+ " AND p.prs_perslid_key = pwp.prs_perslid_key"
+ " AND pwp.prs_werkplek_key = w.prs_werkplek_key"
+ " AND w.prs_alg_ruimte_key = aog.alg_ruimte_key"
+ " AND aog.alg_locatie_key = l.alg_locatie_key"
+ " AND l.alg_district_key = di.alg_district_key"
+ " AND id.ins_deel_verwijder IS NULL"
+ " AND (id.ins_deel_vervaldatum IS NULL OR id.ins_deel_vervaldatum > TRUNC(SYSDATE))"
+ " AND id.ins_deel_parent_key " + ((ins_parent_key > -1)? " = " + ins_parent_key : "IS NULL")
+ ((prs_key > -1) ? " AND id.ins_alg_ruimte_key = " + prs_key : "")
+ ((locatie_key > -1) ? " AND aog.alg_locatie_key = " + locatie_key : "")
+ ((gebouw_key > -1) ? " AND aog.alg_gebouw_key = " + gebouw_key : "")
+ ((verdieping_key > -1) ? " AND aog.alg_verdieping_key = " + verdieping_key : "")
+ ((ruimte_key > -1) ? " AND aog.alg_ruimte_key = " + ruimte_key : "");
sqlP = discx3d (sqlP,
"id.ins_discipline_key",
"di.alg_regio_key",
"l.alg_district_key",
"aog.alg_locatie_key",
"aog.alg_gebouw_key",
"aog.alg_verdieping_key",
"aog.alg_ruimte_key",
"b.prs_bedrijf_key",
"boom.prs_afdeling_key",
autfunction,
(disc_key != -1 ? [disc_key] : []),
1);
+ " AND id.ins_alg_ruimte_key = " + prs_key
+ " AND id.ins_discipline_key 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_INSMIN'"
+ " AND w.prs_perslid_key = " + prs_key
+ ")";
sql = "SELECT recs.* "
+ " , " + lcl.xsqla('sd.ins_srtdeel_omschrijving', 'sd.ins_srtdeel_key')
@@ -665,18 +640,19 @@ var canAdd = authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9;
+ " AND md.ins_srtdiscipline_key = " + S("cnd_gebreken_srtdisc_key") + ")" // gebrekmelding
+ " gebrekdatum"
+ " FROM ("
+ sqlR
+ (metWerkplekgebonden ? " UNION " + sqlW : "")
+ (metPersoonsgebonden ? " UNION " + sqlP : "")
+ (metAfdelingsgebonden ? " UNION " + sqlA : "")
+ (metTerreingebonden ? " UNION " + sqlT : "")
+ ") recs"
+ sqlR
+ (metWerkplekgebonden ? " UNION " + sqlW : "")
+ (metPersoonsgebonden ? " UNION " + sqlP : "")
+ (metAfdelingsgebonden ? " UNION " + sqlA : "")
+ (metTerreingebonden ? " UNION " + sqlT : "")
+ " ) recs"
+ " , ins_srtdeel sd"
+ " , ins_srtgroep sg"
+ " , ins_discipline disc"
+ " WHERE sd.ins_srtdeel_key = recs.ins_srtdeel_key"
+ " AND sd.ins_srtgroep_key = sg.ins_srtgroep_key"
+ " AND sg.ins_discipline_key = disc.ins_discipline_key"
+ ((prs_key > -1) ? " AND recs.ins_alg_ruimte_type = 'P'" : "")
+ ((mld_key > -1) ? " AND ins_deel_key IN (SELECT ins_deel_key FROM mld_melding_object WHERE mld_melding_object_verwijder IS NULL AND mld_melding_key = " + mld_key + ")" : "")
+ ((ins_key > -1) ? " AND id.ins_deel_key = " + ins_key : "")
if (all_grp && !grp_sel)