From 82f847282dbc8ecef06efda6c2c970fd3df3bb1a Mon Sep 17 00:00:00 2001
From: Koen Reefman <koen.reefman@aareon.nl>
Date: Fri, 15 Sep 2017 11:04:12 +0000
Subject: [PATCH] RWSN#41312 Doorklikken naar history gebouw vanuit locatie
 werkt nu weer (ajax conflict opgelost met #)

svn path=/Website/trunk/; revision=35335
---
 APPL/PDA/gebouw.asp  | 11 ++++++++---
 APPL/PDA/locatie.asp |  9 ++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/APPL/PDA/gebouw.asp b/APPL/PDA/gebouw.asp
index ad5f18ae88..9190017d93 100644
--- a/APPL/PDA/gebouw.asp
+++ b/APPL/PDA/gebouw.asp
@@ -177,13 +177,18 @@ oRs.Close();
 
     var trackinglines = mobile.hastrackingpage("gebouw", bld_key);
     if (trackinglines > 0 && !tiny)
+    {
         BUTTON(L("lcl_history")+" ({0})".format(trackinglines), {linkid: "#bld-2-"+bld_key, dataicon: "bullets"});
+    }
 
-      var tsql = "SELECT COUNT(alg_ruimte_key)"
+      var tsql = "SELECT COUNT(alg_ruimte_key), MAX(alg_ruimte_key)"
                + " FROM alg_ruimte r, alg_verdieping v WHERE r.alg_verdieping_key=v.alg_verdieping_key AND alg_ruimte_verwijder IS NULL AND v.alg_gebouw_key = " + bld_key
       toRs = Oracle.Execute(tsql);
-      if (toRs(0).value > 0) {
-        BUTTON(L("lcl_mobile_ruimten")+" ({0})".format(toRs(0).value), {linkid: "./ruimte_list.asp?bld_key="+bld_key + transitParam, dataicon: "info"});
+      if (toRs(0).Value == 1) {
+      	var ruimte_key = toRs(1).Value;
+        BUTTON(L("lcl_mobile_ruimten")+" (1)", {linkid: "ruimte.asp?ruimte_key=" + ruimte_key + transitParam, dataicon: "info", dataajax: "false"});
+      } else if (toRs(0).Value > 1) {
+        BUTTON(L("lcl_mobile_ruimten")+" ({0})".format(toRs(0).value), {linkid: "ruimte_list.asp?bld_key=" + bld_key + transitParam, dataicon: "info", dataajax: "false", dataajax: "false"});
       }
       toRs.Close();
 
diff --git a/APPL/PDA/locatie.asp b/APPL/PDA/locatie.asp
index 0c23326ce6..c19b936b85 100644
--- a/APPL/PDA/locatie.asp
+++ b/APPL/PDA/locatie.asp
@@ -126,11 +126,14 @@ oRs.Close();
       if (trackinglines > 0 && !tiny)
           BUTTON(L("lcl_history")+" ({0})".format(trackinglines), {linkid: "#loc-2-"+loc_key, dataicon: "bullets"});
 
-      var tsql = "SELECT COUNT(alg_gebouw_key)"
+      var tsql = "SELECT COUNT(alg_gebouw_key), MAX(alg_gebouw_key)"
                + " FROM alg_gebouw WHERE alg_gebouw_verwijder IS NULL AND alg_locatie_key = " + loc_key
       toRs = Oracle.Execute(tsql);
-      if (toRs(0).value > 0) {
-        BUTTON(L("lcl_mobile_gebouwen")+" ({0})".format(toRs(0).value), {linkid: "./gebouw_list.asp?loc_key="+loc_key + transitParam, dataicon: "info"});
+      if (toRs(0).Value == 1) {
+      	var gebouw_key = toRs(1).Value;
+        BUTTON(L("lcl_mobile_gebouwen")+" (1)", {linkid: "gebouw.asp?bld_key=" + gebouw_key + transitParam, dataicon: "info", dataajax: "false"});
+      } else if (toRs(0).Value > 1) {
+        BUTTON(L("lcl_mobile_gebouwen")+" ({0})".format(toRs(0).value), {linkid: "gebouw_list.asp?loc_key=" + loc_key + transitParam, dataicon: "info", dataajax: "false"});
       }
       toRs.Close();
     CONTROLGROUP_END();