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

AKZA#35759 vergaderzaalnamen in bezoekers balie zetten

Browse Source 
svn path=/Website/trunk/; revision=32482
This commit is contained in:
Erik Groener
2017-01-23 09:53:14 +00:00
parent 1a4870e4ad
commit 443dd65f3d
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
APPL/BEZ/bez_list.inc
View File

@@ -180,7 +180,8 @@ function bez_list(pautfunction, params)
if (!groupbez) // elke individuele bezoeker
{ // geen management info => fe, fo en bo
sql = "SELECT a.bez_afspraak_key afspr_key"
+ ", " + "a.bez_afspraak_datum"
+ ", rrr.res_rsv_ruimte_key"
+ ", a.bez_afspraak_datum"
+ ", b.bez_afspraak_naam"
+ ", b.bez_afspraak_bedrijf bez_bedrijf"
+ ", b.prs_contactpersoon_key"
@@ -896,6 +897,22 @@ function bez_list(pautfunction, params)
+ '></span>';
}
function fncolRuimte(oRs)
{
return (S("bez_show_resname") && oRs("res_rsv_ruimte_key").Value
? oRs("res_ruimte_omschrijving").Value
: oRs("ruimte").Value
);
}
function fncolResRuimteOmschrijving(oRs)
{
return (S("bez_show_resname") && oRs("res_rsv_ruimte_key").Value
? oRs("ruimte").Value
: oRs("res_ruimte_omschrijving").Value
);
}
/**********************************************
* End general callback functies ResultsetTable
*********************************************/
@@ -1033,7 +1050,7 @@ function bez_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_vis_name"), content: fncolContact}));
rst.addColumn(new Column({caption: L("lcl_vis_company"), content: "bez_bedrijf", nowrap: true, tooltip: "res_ruimte_omschrijving", combine: !tiny}));
}
rst.addColumn(new Column({caption: L("lcl_room"), content: "ruimte", nowrap: true, tooltip: "res_ruimte_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_room"), content: fncolRuimte, nowrap: true, tooltip: fncolResRuimteOmschrijving}));
if (more_actions_exist) {
rst.addColumn(new Column({caption: L("lcl_action"), content: "actie", combine: true}));
}