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

RWSN#41312 Doorklikken naar history gebouw vanuit locatie werkt nu weer (ajax conflict opgelost met #)

Browse Source 
svn path=/Website/trunk/; revision=35335
This commit is contained in:
Koen Reefman
2017-09-15 11:04:12 +00:00
parent b7ce7e587c
commit 82f847282d
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/PDA/gebouw.asp
View File

@@ -177,13 +177,18 @@ oRs.Close();
var trackinglines = mobile.hastrackingpage("gebouw", bld_key); var trackinglines = mobile.hastrackingpage("gebouw", bld_key);
if (trackinglines > 0 && !tiny) if (trackinglines > 0 && !tiny)
{
BUTTON(L("lcl_history")+" ({0})".format(trackinglines), {linkid: "#bld-2-"+bld_key, dataicon: "bullets"}); 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 + " 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); toRs = Oracle.Execute(tsql);
if (toRs(0).value > 0) { 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"}); 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(); toRs.Close();

9
APPL/PDA/locatie.asp
View File

@@ -126,11 +126,14 @@ oRs.Close();
if (trackinglines > 0 && !tiny) if (trackinglines > 0 && !tiny)
BUTTON(L("lcl_history")+" ({0})".format(trackinglines), {linkid: "#loc-2-"+loc_key, dataicon: "bullets"}); 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 + " FROM alg_gebouw WHERE alg_gebouw_verwijder IS NULL AND alg_locatie_key = " + loc_key
toRs = Oracle.Execute(tsql); toRs = Oracle.Execute(tsql);
if (toRs(0).value > 0) { 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"}); 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(); toRs.Close();
CONTROLGROUP_END(); CONTROLGROUP_END();