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

KFSG#44689 Graag knop voor SMS versturen

Browse Source 
svn path=/Website/trunk/; revision=36675
This commit is contained in:
Erik Groener
2018-01-23 10:16:50 +00:00
parent 83213351c1
commit f9d48a0ff1
4 changed files with 80 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
APPL/BEZ/bez_list.inc
View File

@@ -379,6 +379,8 @@ function bez_list(pautfunction, params)
{
sql = "SELECT d.alg_district_omschrijving alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(bez_bezoekers_done) sum_checkin"
+ ", COUNT (bez_bezoekers_out) sum_checkout"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
@@ -386,6 +388,8 @@ function bez_list(pautfunction, params)
{
sql = "SELECT l.alg_locatie_omschrijving alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(bez_bezoekers_done) sum_checkin"
+ ", COUNT (bez_bezoekers_out) sum_checkout"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
@@ -393,6 +397,8 @@ function bez_list(pautfunction, params)
{
sql = "SELECT g.alg_gebouw_omschrijving alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(bez_bezoekers_done) sum_checkin"
+ ", COUNT (bez_bezoekers_out) sum_checkout"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
@@ -400,6 +406,8 @@ function bez_list(pautfunction, params)
{
sql = "SELECT TO_CHAR(a.bez_afspraak_datum, 'YYYY-MM') alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(bez_bezoekers_done) sum_checkin"
+ ", COUNT (bez_bezoekers_out) sum_checkout"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
@@ -407,12 +415,16 @@ function bez_list(pautfunction, params)
{
sql = "SELECT TO_CHAR(a.bez_afspraak_datum, 'YYYY-IW') alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(bez_bezoekers_done) sum_checkin"
+ ", COUNT (bez_bezoekers_out) sum_checkout"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
if (groupbez == 6) // Dag (management info)
{
sql = "SELECT TRUNC(a.bez_afspraak_datum) alg_omschr"
+ ", COUNT(*) sum_visitors"
+ ", COUNT(bez_bezoekers_done) sum_checkin"
+ ", COUNT (bez_bezoekers_out) sum_checkout"
+ ", COUNT(rd.res_rsv_deel_key) sum_parking";
}
@@ -776,13 +788,12 @@ function bez_list(pautfunction, params)
function fnrowData(oRs)
{
var afspr_key = oRs("afspr_key").Value;
var bezoek_key = oRs("bez_key").Value;
var tVan = oRs("bez_afspraak_datum").Value;
var authorized = 0; // nooit geautoriseerd tot afmelden
if (backo) authorized = oRs("authorized").Value;
var data = {afspr_key: afspr_key, tVan: tVan, bez_key: bezoek_key, authorized: authorized};
var data = {afspr_key: afspr_key, tVan: tVan, authorized: authorized};
return JSON.stringify(data);
}
@@ -800,9 +811,8 @@ function bez_list(pautfunction, params)
var aantaldone = oRs("aantaldone").Value;
var eEdit = (fronto || backo || (tVan > tExpire));
var eDelete = (canDelete || (tVan > tExpire)) && aantaldone == 0;
var eSendSms = ( S("puo_uid") && S("puo_pwd") && S("bez_can_send_sms") );
var eProgressProp = S("bez_show_progress_prop") == 2 && canWriteProp;
var data = {eEdit: eEdit, eDelete: eDelete, eSendSms: eSendSms, eProgressProp: eProgressProp };
var data = {eEdit: eEdit, eDelete: eDelete, eProgressProp: eProgressProp };
return data;
}
@@ -1266,6 +1276,8 @@ function bez_list(pautfunction, params)
}
rst.addColumn(new Column({caption: captionGroup, content: "alg_omschr"}));
rst.addColumn(new Column({caption: L("lcl_vis_number_vis"), content: "sum_visitors", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_vis_number_checkin"), content: "sum_checkin", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_vis_number_checkout"), content: "sum_checkout", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_vis_number_park"), content: "sum_parking", datatype: "number"}));
}
@@ -1274,7 +1286,8 @@ function bez_list(pautfunction, params)
{
rst.addAction({ action: "bezEdit", caption: L("lcl_edit"), isDefault: true});
rst.addAction({ action: "bezDelete", caption: L("lcl_delete"), enabler: "eDelete", single: true, multi: true, multiOnce: true});
rst.addAction({ action: "bezSendSms", caption: L("lcl_bez_send_sms"), enabler: "eSendSms", single: true, multi: false });
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: "bezProgressProp", caption: L("lcl_bez_reg_progress_prop"), enabler: "eProgressProp", single: true, multi: false });
if (!frontend && S("vis_allow_check_all") == 1)
{ // Door enablee: NotExist effectied alleen multi

10
APPL/BEZ/bez_list.js
View File

@@ -40,11 +40,12 @@ function bezEdit(row)
function bezSendSms(row)
{
var bez_key = row.getAttribute("ROWKEY");
var bezData = eval('(' + row.getAttribute("ROWDATA") + ')');
if (bezData)
{
var v_url = "../bez/bez_smshost.asp?afspr_key=" + bezData.afspr_key + "&bez_key=" + bezData.bez_key;
FcltMgr.openModalDetail(v_url, L("lcl_bez_send_sms"), {callback: FcltCallbackRefresh});
var v_url = "../bez/bez_smshost.asp?afspr_key=" + bezData.afspr_key + "&bez_key=" + bez_key;
FcltMgr.openModalDetail(v_url, L("lcl_bez_send_sms"), {callback: FcltCallback});
}
}
@@ -65,11 +66,6 @@ function bezProgressProp(row)
}
}
function bezDoSendSms()
{
alert("SMS versturen");
}
function CheckInCallback(json, textStatus)
{
for (i = 0 ; i < json.bez_key_arr.length; i++)

78
APPL/BEZ/bez_smshost.asp
View File

@@ -26,20 +26,15 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
var afspr_key = getQParamInt("afspr_key");
var bezoek_key = getQParamInt("bez_key", -1);
var bezoeker_naam = "";
var sql = "SELECT bez_afspraak_naam"
+ " FROM bez_bezoekers"
+ " WHERE bez_afspraak_key = " + afspr_key
+ " AND bez_bezoekers_key = " + bezoek_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
bezoeker_naam = oRs("bez_afspraak_naam").Value;
var bezoeker_naam = oRs("bez_afspraak_naam").Value||"";
oRs.Close();
var smstekst = L("lcl_bez_visitor_arrived").format(bezoeker_naam);
var contact = {};
var host = {};
var sql = "SELECT a.bez_afspraak_contact_key"
+ " , (SELECT " + S("prs_pers_string")
+ " FROM prs_perslid p"
@@ -61,15 +56,14 @@ var sql = "SELECT a.bez_afspraak_contact_key"
+ " FROM bez_afspraak a"
+ " WHERE a.bez_afspraak_key = " + afspr_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
contact.key = oRs("bez_afspraak_contact_key").Value;
contact.naam = oRs("contact_naam").Value;
contact.mobiel = oRs("contact_mobiel").Value;
host.key = oRs("bez_afspraak_host_key").Value;
host.naam = oRs("host_naam").Value;
host.mobiel = oRs("host_mobiel").Value;
}
var contact = { key: oRs("bez_afspraak_contact_key").Value
, naam: oRs("contact_naam").Value
, mobiel: oRs("contact_mobiel").Value
};
var host = { key: oRs("bez_afspraak_host_key").Value
, naam: oRs("host_naam").Value
, mobiel: oRs("host_mobiel").Value
};
oRs.Close();
var chk_label_cont = L("lcl_vis_contactperson") + ": " + contact.naam + " (" + contact.mobiel + ")";
@@ -84,10 +78,32 @@ var chk_label_host = L("lcl_vis_visit") + ": " + host.naam + " (" + h
function sms_submit()
{
$.post($("form[name=u2]")[0].action, $("[name=u2]").serialize());
FcltMgr.closeDetail( window );
return true; // disable button
var prs_key = [];
<%
if (contact.key == host.key)
{
%>
prs_key.push($("#prs_key").val());
<%
}
else
{
%>
if ( $("[srtprs=contact]").is(":checked") )
prs_key.push( parseInt($("[srtprs=contact]").val()) );
if ( $("[srtprs=host]").is(":checked") )
prs_key.push( parseInt($("[srtprs=host]").val()) );
<%
}
%>
if (prs_key.length)
{
$.post($("form[name=u2]")[0].action, $("[name=u2]").serialize());
FcltMgr.closeDetail( window );
return true; // disable button
}
else
return false;
}
</script>
@@ -108,18 +124,30 @@ var chk_label_host = L("lcl_vis_visit") + ": " + host.naam + " (" + h
{
%>
<label for="prs_key">
<input type="checkbox" name="prs_key" id="prs_key" value="<%=contact.key%>">
<input type="checkbox" name="prs_key" id="prs_key" srtprs="contact" value="<%=contact.key%>">
<%=safe.html(chk_label_cont)%>
</label><br>
<% } %>
<% }
if (contact.key == host.key)
{
%>
<label><%=safe.html(chk_label_host)%></label>
<input type="hidden" name="prs_key" id="prs_key" srtprs="host" value="<%=host.key%>">
<%
}
else
{
%>
<label for="prs_key">
<input type="checkbox" name="prs_key" id="prs_key" value="<%=host.key%>">
<input type="checkbox" name="prs_key" id="prs_key" srtprs="host" value="<%=host.key%>">
<%=safe.html(chk_label_host)%>
</label><br>
</label>
<%
}
%>
</td>
</tr>
<%
%>
<tr><td><br/></td></tr>
<%
BLOCK_END();

13
APPL/BEZ/bez_smshost_save.asp
View File

@@ -5,13 +5,12 @@
Stuur een bericht via SMS
*/
ANONYMOUS_Allowed = 1;
var JSON_Result = true;
%>
<!--#include file="../Shared/common.inc"-->
<!--#include file="../Shared/json2.js" -->
<%
protectRequest.validateToken();
var canSendSMS = ( S("puo_uid") && S("puo_pwd") && S("bez_can_send_sms") );
if (!canSendSMS)
{
@@ -22,17 +21,17 @@ var perslid_key = getFParamIntArray("prs_key", []);
var txt = getFParam("smstekst");
var mob = [];
if (perslid_key)
if (perslid_key.length)
{
var sql = "SELECT p.prs_perslid_mobiel"
+ " FROM prs_perslid p"
+ " WHERE p.prs_perslid_key IN (" + perslid_key.join(",") + ")";
+ " WHERE p.prs_perslid_mobiel IS NOT NULL"
+ " AND p.prs_perslid_key IN (" + perslid_key.join(",") + ")";
var oRs = Oracle.Execute(sql);
while (!oRs.eof)
{
var smsnr = oRs("prs_perslid_mobiel").Value; //.replace(/\D/g,"");
if (!isNaN(smsnr))
mob.push(smsnr); // Alleen echte telefoonnummers
var smsnr = oRs("prs_perslid_mobiel").Value;
mob.push(smsnr);
oRs.MoveNext();
}
oRs.Close();