From a8adc8fdf3e6b9daff7a00cee5221848140034dc Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Wed, 31 May 2017 12:26:04 +0000
Subject: [PATCH] SGGR#40733 Objecten bij verkeerde (contact)persoon getoond

svn path=/Website/branches/v2017.1/; revision=34085
---
 APPL/BEZ/bez_list.inc | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/APPL/BEZ/bez_list.inc b/APPL/BEZ/bez_list.inc
index 02f047ff5b..29690422da 100644
--- a/APPL/BEZ/bez_list.inc
+++ b/APPL/BEZ/bez_list.inc
@@ -282,6 +282,7 @@ function bez_list(pautfunction, params)
         sql += ", (SELECT COUNT (ins_deel_key)"
              + "     FROM (SELECT i.ins_deel_key"
              + "                , i.ins_alg_ruimte_key"
+             + "                , i.ins_alg_ruimte_type"
              + "             FROM ins_deel i"
              + "                , ins_srtdeel s"
              + "            WHERE s.ins_srtdeel_key = i.ins_srtdeel_key"
@@ -294,6 +295,7 @@ function bez_list(pautfunction, params)
              + "           UNION"
              + "           SELECT i.ins_deel_key"
              + "                , i.ins_alg_ruimte_key"
+             + "                , i.ins_alg_ruimte_type"
              + "             FROM ins_deel i"
              + "                , ins_srtdeel s"
              + "            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 i.ins_alg_ruimte_type = 'C'"
              + "          ) x"
-             + "    WHERE x.ins_alg_ruimte_key = b.prs_perslid_key"
-             + "       OR x.ins_alg_ruimte_key = b.prs_contactpersoon_key) nr_of_items_lend";
+             + "    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 AND x.ins_alg_ruimte_type = 'C')) nr_of_items_lend";
 
         sql += ", (SELECT SUM(CASE"
              + "          WHEN b.bez_bezoekers_done IS NOT NULL"
@@ -734,18 +736,28 @@ function bez_list(pautfunction, params)
           var icontxt = "";
           if (outputmode == 0)
           {
-            sqlC = "SELECT i.ins_deel_omschrijving"
-                 + " 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 IN ('A', 'P', 'C')"
-                 + " 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";
-            oRsC = Oracle.Execute(sqlC);
+            if (oRs("prs_perslid_key").value)
+            {
+                var typ = 'P';
+                var pc_key = oRs("prs_perslid_key").value
+            }
+            else
+            {
+                var typ = 'C';
+                var pc_key = oRs("prs_contactpersoon_key").value
+            }
+            var sqlC = "SELECT i.ins_deel_omschrijving"
+                     + "  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)
             {
               icontxt += (icontxt != ""? "\n" : "") + safe.htmlattr(oRsC("ins_deel_omschrijving").value);