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

UWVA#51404: Pop-up bij bezoekersbalie aan/uit kunnen zetten.

Browse Source 
svn path=/Website/trunk/; revision=36690
This commit is contained in:
Maykel Geerdink
2018-01-24 07:30:01 +00:00
parent 0ed7dafbdf
commit 34335eb9cb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
APPL/BEZ/bez_list.inc
View File

@@ -797,7 +797,6 @@ function bez_list(pautfunction, params)
return JSON.stringify(data); return JSON.stringify(data);
} }
var canWriteProp = authparams && authparams.ALGwritelevel < 9 && authparams.PRSwritelevel < 9;
function fnrowActionEnabler(oRs) function fnrowActionEnabler(oRs)
{ {
var tVan = 0; var tVan = 0;
@@ -811,8 +810,7 @@ function bez_list(pautfunction, params)
var aantaldone = oRs("aantaldone").Value; var aantaldone = oRs("aantaldone").Value;
var eEdit = (fronto || backo || (tVan > tExpire)); var eEdit = (fronto || backo || (tVan > tExpire));
var eDelete = (canDelete || (tVan > tExpire)) && aantaldone == 0; var eDelete = (canDelete || (tVan > tExpire)) && aantaldone == 0;
var eProgressProp = S("bez_show_progress_prop") == 2 && canWriteProp; var data = {eEdit: eEdit, eDelete: eDelete };
var data = {eEdit: eEdit, eDelete: eDelete, eProgressProp: eProgressProp };
return data; return data;
} }
@@ -1288,7 +1286,9 @@ function bez_list(pautfunction, params)
rst.addAction({ action: "bezDelete", caption: L("lcl_delete"), enabler: "eDelete", single: true, multi: true, multiOnce: true}); rst.addAction({ action: "bezDelete", caption: L("lcl_delete"), enabler: "eDelete", single: true, multi: true, multiOnce: true});
if ( S("puo_uid") && S("puo_pwd") && S("bez_can_send_sms") && backo ) if ( S("puo_uid") && S("puo_pwd") && S("bez_can_send_sms") && backo )
rst.addAction({ action: "bezSendSms", caption: L("lcl_bez_send_sms"), single: true, multi: false }); rst.addAction({ action: "bezSendSms", caption: L("lcl_bez_send_sms"), single: true, multi: false });
rst.addAction({ action: "bezProgressProp", caption: L("lcl_bez_reg_progress_prop"), enabler: "eProgressProp", single: true, multi: false }); var canWriteProp = authparams && authparams.ALGwritelevel < 9 && authparams.PRSwritelevel < 9;
if (S("bez_show_progress_prop") == 2 && canWriteProp)
rst.addAction({ action: "bezProgressProp", caption: L("lcl_bez_reg_progress_prop"), single: true, multi: false });
if (!frontend && S("vis_allow_check_all") == 1) if (!frontend && S("vis_allow_check_all") == 1)
{ // Door enablee: NotExist effectied alleen multi { // Door enablee: NotExist effectied alleen multi
rst.addAction({ action: "bezCheckIn", caption: L("lcl_bez_sign_in"), enabler: "NotExist", multi: true, onlyMulti: true, multiOnce: true }); rst.addAction({ action: "bezCheckIn", caption: L("lcl_bez_sign_in"), enabler: "NotExist", multi: true, onlyMulti: true, multiOnce: true });

5
APPL/BEZ/bez_list.js
View File

@@ -51,16 +51,17 @@ function bezSendSms(row)
function bezProgressProp(row) function bezProgressProp(row)
{ {
var bez_key = row.getAttribute("ROWKEY");
var bezData = eval('(' + row.getAttribute("ROWDATA") + ')'); var bezData = eval('(' + row.getAttribute("ROWDATA") + ')');
if (bezData) if (bezData)
{ {
$(row).addClass('dirty'); $(row).addClass('dirty');
var url = "../bez/bez_edit_check_in.asp?urole=" + urole + "&bez_key=" + bezData.bez_key; var url = "../bez/bez_edit_check_in.asp?urole=" + urole + "&bez_key=" + bez_key;
FcltMgr.openModalDetail(url, FcltMgr.openModalDetail(url,
L("lcl_bez_reg_progress_prop"), L("lcl_bez_reg_progress_prop"),
{ callback: function(data) { callback: function(data)
{ {
$("#badgenr" + bezData.bez_key).val(data.bezBadgeArr[0]); $("#badgenr" + bez_key).val(data.bezBadgeArr[0]);
} }
}); });
} }