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

SGGR#40733 Objecten bij verkeerde (contact)persoon getoond

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34085
This commit is contained in:
Jos Groot Lipman
2017-05-31 12:26:04 +00:00
parent 6bfe7d1a0e
commit a8adc8fdf3
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
APPL/BEZ/bez_list.inc
View File

@@ -282,6 +282,7 @@ function bez_list(pautfunction, params)
sql += ", (SELECT COUNT (ins_deel_key)" sql += ", (SELECT COUNT (ins_deel_key)"
+ " FROM (SELECT i.ins_deel_key" + " FROM (SELECT i.ins_deel_key"
+ " , i.ins_alg_ruimte_key" + " , i.ins_alg_ruimte_key"
+ " , i.ins_alg_ruimte_type"
+ " FROM ins_deel i" + " FROM ins_deel i"
+ " , ins_srtdeel s" + " , ins_srtdeel s"
+ " WHERE s.ins_srtdeel_key = i.ins_srtdeel_key" + " WHERE s.ins_srtdeel_key = i.ins_srtdeel_key"
@@ -294,6 +295,7 @@ function bez_list(pautfunction, params)
+ " UNION" + " UNION"
+ " SELECT i.ins_deel_key" + " SELECT i.ins_deel_key"
+ " , i.ins_alg_ruimte_key" + " , i.ins_alg_ruimte_key"
+ " , i.ins_alg_ruimte_type"
+ " FROM ins_deel i" + " FROM ins_deel i"
+ " , ins_srtdeel s" + " , ins_srtdeel s"
+ " WHERE s.ins_srtdeel_key = i.ins_srtdeel_key" + " WHERE s.ins_srtdeel_key = i.ins_srtdeel_key"
@@ -304,8 +306,8 @@ function bez_list(pautfunction, params)
+ " AND s.ins_srtdeel_uitleenbaar = 1" + " AND s.ins_srtdeel_uitleenbaar = 1"
+ " AND i.ins_alg_ruimte_type = 'C'" + " AND i.ins_alg_ruimte_type = 'C'"
+ " ) x" + " ) x"
+ " WHERE x.ins_alg_ruimte_key = b.prs_perslid_key" + " WHERE (x.ins_alg_ruimte_key = b.prs_perslid_key AND x.ins_alg_ruimte_type = 'P')"
+ " OR x.ins_alg_ruimte_key = b.prs_contactpersoon_key) nr_of_items_lend"; + " OR (x.ins_alg_ruimte_key = b.prs_contactpersoon_key AND x.ins_alg_ruimte_type = 'C')) nr_of_items_lend";
sql += ", (SELECT SUM(CASE" sql += ", (SELECT SUM(CASE"
+ " WHEN b.bez_bezoekers_done IS NOT NULL" + " WHEN b.bez_bezoekers_done IS NOT NULL"
@@ -734,18 +736,28 @@ function bez_list(pautfunction, params)
var icontxt = ""; var icontxt = "";
if (outputmode == 0) if (outputmode == 0)
{ {
sqlC = "SELECT i.ins_deel_omschrijving" if (oRs("prs_perslid_key").value)
+ " FROM ins_deel i" {
+ ", ins_srtdeel s" var typ = 'P';
+ " WHERE s.ins_srtdeel_key = i.ins_srtdeel_key" var pc_key = oRs("prs_perslid_key").value
+ " AND i.ins_deel_verwijder IS NULL" }
+ " AND i.ins_deel_module = 'INS'" else
+ " AND i.ins_deel_parent_key IS NULL" {
+ " AND s.ins_srtdeel_uitleenbaar = 1" var typ = 'C';
+ " AND i.ins_alg_ruimte_type IN ('A', 'P', 'C')" var pc_key = oRs("prs_contactpersoon_key").value
+ " AND i.ins_alg_ruimte_key = " + (oRs("prs_perslid_key").value? oRs("prs_perslid_key").value : oRs("prs_contactpersoon_key").value) }
+ " ORDER BY ins_deel_omschrijving"; var sqlC = "SELECT i.ins_deel_omschrijving"
oRsC = Oracle.Execute(sqlC); + " FROM ins_deel i"
+ " , ins_srtdeel s"
+ " WHERE s.ins_srtdeel_key = i.ins_srtdeel_key"
+ " AND i.ins_deel_verwijder IS NULL"
+ " AND i.ins_deel_module = 'INS'"
+ " AND i.ins_deel_parent_key IS NULL"
+ " AND s.ins_srtdeel_uitleenbaar = 1"
+ " AND i.ins_alg_ruimte_type = " + safe.quoted_sql(typ)
+ " AND i.ins_alg_ruimte_key = " + pc_key
+ " ORDER BY ins_deel_omschrijving";
var oRsC = Oracle.Execute(sqlC);
while (!oRsC.eof) while (!oRsC.eof)
{ {
icontxt += (icontxt != ""? "\n" : "") + safe.htmlattr(oRsC("ins_deel_omschrijving").value); icontxt += (icontxt != ""? "\n" : "") + safe.htmlattr(oRsC("ins_deel_omschrijving").value);