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

CONN#20081

Browse Source 
svn path=/Website/trunk/; revision=3349
This commit is contained in:
Maykel Geerdink
2011-03-14 12:26:42 +00:00
parent cea3383aed
commit 31e0027a39
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CUST/CONN/rap_cnt.asp
View File

@@ -1,7 +1,7 @@
<%@ language="javascript"%>
<% /*
$Revision: 3 $
$Modtime: 11-10-10 12:42 $
$Revision: 4 $
$Modtime: 14-03-11 14:25 $
*/%>
<!--#include file="../../cust/install.inc"-->
@@ -11,7 +11,7 @@
<!--#include file="../../appl/CAD/FGII.inc" -->
<%
var sql="";
var highlight = getQMultiParam("highlight", ""); // Comma-separated room_key_list (terrains). Optional
var highlight_arr = getQParamIntArray("highlight", ""); // Comma-separated room_key_list (terrains). Optional
var floorKey = getQParam("vKey", "");
var gebouwKey = getQParam("gKey", "");
@@ -82,11 +82,10 @@ var autfunction = "WEB_FGCNT";
+ " WHERE ar.alg_verdieping_key = " + floorKey
+ " AND rg.alg_ruimte_key = ar.alg_ruimte_key"
+ " ) R"
+ (highlight != "" && highlight != "-1"
? + " WHERE r.alg_ruimte_key IN (" + highlight + ")"
+ (highlight_arr.length > 0 && highlight_arr.join(",").indexOf("-1") == -1
? " WHERE r.alg_ruimte_key IN (" + highlight_arr.join(",") + ")"
+ " ORDER BY 1"
: "");
}
else
{

10
CUST/CONN/rap_sch.asp
View File

@@ -1,14 +1,14 @@
<%@ language="javascript"%>
<% /*
$Revision: 2 $
$Modtime: 5-10-10 15:55 $
$Revision: 3 $
$Modtime: 14-03-11 14:11 $
*/%>
<!--#include file="../../cust/install.inc"-->
<% FCLTHeader.Set({root: "../../appl/"}); %>
<!--#include file="../../appl/Shared/resultset_table_v2.inc" -->
<%
var sql="";
var highlight = getQMultiParam("highlight", ""); // Comma-separated room_key_list (terrains). Optional
var highlight_arr = getQParamIntArray("highlight", ""); // Comma-separated room_key_list (terrains). Optional
var floorKey = getQParam("vKey", "");
var outputmode = getQParam("outputmode", 0);
@@ -86,8 +86,8 @@ var showall = getQParam("showall", 0);
+ " AND alg_g.alg_gebouw_key = alg_v.alg_gebouw_key"
+ " AND alg_r.alg_ruimte_key = sch.alg_ruimte_key"
+ " ) R "
+ (highlight != "" && highlight != "-1"
? " WHERE r.alg_ruimte_key IN (" + highlight + ")"
+ (highlight_arr.length > 0 && highlight_arr.join(",").indexOf("-1") == -1
? " WHERE r.alg_ruimte_key IN (" + highlight_arr.join(",") + ")"
: "")
+ " ORDER BY 1";
}