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

FSN#39718 Bezoekersbalie toevoegen alleen popupje tussendoor als oproepers bestaan

Browse Source 
svn path=/Website/trunk/; revision=33886
This commit is contained in:
Jos Groot Lipman
2017-05-16 15:29:45 +00:00
parent 6b12081792
commit c663a0ae05
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
APPL/BEZ/bez_list.inc
View File

@@ -505,9 +505,9 @@ function bez_list(pautfunction, params)
if (!afspr_key && sql_date)
sql += " AND a.bez_afspraak_datum " + sql_date;
if (!afspr_key && action_key)
sql += " AND a.bez_actie_key = " + action_key;
sql += " AND a.bez_actie_key = " + action_key;
if (!afspr_key)
{
@@ -616,7 +616,7 @@ function bez_list(pautfunction, params)
+ " AND gr.alg_gebouw_key = COALESCE(og.alg_gebouw_key, gr.alg_gebouw_key)"
+ " AND gr.niveau = " + authparams.ALGreadlevel + ")";
}
}
else
{ // fe mode
@@ -949,20 +949,28 @@ function bez_list(pautfunction, params)
{
if (authparams.ALGwritelevel < 9)
{
var addurl = "appl/bez/bez_afspraak.asp?urole=" + urole;
if (params.contactonly)
addurl += "&contactonly=1";
var action = "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')";
if (urole == 'bo') // Krijgt de kans een pool-reservering te kiezen
{
var addurl = "bez_afspraak_bo_new.asp?loc_key=" + (loc_key||-1);
if (params.contactonly)
addurl += "&contactonly=1";
var action = "FcltMgr.openModalDetail('" + addurl + "', '" + L("lcl_add") + "', {callback: bezPoolCallback} )"
}
else
{
var addurl = "appl/bez/bez_afspraak.asp?urole=" + urole;
if (params.contactonly)
addurl += "&contactonly=1";
var action = "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')";
var sql2 = "SELECT *"
+ " FROM bez_actie"
+ " WHERE bez_actie_verwijder IS NULL"
+ " AND BITAND(bez_actie_flags, 1) = 1"; // Bestaan er oproepers?
var oRs = Oracle.Execute(sql2);
if (!oRs.Eof)
{
var addurl = "bez_afspraak_bo_new.asp?loc_key=" + (loc_key||-1);
if (params.contactonly)
addurl += "&contactonly=1";
var action = "FcltMgr.openModalDetail('" + addurl + "', '" + L("lcl_add") + "', {callback: bezPoolCallback} )"
}
oRs.Close()
}
var buttons = [{ icon: "plus.png", title: L("lcl_add"), action: action }];
}
}