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

Merge 2022.3 RC1 patches

Browse Source 
svn path=/Website/trunk/; revision=57426
This commit is contained in:
Jos Groot Lipman
2022-09-28 12:06:31 +00:00
parent 24cf960201
commit 83791c637c
28 changed files with 201 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/API/api_hmail.asp
View File

@@ -480,6 +480,9 @@ function saveAttachments(xmlReq, emlSetting, xmlParam, resultParam)
var Attachments = emlSetting.allowedFiles;
for (var i=0; i < Attachments.length; i++)
{
var filesequence = Attachments[i].sequence; // Let op: Deze sequence wordt gebruikt \\Utils\mail_receive\EventHandlers.js
// Het is de volgorde zoals bestanden in de mail staan.
// De bestanden die je niet nodig hebt staan daar ook nog!
var safefilename = Attachments[i].safefilename;
var attsize = Attachments[i].attsize;
if (isUrl)
@@ -487,7 +490,7 @@ function saveAttachments(xmlReq, emlSetting, xmlParam, resultParam)
__Log('{0} bijlage ({1} bytes) verwerken met {2}'.format(safefilename, attsize, result.path));
var tempfilename = result.tempfolder + "\\API_HMAIL_" + shared.random(32);
__Log('Tijdelijk bewaard onder {0}'.format(tempfilename));
safeFiles.push ({ sequence: i,
safeFiles.push ({ sequence: filesequence,
safefilename: safefilename,
tempfilename: tempfilename,
extension: safefilename.substr(safefilename.lastIndexOf(".")+1),
@@ -524,7 +527,7 @@ function saveAttachments(xmlReq, emlSetting, xmlParam, resultParam)
}
__Log("{0} bijlage ({1} bytes) mag naar {2}".format(safefilename, attsize, result.path));
CreateFullPath(result.path); // Hoeft hMailserver dat niet meer te doen. Eist wel dat hMail op 'onze' webserver draait
safeFiles.push ({ sequence: i,
safeFiles.push ({ sequence: filesequence,
safefilename: result.path + safefilename,
extension: safefilename.substr(safefilename.lastIndexOf(".")+1)
});

35
APPL/API2/api2.inc
View File

@@ -354,7 +354,7 @@ api2 = {
if (typeof filter != 'function')
safe_val = "(" + safe_val + ")";
operand = " IN ";
}
}
else
{
safe_val = parseInt(filterval, 10);
@@ -1063,7 +1063,7 @@ api2 = {
incdata[j][inc.joinfield] = the_key; // de parent_key altijd zetten
incdata[j].propertyid = inckey;
if (incname == "custom_fields" && ("fntablesql" in incmodel))
if (incname == "custom_fields" && ("fnkenmerktablesql" in incmodel))
{
__Log("Nu ga ik '{0}' van '{1}' {2} kenmerk {3} updaten".format(incname, model.record_name, the_key, inckey));
var inc_result = {key: inckey, warning: "", trackarray: []};
@@ -1071,29 +1071,42 @@ api2 = {
+ " WHERE flexparentkey = " + the_key
+ " AND kenmerk_key = " + inckey;
var old_k = ""; // als niet gevonden in de database
var oRs_inc = Oracle.Execute(sql_inc);
if (!oRs_inc.eof)
{
var omschr = oRs_inc("omschrijving").Value || "";
var old_v = oRs_inc("waarde").Value || "";
var old_k = oRs_inc("waarde_kenmerk").Value || "";
var new_v = incdata[j].value || "";
if (old_k !== new_v)
{
old_v = (old_k && old_k != "" ? old_v : L("lcl_trackfromempty"));
new_v = (new_v && new_v != "" ? new_v : L("lcl_tracktoempty"));
var track_msg = ("{0}: {1}" + L("lcl_trackto") + "{2}").format(omschr, old_v, new_v);
inc_result.trackarray = [track_msg];
}
}
oRs_inc.Close();
inc_trackarray = inc_trackarray.concat(inc_result.trackarray);
}
else
{
__Log("Nu ga ik een '{0}' toevoegen".format(incname));
}
incmodel.REST_POST(params, incdata[j], the_key); // Voor flexkenmerken is REST_PUT en REST_POST hetzelfde.
if (incname == "custom_fields" && ("fnkenmerktablesql" in incmodel))
{
// Nu de nieuwe waarde uit de database ophalen voor de tracking
var new_k = "";
var oRs_inc = Oracle.Execute(sql_inc);
if (!oRs_inc.eof)
{
var omschr = oRs_inc("omschrijving").Value || "";
var new_v = oRs_inc("waarde").Value || "";
var new_k = oRs_inc("waarde_kenmerk").Value || "";
}
oRs_inc.Close();
if (old_k !== new_k)
{
old_v = (old_k && old_k != "" ? old_v : L("lcl_trackfromempty"));
new_v = (new_v && new_v != "" ? new_v : L("lcl_tracktoempty"));
var track_msg = ("{0}: {1}" + L("lcl_trackto") + "{2}").format(omschr, old_v, new_v);
inc_result.trackarray = [track_msg];
}
inc_trackarray = inc_trackarray.concat(inc_result.trackarray);
}
}
else if (inckey in existing_includes)
{

8
APPL/API2/model_ins_kenmerk.inc
View File

@@ -196,8 +196,14 @@ function model_ins_kenmerk(niveau, params)
"dbs": "ins_kenmerk_regexp",
"label": L("mgt_kenmerk_regexp"),
"typ": "varchar"
},
"authorization": {
"dbs": "fac_functie_key",
"label": L("mgt_kenmerk_autorisatie"),
"typ": "key",
"foreign": "fac_functie"
}
};
};
this.getPropertyType = function (kenmerkdata)
{

1
APPL/API2/model_res_ruimte.inc
View File

@@ -417,6 +417,7 @@ function model_res_ruimte()
return result;
};
this.REST_PUT = function _PUT(params, jsondata, the_key) {
var oldExternalID = "";
if (S("msgraph_sync_level") & 5) {
var sql = "SELECT res_ruimte_extern_id FROM res_ruimte WHERE res_ruimte_key = " + the_key;
var oRs = Oracle.Execute(sql);

4
APPL/BES/bes_edit_bestelling.asp
View File

@@ -181,7 +181,7 @@ else // nieuwe bestelling. Defaults bepalen
bes_bestelling.kostenplaats_key = -1;
else
{
// Setting "prs_dep_default_kpn": A user can make costs for his own department by default {0=no | 1=yes}
// Setting "prs_dep_default_kpn": A user can make costs for his own department by default {0=no | 1=yes | 2=all departments of company}
var authForOwnAcoount = true;
if (S("prs_dep_default_kpn") == 0)
{ // Niet standaard geautoriseerd voor eigen kostenplaats. Dit hier checken
@@ -197,7 +197,7 @@ else // nieuwe bestelling. Defaults bepalen
authForOwnAcoount = (!oRs.eof);
oRs.Close();
}
if (user.afdeling().prs_kostenplaats_key() && authForOwnAcoount)
if (user.afdeling().prs_kostenplaats_key() && authForOwnAcoount) // Dus voor S(prs_dep_default_kpn) is 1 of 2.
bes_bestelling.kostenplaats_key = user.afdeling().prs_kostenplaats_key();
else
bes_bestelling.kostenplaats_key = -1;

2
APPL/FAC/fac_edit_faq.asp
View File

@@ -177,7 +177,7 @@ var authparams = user.checkAutorisation(authFuncs);
required: true,
autfunctionKey: authparams.autfunctionkeys
});
RWTEXTAREATR("fac_question", "fldtxt required", L("lcl_faq_question"), question, {html: "rows='3' maxlength='4000'"});
RWTEXTAREATR("fac_question", "fldtxt required", L("lcl_faq_question"), question, {html: "rows='3' maxlength='200'", no_bb_codes: true});
RWTEXTAREATR("fac_answer", "fldtxt required", L("lcl_faq_answer"), answer, {html: "rows='3' maxlength='4000'", bb_codes: true});
RWTEXTAREATR("fac_hint", "fldtxt", L("lcl_faq_hint"), hint);
RWFIELDTR("fac_url", "fld", L("lcl_faq_link"), url);

17
APPL/FAC/fac_verify.inc
View File

@@ -2278,6 +2278,23 @@ checker("Clocks", // deze zo laat mogelijk zodat als straks de clientside clock
}
)
checker("Login failures last " + S("prs_login_lockout_expire") + " minutes",
function ()
{
var lockout_name = customerId + "_LOGINATTEMPTS";
var lockout_data = Application(lockout_name);
var txt = "No failures";
res = resultcodes.ok;
if (lockout_data && lockout_data != "[]")
{
var txt = "<pre>" + JSON.stringify(myJSON.parse(lockout_data), null, ' ') + "</pre>";
res = resultcodes.warning;
}
return { result: res, message: txt };
}
)
__GROUP = "Client Information";
checker("Localstorage Collection",
function ()

1
APPL/FIN/fin_edit_factuur_save.asp
View File

@@ -274,6 +274,7 @@ if (!isNew)
currentKenmerkenSQL = "SELECT kf.fin_kenmerk_key"
+ " , kf.fin_kenmerkfactuur_waarde"
+ " , k.fin_kenmerk_toonbaar"
+ " , k.fac_functie_key"
+ " FROM fin_kenmerkfactuur kf"
+ " , fin_kenmerk k"
+ " WHERE k.fin_kenmerk_key = kf.fin_kenmerk_key"

6
APPL/INS/ins_list.inc
View File

@@ -104,9 +104,9 @@ function ins_list (pautfunction, params)
var reg_key = params.reg_key;
var dist_key = params.dist_key;
var loc_key = params.loc_key;
var disc_key_arr = params.disc_key_arr;
var insgroup_key_arr = params.insgroup_key_arr;
var objsrt_key_arr = params.objsrt_key_arr;
var disc_key_arr = params.disc_key_arr || [];
var insgroup_key_arr = params.insgroup_key_arr || [];
var objsrt_key_arr = params.objsrt_key_arr || [];
var ctrdisc_key = params.ctrdisc_key;
var srtcontrole_key_arr = params.srtcontrole_key_arr;
var dep_key = params.dep_key;

2
APPL/INS/ins_srtcontrolexcp_pc_save.asp
View File

@@ -189,6 +189,7 @@ if (pc_costs != 0 || pc_costs2 != 0 || pc_costs3 != 0 || pc_material != 0)
+ " , xcp.ins_deel_aantal aantal_val"
+ " , xcp.ins_srtdeel_eenheid aanteh_val"
+ " , xcp.ins_srtcontrole_periode periode_val"
+ " , xcp.prs_kostenplaats_key kp_key_val"
+ " , xcp.ins_srtcontrole_bits bits_val"
+ " , ROUND(xcp.ins_srtcontrole_kosten"
+ (ins_xcp_active_cost & 1
@@ -233,6 +234,7 @@ if (pc_costs != 0 || pc_costs2 != 0 || pc_costs3 != 0 || pc_material != 0)
var params = { xcp_key: xcp_key,
periode: oRs_val("periode_val").Value,
eenheid: oRs_val("eenheid_val").Value,
kp_key: oRs_val("kp_key_val").Value || -1,
bits: oRs_val("bits_val").Value,
uren: oRs_val("uren_val").Value,
materiaal: oRs_val("materiaal_val").Value,

4
APPL/INS/ins_xcp_multi_save.asp
View File

@@ -124,9 +124,9 @@ for (var i = 0; i < ingesloten.length; i++)
else
var periode = oRs_val("periode_val").Value;
if (getFParam("check_account", "off") == "on")
var kp_key = (fkp_key == null? oRs_std("kp_key_std").Value : fkp_key);
var kp_key = (fkp_key == -1? oRs_std("kp_key_std").Value : fkp_key) || -1;
else
var kp_key = oRs_val("kp_key_val").Value;
var kp_key = oRs_val("kp_key_val").Value || -1;
if (getFParam("check_kosten1", "off") == "on")
var kosten1 = (fkosten1 == null? oRs_std("kosten1_std").Value : fkosten1);
else

3
APPL/MJB/mjb_commit_scen.asp
View File

@@ -96,6 +96,7 @@ for (var i = 0; i < ingesloten.length; i++)
var sql = "SELECT xcp.ins_srtcontroledl_xcp_key"
+ " , isc.ins_srtcontrole_mode"
+ " , xcp.ins_srtcontroledl_xcp_periode"
+ " , xcp.prs_kostenplaats_key"
+ " , xcp.ins_srtcontroledl_xcp_eenheid"
+ " , xcp.ins_srtcontroledl_xcp_bits"
+ " , xcp.ins_srtcontroledl_xcp_uren"
@@ -123,6 +124,7 @@ for (var i = 0; i < ingesloten.length; i++)
var xcp_key = oRs("ins_srtcontroledl_xcp_key").Value;
var mode = oRs("ins_srtcontrole_mode").Value;
var periode = oRs("ins_srtcontroledl_xcp_periode").Value;
var kp_key = oRs("prs_kostenplaats_key").Value || -1;
var eenheid = oRs("ins_srtcontroledl_xcp_eenheid").Value;
var bits = oRs("ins_srtcontroledl_xcp_bits").Value;
var uren = oRs("ins_srtcontroledl_xcp_uren").Value;
@@ -143,6 +145,7 @@ for (var i = 0; i < ingesloten.length; i++)
var params = { xcp_key: xcp_key,
periode: periode,
eenheid: eenheid,
kp_key: kp_key,
bits: bits,
uren: uren,
materiaal: materiaal,

2
APPL/MLD/mld_edit_melding.asp
View File

@@ -517,7 +517,7 @@ else
{
if (multi)
mld_melding.kostenpl_key = user.afdeling().prs_kostenplaats_key();
else if (/* TODO: overwegen kpnverplicht && */ mandaat_eigen_kp == 1 && mld_melding.mld_kk == 1)
else if (/* TODO: overwegen kpnverplicht && */ mandaat_eigen_kp > 0 && mld_melding.mld_kk == 1)
mld_melding.kostenpl_key = melder_obj.afdeling().prs_kostenplaats_key() || -1;
if (mld_melding.show_bes)
{

2
APPL/MLD/mld_show_melding.asp
View File

@@ -178,7 +178,7 @@ if (mld_melding.show_bes)
$(function ()
{
FcltMgr.setTitle("<%=safe.jsstring(S("mld_num_prefix_mode") == 1?"":L("lcl_complain") + " " + (mld_melding.prefix||"") + mld_key)%>", {hot:false});
FcltMgr.setTitle("<%=safe.jsstring((S("mld_num_prefix_mode") == 1?"":L("lcl_complain")) + " " + (mld_melding.prefix||"") + mld_key)%>", {hot:false});
$('textarea').resize(function () { FcltMgr.resized(window) } );
$('textarea').autogrow();
});

31
APPL/MLD/opdr_list.inc
View File

@@ -557,14 +557,14 @@ function opdr_list(params)
{
var this_mld = mld.func_enabled_melding(mld_key);
addallowed = this_mld.canAddOpdr;
var canAccept = this_mld.canAccept;
}
oRs3.Close();
if (addallowed)
{
var addurl = "appl/mld/mld_opdr.asp?urole=bo&mld_key=" + mld_key;
if (!params.opdr_parent_key)
buttons.push({ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" });
buttons.push({ icon: "fa-plus", title: L("lcl_add"), action: "add_opdracht("+(canAccept?1:0)+")" });
if (!inline)
buttons.push({ icon: "fa-fclt-refresh", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
// else ooit eens testen/ netjes
@@ -970,6 +970,33 @@ if (S("mld_show_order_details"))
$(".clickParent").parent().on("click", function(e) { e.stopPropagation(); $(this).find("> .clickParent").trigger("click"); });
});
function add_opdracht(canAccept)
{
var addurl = "appl/mld/mld_opdr.asp?urole=bo&mld_key=<%=mld_key%>";;
if (canAccept) // we negeren S("mld_accept_confirm") verder en slaan accept-dialoog over.
{
FcltMgr.confirm(L("lcl_mld_accept_3"),
{},
function() {
var data = {
mld_key: <%=mld_key%>
};
protectRequest.dataToken(data);
$.post("../mld/mld_accept_save.asp",
data,
FcltCallbackAndThen(function () {
if (window.parent.mldframe && window.parent.mldframe.mld_melding_reload)
window.parent.mldframe.mld_melding_reload(mld_key)
FcltMgr.openDetail(addurl)
}),
"json")
}
);
}
else
FcltMgr.openDetail(addurl);
}
function openOpdrLegenda(id)
{
params = { width: 250,

2
APPL/PDA/melding.asp
View File

@@ -439,7 +439,7 @@ else
mld_info.prefix = stdm_info.ins_srtdiscipline_prefix;
if (mandaat_eigen_kp == 1 && mld_info.mld_kk == 1)
if (mandaat_eigen_kp > 0 && mld_info.mld_kk == 1)
mld_info.kostenpl_key = melder_obj.afdeling().prs_kostenplaats_key() || -1;
mld_info.mld_stdmelding_omschrijving = stdm_info.stdmelding_omschrijving;

52
APPL/PDA/plaatsselector.asp
View File

@@ -230,6 +230,29 @@ function getOnroerendgoed(p_onrgoed)
function getLevelSql(p_alg_level, filt_params, key_params)
{
function withAutorisationLevel(autlevel, key_params)
{
if (filt_params.autlevel == -1) // Authorized for all
{
sql_a = " AND 1 = 1";
}
else if (filt_params.autlevel >= 0 && filt_params.autlevel <= 5)
{
sql_a = " AND " + key_params.lijst.prefix + "." + key_params.lijst.field + " IN"
+ " (SELECT " + key_params.lijst.field
+ " FROM " + key_params.lijst.view
+ " WHERE prs_perslid_key = " + user_key
+ " AND niveau = " + filt_params.autlevel
+ " )";
}
else if (filt_params.autlevel > 5) // Not authorized
{
sql_a = " AND 1 = 0";
}
return sql_a;
}
var filtClause;
var sql_p = "";
var level_sql;
@@ -277,7 +300,8 @@ function getLevelSql(p_alg_level, filt_params, key_params)
+ (filtClause.from || "")
+ " WHERE r.alg_ruimte_key = a.alg_ruimte_key"
+ level_sql
+ (filtClause.where || "");
+ (filtClause.where || "")
+ withAutorisationLevel(filt_params.autlevel, key_params);
break;
case 4:
filtClause = getFiltClauseVerdieping(filt_params.filtCode, filt_params.filtParams);
@@ -290,7 +314,8 @@ function getLevelSql(p_alg_level, filt_params, key_params)
+ (filtClause.from || "")
+ " WHERE v.alg_gebouw_key = a.alg_gebouw_key"
+ level_sql
+ (filtClause.where || "");
+ (filtClause.where || "")
+ withAutorisationLevel(filt_params.autlevel, key_params);
break;
case 3:
filtClause = getFiltClauseGebouw(filt_params.filtCode, filt_params.filtParams);
@@ -304,7 +329,8 @@ function getLevelSql(p_alg_level, filt_params, key_params)
+ " AND g.alg_srtgebouw_key = sg.alg_srtgebouw_key"
+ level_sql
+ " AND (a.alg_locatie_vervaldatum IS NULL OR a.alg_locatie_vervaldatum > TRUNC(SYSDATE))"
+ (filtClause.where_geb || "");
+ (filtClause.where_geb || "")
+ withAutorisationLevel(filt_params.autlevel, key_params);
var sql_t = "SELECT DISTINCT"
+ " a.alg_terreinsector_key bld_key"
@@ -338,7 +364,8 @@ function getLevelSql(p_alg_level, filt_params, key_params)
+ " FROM alg_v_aanweziglocatie l"
+ (filtClause.from || "")
+ " WHERE " + (key_params.district_key > 0 ? "l.alg_district_key = " + key_params.district_key : "1 = 1")
+ (filtClause.where || "");
+ (filtClause.where || "")
+ withAutorisationLevel(filt_params.autlevel, key_params);
break;
case 1:
filtClause = getFiltClauseDistrict(filt_params.filtCode, filt_params.filtParams);
@@ -346,25 +373,12 @@ function getLevelSql(p_alg_level, filt_params, key_params)
+ " , d.alg_district_omschrijving naam"
+ " FROM alg_v_aanwezigdistrict d"
+ " WHERE 1 = 1"
+ (filtClause || "");
+ (filtClause || "")
+ withAutorisationLevel(filt_params.autlevel, key_params);
break;
case 0: break;
}
if (filt_params.autlevel == -1) // Authorized for all
sql_p += " AND 1 = 1";
else if (filt_params.autlevel >= 0 && filt_params.autlevel <= 5)
{
sql_p += " AND " + key_params.lijst.prefix + "." + key_params.lijst.field + " IN"
+ " (SELECT " + key_params.lijst.field
+ " FROM " + key_params.lijst.view
+ " WHERE prs_perslid_key = " + user_key
+ " AND niveau = " + filt_params.autlevel
+ " )";
}
else if (filt_params.autlevel > 5) // Not authorized
sql_p += " AND 1 = 0";
sql_p += " ORDER BY " + (p_alg_level == 5? "3, " : "") + "2";
return sql_p;

20
APPL/PDA/reservering.asp
View File

@@ -206,7 +206,7 @@ else
{
Server.Transfer("reservering_new.asp"); // Ga maar eerst datum kiezen
}
else if (ruimtekey) // Voorziening reservering
else if (alg_ruimtekey) // Voorziening reservering
{
var rsv = { loc_key: getQParamInt("loc_key", -1)
, bld_key: getQParamInt("bld_key", -1)
@@ -282,6 +282,7 @@ else
, ruimte_tot: res_tot
, bezoekers: getQParamInt("bez_cnt", 0)
, verwijderd: false
, artikel_key: -1
};
if (rsv.kostenklant)
{
@@ -781,10 +782,14 @@ else
}
oRsd.Close();
// - indien leesrechten? TODO
sqla = "SELECT res_artikel_omschrijving"
+ " , res_rsv_artikel_aantal"
+ " , res_rsv_artikel_prijs"
+ " FROM res_rsv_artikel rra, res_artikel ra"
sqla = "SELECT ra.res_artikel_omschrijving"
+ " , rra.res_rsv_artikel_aantal"
+ " , CASE WHEN (rra.res_rsv_artikel_prijs IS NULL AND ra.res_artikel_prijs_vast = 1)"
+ " THEN ra.res_artikel_prijs * rra.res_rsv_artikel_aantal"
+ " ELSE rra.res_rsv_artikel_prijs"
+ " END artikel_prijs"
+ " FROM res_rsv_artikel rra"
+ " , res_artikel ra"
+ " WHERE rra.res_artikel_key = ra.res_artikel_key"
+ " AND rra.res_rsv_ruimte_key = " + rsv_ruimte_key;
var oRsa = Oracle.Execute(sqla);
@@ -792,9 +797,8 @@ else
{
if (oRsdi < 1)
BLOCK_START({collapsed: false, title: L("lcl_catering")});
var extra_txt = ( !isNaN(oRsa("res_rsv_artikel_prijs").Value)
? "<div style='float: right;'>&euro; " + safe.curr(oRsa("res_rsv_artikel_prijs").Value) + " " + L("lcl_shared_inclBTW") + "</div></br/>"
var extra_txt = ( oRsa("artikel_prijs").Value && !isNaN(oRsa("artikel_prijs").Value)
? "<div style='float: right;'>&euro; " + safe.curr(oRsa("artikel_prijs").Value) + " " + L("lcl_shared_inclBTW") + "</div></br/>"
: ""
);
ROFIELD("fld", "", oRsa("res_rsv_artikel_aantal").Value + " x " + oRsa("res_artikel_omschrijving").Value, {suppressEmpty: true, html: extra_txt});

3
APPL/PRS/pchange.asp
View File

@@ -13,6 +13,7 @@
*/ %>
<%
var EXPIRED_PASSWORD_OK = true;
var NO_OTP_OK = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/iface.inc" -->
@@ -163,4 +164,4 @@ IFACE.FORM_END();
</body>
</html>
<% ASPPAGE_END(); %>
<% ASPPAGE_END(); %>

1
APPL/PRS/pchange_save.asp
View File

@@ -11,6 +11,7 @@
*/ %>
<%
var EXPIRED_PASSWORD_OK = true;
var NO_OTP_OK = true;
var JSON_Result = true;
%>
<!-- #include file="../Shared/common.inc" -->

2
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -194,7 +194,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"] });
if (show_empty_kp)
var kp_key = -1;
else
var kp_key = (S("prs_dep_default_kpn") == 1 ? user.afdeling().prs_kostenplaats_key() || -1 : -1)
var kp_key = (S("prs_dep_default_kpn") > 0 ? user.afdeling().prs_kostenplaats_key() || -1 : -1)
var rrr = {
rsv_ruimte_key : rsv_ruimte_key,

2
APPL/RES/res_search.asp
View File

@@ -117,7 +117,7 @@ var roomcatalogue_key_arr = getQParamIntArray("roomcatmulti", []); // Ruimte soo
var obj_key_arr = getQParamIntArray("objcatmulti", []); // Voorzieningen catalogus
var art_key_arr = getQParamIntArray("artcatmulti", []); // Verbruiksartikelen catalogus
var article_arr = getQParamIntArray("art", []); // Verbruiksartikelen
var artgroup = getQParamInt("artgroup", -1); // Artikelgroep
var artgroup = getQParam("artgroup", -1); // Artikelgroep
var sortout = getQParamInt("sortout", -1); // Sortering
var group = getQParamInt("groupby", -1); // Groepering
var resstatus = getQParamInt("resstatus", -1); // fo_status

29
APPL/SLE/sle_list.inc
View File

@@ -203,7 +203,15 @@ function sle_list (params)
+ sqlBasisWhere
+ " AND d.ins_alg_ruimte_type = 'P'"
+ " AND d.ins_alg_ruimte_type_org IS NOT NULL"
+ " AND NOT EXISTS (SELECT '1' FROM ins_srtdeel_srtdeel WHERE ins_srtdeel_key_2 = d.ins_srtdeel_key)" // Niet uitgegeven cilinder.
// Er moet een niet uitgegeven cilinder aanwezig zijn.
+ " AND EXISTS (SELECT '1'"
+ " FROM ins_srtdeel_srtdeel ss"
+ " , ins_v_aanwezigsrtdeel s1"
+ " , ins_v_aanwezigdeel d1"
+ " WHERE ins_srtdeel_key_2 = d.ins_srtdeel_key"
+ " AND ss.ins_srtdeel_key_1 = s1.ins_srtdeel_key"
+ " AND s1.ins_srtdeel_key = d1.ins_srtdeel_key"
+ " AND d1.ins_alg_ruimte_key_org IS NULL)" // Niet uitgegeven cilinder.
+ (persoon_key
? " AND d.ins_alg_ruimte_key = " + persoon_key
: "")
@@ -282,7 +290,15 @@ function sle_list (params)
+ sqlBasisWhere
+ " AND d.ins_alg_ruimte_type IN ('R', 'T', 'P')"
+ " AND d.ins_alg_ruimte_type_org IS NULL"
+ " AND NOT EXISTS (SELECT '1' FROM ins_srtdeel_srtdeel WHERE ins_srtdeel_key_2 = d.ins_srtdeel_key)" // Niet uitgegeven cilinder.
// Er moet een niet uitgegeven cilinder aanwezig zijn.
+ " AND EXISTS (SELECT '1'"
+ " FROM ins_srtdeel_srtdeel ss"
+ " , ins_v_aanwezigsrtdeel s1"
+ " , ins_v_aanwezigdeel d1"
+ " WHERE ins_srtdeel_key_2 = d.ins_srtdeel_key"
+ " AND ss.ins_srtdeel_key_1 = s1.ins_srtdeel_key"
+ " AND s1.ins_srtdeel_key = d1.ins_srtdeel_key"
+ " AND d1.ins_alg_ruimte_key_org IS NULL)" // Niet uitgegeven cilinder.
+ (authparamsSLEFOF && authparamsSLEFOF.ALGreadlevel > -1
? " AND EXISTS"
+ " (SELECT alg_ruimte_key FROM all_my_FOF_rooms"
@@ -304,8 +320,6 @@ function sle_list (params)
+ " , ins_v_aanwezigdeel d"
+ " , ins_srtdeel_srtdeel ss"
+ " , ins_v_aanwezigsrtgroep sg"
+ " , alg_v_allonrgoed_gegevens aog"
+ " , alg_v_aanweziglocatie l";
sqlBasisWhere = " WHERE s1.ins_srtdeel_key = d1.ins_srtdeel_key"
+ " AND s.ins_srtdeel_key = d.ins_srtdeel_key"
+ " AND s1.ins_srtgroep_key = " + S("cil_ins_srt_groep_key")
@@ -313,7 +327,6 @@ function sle_list (params)
+ " AND ss.ins_srtdeel_key_1 = s1.ins_srtdeel_key" // cillinder
+ " AND ss.ins_srtdeel_key_2 = s.ins_srtdeel_key" // Sleutel
+ " AND s.ins_srtgroep_key = sg.ins_srtgroep_key"
+ " AND aog.alg_locatie_key = l.alg_locatie_key"
+ " AND sg.ins_srtgroep_key = " + S("sle_ins_srt_groep_key")
+ (deel
? " AND d.ins_deel_upper LIKE " + safe.quoted_sql_wild("%" + deel + "%")
@@ -330,7 +343,10 @@ function sle_list (params)
+ ", l.alg_locatie_code || '-' || aog.alg_gebouw_code || '-' || aog.alg_verdieping_code || '-' || aog.alg_ruimte_nr plaats"
+ ", '7' nummer"
+ sqlBasisFrom
+ ", alg_v_allonrgoed_gegevens aog"
+ ", alg_v_aanweziglocatie l"
+ sqlBasisWhere
+ " AND aog.alg_locatie_key = l.alg_locatie_key"
+ " AND aog.alg_onroerendgoed_keys = d1.ins_alg_ruimte_key"
+ " AND aog.alg_type = d1.ins_alg_ruimte_type"
+ " AND d1.ins_alg_ruimte_type_org IN ('R', 'T')"
@@ -350,8 +366,6 @@ function sle_list (params)
+ ", '8' nummer"
+ sqlBasisFrom
+ sqlBasisWhere
+ " AND aog.alg_onroerendgoed_keys = d.ins_alg_ruimte_key"
+ " AND aog.alg_type = d.ins_alg_ruimte_type"
+ " AND d1.ins_alg_ruimte_type IN ('R', 'T')"
+ " AND d1.ins_alg_ruimte_type_org IS NULL"
+ (authparamsSLEBOF && authparamsSLEBOF.ALGreadlevel > -1
@@ -513,6 +527,7 @@ function sle_list (params)
+ " FROM (" + sql + ") tot"
+ " , ins_v_aanwezigdeel deel"
+ " WHERE tot.ins_srtdeel_key = deel.ins_srtdeel_key"
+ " AND tot.ins_deel_key = deel.ins_deel_key"
+ " GROUP BY tot.ins_srtdeel_key"
+ " , tot.ins_srtdeel_omschrijving"
+ " , tot.ins_srtdeel_code"

4
APPL/Shared/BijlagenForm_async.js
View File

@@ -9,7 +9,7 @@ function compress(initFileList, lf, maxWidth, maxHeight) {
try {
var compressedFileList = [];
for (var file = 0; file < initFileList.length; file++) {
if (initFileList[file].name.match(/\.jpg$/) || initFileList[file].name.match(/\.jpeg$/)) {
if (initFileList[file].name.match(/\.jpg$/i) || initFileList[file].name.match(/\.jpeg$/i)) {
var canvas = document.createElement('canvas');
const ctx = canvas.getContext('2d');
const img = await createImageBitmap(initFileList[file]);
@@ -74,5 +74,5 @@ function compress(initFileList, lf, maxWidth, maxHeight) {
console.log("Error: File might be corrupted.");
console.log(error);
}
}
}
}

30
APPL/Shared/Suggest/persoonFilter.inc
View File

@@ -405,21 +405,23 @@ function getFiltClausePersoon(pfiltcode, params)
break;
}
}
if (params.room_key > 0 || params.flr_key > 0 || params.bld_key > 0 || params.loc_key > 0)
else // Alleen als geen andere filtcode (zoals BEHB of BH2B die loc_key anders gebruiken)
{
lfiltClause += " AND p.prs_perslid_key IN (SELECT wp.prs_perslid_key"
+ " FROM prs_perslidwerkplek wp, prs_v_werkplek_gegevens w"
+ " WHERE wp.prs_werkplek_key = w.prs_werkplek_key"
if (params.room_key > 0)
lfiltClause += " AND w.alg_ruimte_key = " + params.room_key;
else if (params.flr_key > 0)
lfiltClause += " AND w.alg_verdieping_key = " + params.flr_key;
else if (params.bld_key > 0)
lfiltClause += " AND w.alg_gebouw_key = " + params.bld_key;
else if (params.loc_key > 0)
lfiltClause += " AND w.alg_locatie_key = " + params.loc_key;
lfiltClause += " )";
if (params.room_key > 0 || params.flr_key > 0 || params.bld_key > 0 || params.loc_key > 0)
{
lfiltClause += " AND p.prs_perslid_key IN (SELECT wp.prs_perslid_key"
+ " FROM prs_perslidwerkplek wp, prs_v_werkplek_gegevens w"
+ " WHERE wp.prs_werkplek_key = w.prs_werkplek_key"
if (params.room_key > 0)
lfiltClause += " AND w.alg_ruimte_key = " + params.room_key;
else if (params.flr_key > 0)
lfiltClause += " AND w.alg_verdieping_key = " + params.flr_key;
else if (params.bld_key > 0)
lfiltClause += " AND w.alg_gebouw_key = " + params.bld_key;
else if (params.loc_key > 0)
lfiltClause += " AND w.alg_locatie_key = " + params.loc_key;
lfiltClause += " )";
}
}
if (pfiltcode != 'CPO')

10
APPL/Shared/kenmerk_common.inc
View File

@@ -3530,9 +3530,11 @@ function _saveFlexKenmerken(parentKey, params, flexdata) // TODO: support multiM
var kdomein_key = oRsk("fac_kenmerkdomein_key").Value;
var confidential= oRsk("kenmerk_systeem").Value&4;
oRsk.Close();
var vold_track = vold; // De waarde die bij tracking getoond wordt kan wijzigen tov de waare die in de tabel moet worden opgeslagen.
var vnew_track = vnew; // Gebruik daarom voor de tracking tekst nieuwe variabelen!
if (confidential)
{
vold = vnew = L("lcl_confidential_mask");
vold_track = vnew_track = L("lcl_confidential_mask");
}
else
{
@@ -3541,19 +3543,19 @@ function _saveFlexKenmerken(parentKey, params, flexdata) // TODO: support multiM
if (vold != "")
{
var oRsd = Oracle.Execute("SELECT fac.getdomeinwaarde(" + kdomein_key + ", " + safe.quoted_sql(vold) + ") domeinwaarde FROM DUAL");
vold = oRsd("domeinwaarde").Value;
vold_track = oRsd("domeinwaarde").Value;
oRsd.Close();
}
if (vnew != "")
{
var oRsd = Oracle.Execute("SELECT fac.getdomeinwaarde(" + kdomein_key + ", " + safe.quoted_sql(vnew) + ") domeinwaarde FROM DUAL");
vnew = oRsd("domeinwaarde").Value;
vnew_track = oRsd("domeinwaarde").Value;
oRsd.Close();
}
}
}
trackarray.push(label + ": " + buildTrackText("varchar", vold, vnew, {nodiff: (flex.type != "C"? true : null)}));
trackarray.push(label + ": " + buildTrackText("varchar", vold_track, vnew_track, {nodiff: (flex.type != "C"? true : null)}));
}
}

6
APPL/Shared/save2db.inc
View File

@@ -681,7 +681,7 @@ function _buildFields(fields, params, tabel, where)
{
tupel.sql = parseInt(val, 10);
if (isNaN(tupel.sql))
abort_with_warning("Unexpected error: " + field.dbs + " is not a key");
abort_with_warning("Unexpected error: " + field.dbs + " is not a key but " + val);
}
break;
}
@@ -700,7 +700,7 @@ function _buildFields(fields, params, tabel, where)
else
{ tupel.sql = parseInt(val, 10);
if (isNaN(tupel.sql))
abort_with_warning("Unexpected error: " + field.dbs + " is not a number");
abort_with_warning("Unexpected error: " + field.dbs + " is not a number but " + val);
}
break;
}
@@ -727,7 +727,7 @@ function _buildFields(fields, params, tabel, where)
val = val.replace(/,/g,".");
tupel.sql = parseFloat(val);
if (isNaN(tupel.sql))
abort_with_warning("Unexpected error: " + field.dbs + " is not a float");
abort_with_warning("Unexpected error: " + field.dbs + " is not a float but " + val);
}
break;
}

4
UTILS/mail_receive/mailbox_cleaner.bat
View File

@@ -1,4 +1,4 @@
@REM Aan te roepen met mailbox_cleaner administrator ****
@REM Aan te roepen met mailbox_cleaner *******
@cd /D "%~dp0"
@ECHO See ../../TEMP/%0.log for results
@cscript //NoLogo mailbox_cleaner.js %* >>../../TEMP/%0.log 2>>&1
@cscript //NoLogo mailbox_cleaner.js administrator %* >>../../TEMP/%0.log 2>>&1