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

svn path=/Website/trunk/; revision=31862

Browse Source
This commit is contained in:
Erik Groener
2016-12-07 07:13:24 +00:00
parent a20f3ff622
commit 73578d8cb1
6 changed files with 81 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/BEZ/bez_edit_bezoekers.inc
View File

@@ -65,7 +65,7 @@ function bez_edit_bezoekers(afspraak_key, afspraak_begin, afspraak_eind, loc_key
<% } %>
<th><%=L("lcl_vis_name")%></th>
<th><%=L("lcl_vis_company")%><%=S("bez_sel_internpersoon") == 1? "/" + L("lcl_department") : ""%></th>
<% if (S("vis_remark"))
<% if (S("vis_remark") != 0)
{ %>
<th><%=L("lcl_vis_remark")%></th>
<% } %>
@@ -190,7 +190,7 @@ function bez_edit_bezoekers(afspraak_key, afspraak_begin, afspraak_eind, loc_key
{ maxlength: (params.contactonly? null : "60"), readonly: bezreado, html: (params.contactonly? "sgonChange='ContactpersoonBedrijfSelected'" : '') } )
%>
</td>
<% if (S("vis_remark"))
<% if (S("vis_remark") != 0)
{
%> <td> <%
RWFIELD("opm" + next_vis, "fld", "", oRs("bez_bezoekers_opmerking").Value, { maxlength: 50 } );
@@ -364,7 +364,7 @@ function bez_edit_bezoekers(afspraak_key, afspraak_begin, afspraak_eind, loc_key
Bij suggestbox met contactpersonen/bedrijven (params.contactonly) geen maximale lengte eis. */ %>
ih.insertCell(-1).innerHTML = '<input type="text" class="fld" name="bez' + next_vis + '" id="bez' + next_vis + '" <% if (!params.contactonly) {%> onChange="checkRequiredGroup(\'10S' + next_vis + '\')" <% } %> <%=params.contactonly? 'sgonChange="ContactpersoonBedrijfSelected"' : 'maxlength="30" onChange="checkRequiredGroup(\\\'10S' + next_vis + '\\\')"'%>>';
ih.insertCell(-1).innerHTML = '<input type="text" class="fld" name="bed' + next_vis + '" id="bed' + next_vis + '" <%=params.contactonly? 'sgonChange="ContactpersoonBedrijfSelected"' : 'maxlength="60"'%>>';
<% if (S("vis_remark"))
<% if (S("vis_remark") != 0)
{ %>
ih.insertCell(-1).innerHTML = '<input type="text" class="fld" name="opm' + next_vis + '" id="opm' + next_vis + '" maxlength="50">';
<% } %>

80
APPL/BEZ/bez_edit_check_in.asp
View File

@@ -18,6 +18,7 @@
<!-- #include file="./bez.inc" -->
<!-- #include file="./bez_edit_bezoekers.inc" -->
<!-- #include file="./bez_edit_bezoekers_save.inc" -->
<!-- #include file="./bez_flexkenmerk.inc" -->
<%
FCLTHeader.Requires({ plugins: ["suggest", "jQuery"]});
@@ -26,7 +27,8 @@ var urole = getQParamSafe("urole", "bo");
var fronto = urole == "fo"; // DEPRECATED
var backo = urole == "bo";
var titel = "";
var next_vis = 1;
var authparams = user.checkAutorisation({ fe: "WEB_BEZUSE",
bo: "WEB_BEZBOF",
fo: "WEB_BEZFOF"} [urole]);
@@ -35,6 +37,12 @@ var sql = "SELECT a.bez_afspraak_key"
+ " , a.bez_afspraak_datum"
+ " , a.bez_afspraak_eind"
+ " , a.alg_locatie_key"
+ " , b.bez_afspraak_naam"
+ " , b.bez_afspraak_bedrijf"
+ " , b.prs_contactpersoon_key"
+ " , b.prs_perslid_key"
+ " , b.bez_bezoekers_opmerking"
+ " , b.bez_bezoekers_pasnr"
+ " FROM bez_afspraak a"
+ " , bez_bezoekers b"
+ " WHERE a.bez_afspraak_key = b.bez_afspraak_key"
@@ -45,14 +53,31 @@ if (!oRs.eof)
var this_bez = {afspraak_key: oRs("bez_afspraak_key").Value,
afspraak_start: new Date(oRs("bez_afspraak_datum").Value),
afspraak_eind: new Date(oRs("bez_afspraak_eind").Value),
locatie_key: oRs("alg_locatie_key").Value
locatie_key: oRs("alg_locatie_key").Value,
bezoeker_naam: oRs("bez_afspraak_naam").Value,
bedrijf_naam: oRs("bez_afspraak_bedrijf").Value,
contact_key: oRs("prs_contactpersoon_key").Value,
perslid_key: oRs("prs_perslid_key").Value,
opmerking: oRs("bez_bezoekers_opmerking").Value,
badgenr: oRs("bez_bezoekers_pasnr").Value
};
var bez_afspraak = bez.bez_afspraak_info(this_bez.afspraak_key);
this_bez.ruimte_extern = bez_afspraak.res_ruimte_extern;
}
else
{
}
oRs.Close();
var sql = "SELECT COUNT(*) aantal"
+ " FROM bez_kenmerk"
+ " WHERE bez_kenmerk_verwijder IS NULL"
+ " AND bez_kenmerk_volgnr >= 900";
var oRs = Oracle.Execute(sql);
var hasEditableProperties = (oRs("aantal").Value > 0);
oRs.Close();
%>
<html>
@@ -60,7 +85,6 @@ oRs.Close();
<% FCLTHeader.Generate() %>
<script>
var urole = "<%=urole%>";
var titel = "<%=safe.jsstring(titel)%>";
var bez_max_flex_on_line = <%=S("bez_max_flex_on_line")%>;
function bez_submit()
@@ -76,23 +100,57 @@ oRs.Close();
}
$(document).ready(function()
{
FcltMgr.resized(window);
});
</script>
</head>
<body>
<%
var buttons = [ {title: L("lcl_submit"), icon: "opslaan.png", action: "bez_submit()", id: "bsubmit_bez_bezoekers" },
{title: L("lcl_cancel"), icon: "undo.png", action: "bez_cancel()", id: "bcancel_bez_bezoekers" } ];
IFRAMER_HEADER(L("lcl_bez_sign_in"), buttons)
%>
<body class="modal" id="mod_bezcheckin">
<div id="edit">
<form name="u2"
action="bez_edit_bezoekers_save.asp?urole=<%=urole%>"
method="post">
<input type="hidden" name="afspr_key" id="afspr_key" value="<%=this_bez.afspraak_key%>">
<input type="hidden" id="afspr_key" name="afspr_key" value="<%=this_bez.afspraak_key%>">
<input type="hidden" id="bez_key<%=next_vis%>" name="bez_key<%=next_vis%>" value="<%=bez_key%>">
<input type="hidden" id="next_vis" name="next_vis" value=<%=next_vis + 1%>>
<%
bez_edit_bezoekers(this_bez.afspraak_key, this_bez.afspraak_start, this_bez.afspraak_eind, this_bez.locatie_key, {bezoeker_key: bez_key});
BLOCK_START("bezCheckin", "");
var bezreado = this_bez.ruimte_extern || this_bez.contact_key != null || this_bez.perslid_key != null;
var company = L("lcl_vis_company") + (S("bez_sel_internpersoon") == 1 ? "/" + L("lcl_department") : "");
RWFIELDTR("bez" + next_vis, "fld", L("lcl_vis_name"), this_bez.bezoeker_naam, { maxlength: 30, readonly: bezreado });
RWFIELDTR("bed" + next_vis, "fld", company, this_bez.bedrijf_naam, { maxlength: 60, readonly: bezreado });
if (S("vis_remark") != 0)
{
RWFIELDTR("opm" + next_vis, "fld", L("lcl_vis_remark"), this_bez.opmerking, { maxlength: 50 });
}
if (S("vis_bo_uses_badgenrs") == 1)
{
if (backo)
RWFIELDTR("bdg" + next_vis, "fldbadge", L("lcl_vis_badgenr"), this_bez.badgenr, { maxlength: 30 });
else
{
%>
<input type="hidden" id="bdg<%=next_vis%>" name="bdg<%=next_vis%>" value="<%=this_bez.badgenr%>">
<%
}
}
var flexparams = { urole: urole,
bez_key: bez_key,
flexcolumns: 1,
beznum: next_vis,
ispopup: true
};
generateFlexKenmerkCode(flexparams);
BLOCK_END();
var buttons = [ {title: L("lcl_submit"), icon: "opslaan.png", action: "bez_submit()", id: "bsubmit_bez_bezoekers" },
{title: L("lcl_cancel"), icon: "undo.png", action: "bez_cancel()", id: "bcancel_bez_bezoekers" } ];
CreateButtons(buttons);
IFACE.FORM_END();
%>
</form>

5
APPL/BEZ/bez_flexkenmerk.inc
View File

@@ -65,13 +65,14 @@ function generateFlexKenmerkCode(params)
var flexstart = params.flexstart;
var flexend = params.flexend;
var notr = params.notr;
var ispopup = params.ispopup;
var nolabel = params.nolabel;
var tmpfolder = params.tmpfolder;
var filter = params.filter;
function isReadonly (volgnummer) //??
{
return reado;
return reado || (volgnummer < 900);
}
var sql = getSqlBezFlex(bez_key, filter);
@@ -82,7 +83,7 @@ function generateFlexKenmerkCode(params)
"BEZ", // Module
bez_key,
{ flexcolumns: flexcolumns,
label_colspan: notr? null : (params.mobile? 1 : (S("bez_sel_contactpersoon") > 0 || S("bez_sel_internpersoon")? 3 : 2)),
label_colspan: (notr || ispopup) ? null : (params.mobile? 1 : (S("bez_sel_contactpersoon") > 0 || S("bez_sel_internpersoon")? 3 : 2)) ),
kenmerk_search: advanced,
fnIsReadonly: isReadonly,
prs_key: prs_key, // Wordt alleen gebruikt als geldt (!kenmerk_search && !multiMode)

3
APPL/BEZ/bez_list.inc
View File

@@ -164,6 +164,7 @@ function bez_list(pautfunction, params)
contactonly = <%=params.contactonly?1:0%>;
var todayString = "<%=toDateString(new Date())%>";
var hasKenmerk = (<%=hasKenmerk%> != 0);
var s_vis_remark = <%=S("vis_remark")%>;
</script>
</head>
@@ -817,6 +818,7 @@ function bez_list(pautfunction, params)
if (oRs("bez_bezoekers_done").value == null)
{ // date is empty, visitor is not yet in/badge not yet ready, show clickable action
if (outputmode == 0)
{
content = '<img id="CHDin' + oRs("bez_key").value
+ '" src="../Pictures/vis_todo.gif" class="ilbutton"'
+ (oRs("authorized").value == 1
@@ -824,6 +826,7 @@ function bez_list(pautfunction, params)
+ ' alt="' + L("lcl_vis_register") + '"'
: ' OnClick="FcltMgr.stopPropagation(event);"')
+ '>';
}
else
content = "&nbsp;";
}

4
APPL/BEZ/bez_list.js
View File

@@ -81,13 +81,13 @@ function doCheckIn(evt, bezKeyString, undo_check_in)
FcltMgr.stopPropagation(evt);
var bez_key_arr = bezKeyString.toString().split(","); // Bulkactie geeft het als een string door, klikken op het aanmeldvakje als een integer.
if (bez_key_arr.length == 1 && hasKenmerk)
if (bez_key_arr.length == 1 && (hasKenmerk || s_vis_remark==2))
{ // Niet voor bulkacties
// alleen voor bo
// en alleen als er kenmerken > 900 zijn.
var url = "../bez/bez_edit_check_in.asp?urole="+urole+"&bez_key="+bez_key_arr[0];
FcltMgr.openModalDetail(url,
L("lcl_vis_register_title"),
L("lcl_vis_checkin_title"),
{ callback: function()
{ setCheckIn(bezKeyString, undo_check_in);
}

2
APPL/BEZ/bez_show_bezoekers.asp
View File

@@ -172,7 +172,7 @@ user.auth_required_or_abort(this_bez.canReadAny);
rst.addColumn(new Column({caption: L("lcl_vis_name"), content: "bez_afspraak_naam"}));
rst.addColumn(new Column({caption: L("lcl_vis_company"), content: "bez_bedrijf"}));
if (S("vis_remark"))
if (S("vis_remark") != 0)
{
rst.addColumn(new Column({caption: L("lcl_remark"), content: "bez_bezoekers_opmerking"}));
}