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

FSN#36948 Mogelijkheid om bij 1 resultaat direct door te linken naar 'linkColumn' toegevoegd aan PDA/resultset_table.inc

Browse Source 
svn path=/Website/trunk/; revision=36356
This commit is contained in:
Koen Reefman
2017-12-13 13:32:37 +00:00
parent f167104e2e
commit 1f11763790
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/PDA/melding_new.asp
View File

@@ -212,6 +212,7 @@ if (srtdisc_key > 0)
var rst = new ResultsetTable({ sql: mySTDsql
, keyColumn: "mld_stdmelding_key"
, linkColumn: fncolLink
, singleLink: true
, dividerColumn: S("mld_selector_mode")==0?"ins_discipline_omschrijving":null // groepeer op vakgroep
, headerColumn: "mld_stdmelding_omschrijving"
, subheaderColumn: fncolDetail

20
APPL/PDA/resultset_table.inc
View File

@@ -71,6 +71,7 @@ function __rsProcessResultset(processParams)
html += "<ul data-role='listview' data-theme='b' data-inset='" + (this.inset? "true" : "false") + "' data-content-theme='d'>";
var cnt = 0;
var trueCount = 0;
var hasResults = false;
var initKeyDone = this.initKey == null;
for (cnt = 0; (cnt < (S("qp_maxrows_mobile")) || this.showAll ) &&
@@ -101,21 +102,30 @@ function __rsProcessResultset(processParams)
else
lines.push(this.makeTableRow(oRs, cnt, false));
trueCount++;
if (this.buildHistogram)
this.countHistogram(oRs);
if ((this.groupColumn || (this.singleLink && trueCount < 2)) && this.linkColumn)
var lastLink = __fnContent(this.linkColumn)(oRs);
var numberInGroup = -1;
if (this.groupColumn)
{
var lastGroup = __fnContent(this.groupColumn)(oRs);
var lastLink = __fnContent(this.linkColumn)(oRs);
if (this.numberInGroup)
numberInGroup = __fnContent(this.numberInGroup)(oRs);
}
oRs.MoveNext();
if (trueCount === 1 && oRs.EOF && this.singleLink && this.linkColumn && lastLink)
{
trueCount = -1;
break;
}
if (this.groupColumn)
{
var overLimit = (cnt+1 >= (S("qp_maxrows_mobile")) && !this.showAll ) ||
@@ -157,7 +167,13 @@ function __rsProcessResultset(processParams)
}
if (cnt == 0 || !hasResults)
if (trueCount === -1) // 1 result in list, which we should click instantly
{
Response.Write("<script>$(function() { window.location.href = \""+ lastLink.replace(new RegExp("\"", "g"), "'") +"\"; })</script>");
return -1;
}
if (cnt === 0 || !hasResults)
{
Response.Write("<p>" + this.emptySetString + "</p>");
return -1;