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

Merge 2024.3 Gold C patches

Browse Source 
svn path=/Website/trunk/; revision=67510
This commit is contained in:
Koen Reefman
2025-01-06 13:44:12 +00:00
parent a20eaa5a74 93e9ec8e1a
commit fe6f65c04c
9 changed files with 172 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/CAD/legenda.asp
View File

@@ -35,7 +35,7 @@
fulldiscreet = 0; fulldiscreet = 0;
var forPrint = getQParamInt("forPrint", 0); var forPrint = getQParamInt("forPrint", 0);
var showtitle = getQParamInt("showtitle", 1) == 1; var showtitle = getQParamInt("showtitle", 1) == 1;
var outputmode = (forPrint == 0 ? 0 : 1); var outputmode = 0; // altijd 'screen' zodat default.css wel wordt bijgeladen voor 'legendakleurblokje'
%> %>
<!--#include file='../Shared/common.inc'--> <!--#include file='../Shared/common.inc'-->

3
APPL/FAC/fac_faq_search.asp
View File

@@ -149,7 +149,8 @@ oRs.close();
+ " FROM fac_faq ff" + " FROM fac_faq ff"
+ " WHERE fd.ins_discipline_key = ff.faq_ins_discipline_key" + " WHERE fd.ins_discipline_key = ff.faq_ins_discipline_key"
+ " AND fd.ins_discipline_verwijder IS NULL)" + " AND fd.ins_discipline_verwijder IS NULL)"
+ " AND fd.ins_discipline_key IN (" + faq_aut_sql + ")"; + " AND fd.ins_discipline_key IN (" + faq_aut_sql + ")"
+ " ORDER BY 2";
FCLTselector( "faq_disc", FCLTselector( "faq_disc",
faq_disc_sql, faq_disc_sql,
{ label: L("faq_discipline"), { label: L("faq_discipline"),

145
APPL/MARX/PostcodeVertaalGLN.asp Normal file
View File

@@ -0,0 +1,145 @@
<%@language = "javascript" %>
<% /*
$Revision$
$Id$
File: PostcodeVertaalGLN.asp
Description: Voor de leverancier: vertaal de postcode(s) of postcode range VAN - T/M in een GLN van de leverancier (zodat de opdracht daar landt).
Context: Voor de leverancier met Mareon Premium. Registratie gebeurt in "eigen" tabel (key 12), in de records fac_usrdata.
*/
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<%
FCLTHeader.Requires({plugins:["jQuery"]})
// De leverancier die Postcode(gebieden) mag vertalen naar GLN, is beheerder, en heeft WEB_EXTREL
// Daarop gaan we controleren...
__Log("START authparams: ");
var authparams = user.checkAutorisation("WEB_EXTREL");
%>
<html>
<head>
<%
FCLTHeader.Generate();
%>
<title>Vertaaltabel Postcodes-GLN</title>
<style type="text/css">
html, body { height: 100%; margin: 0; padding: 0;}
</style>
<script>
function doReset()
{
document.getElementById("postcode").value = "";
document.getElementById("gln_lev").value = "";
}
function show_list_vertaling()
{
$('#list_vertaling_postcode').load('../fac/fac_report.asp?rapcode=fac_vertaling_postcodegln&mode=list');
}
function escapeXML(p_str)
{
p_result = p_str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;');
return p_result;
}
function doSubmit(p_action)
{
var l_url = "<%=HTTP.urlzelf()%>";
var l_apiname = "ACTION_REF_KEY";
var post2url = l_url + "/?API=" + l_apiname;
var l_postcode = document.getElementById("postcode").value;
var l_gln_lev = document.getElementById("gln_lev").value;
var l_refkey;
var l_refkey_array = [];
if (p_action == "FAC_USRDATA_POSTCODEGLN"){
l_refkey_array.push(-1); // dummy, dont care, doet nog niets
}
for (var i = 0; i < l_refkey_array.length; i++)
{
l_refkey = l_refkey_array[i];
var body = "<xml><action><action_code>" + p_action + "</action_code><ref_key>" + l_refkey + "</ref_key><extra_omschr>" + escapeXML(l_postcode) + '|' + escapeXML(l_gln_lev) + "</extra_omschr></action></xml>"
$.post(post2url, body, fnCallback, "text");
}
}
function fnCallback(l_xml_response)
{
//console.log(l_xml_response);
if (l_xml_response.indexOf("false") != -1)
{
var l_error_indicator_start = "<omschrijving>";
var l_error_pos_1 = l_xml_response.indexOf(l_error_indicator_start);
var l_error_indicator_end = "</omschrijving>";
var l_error_pos_2 = l_xml_response.indexOf(l_error_indicator_end);
var l_error_omschr = l_xml_response.substring(l_error_pos_1 + 14, l_error_pos_2);
l_error_indicator_start = "mar_update_action_ref_key:";
l_error_pos_1 = l_xml_response.indexOf(l_error_indicator_start);
l_error_indicator_end = "[Action";
l_error_pos_2 = l_xml_response.indexOf(l_error_indicator_end);
l_error_omschr = l_xml_response.substring(l_error_pos_1 + 26, l_error_pos_2);
FcltMgr.alert(l_error_omschr);
}
else
{
show_list_vertaling();
}
}
function init(){
show_list_vertaling();
}
</script>
</head>
<body onload="init()">
<div id="list_vertaling_postcode" style="width:100%"></div>
<form method="post">
<table style="width:100%;border:5px double black">
<tr>
<td>
<span><%=L("lcl_alg_loc_postcode")%>: <input id="postcode" type="number" class="fld" style="width:200px" value=""></span>
<br/>
</td>
<td
<span><%=L("lcl_prs_companies_leverancier_nr")%>: <input id="gln_lev" type="text" class="fld wildcard" style="width:200px" value=""></span>
<br/>
</td>
</tr>
<tr>
<td align="right" colspan="2">
<input type="button" onclick="doSubmit('FAC_USRDATA_POSTCODEGLN')" value='<%=L("lcl_change")%>'>
<input type="button" onclick="doReset()" value='<%=L("lcl_reset")%>'>
</td>
</tr>
</table>
</form>
</body>
</html>
<% ASPPAGE_END(); %>

4
APPL/RES/res_rsv_deel_by_placetime.inc
View File

@@ -200,7 +200,7 @@ rdpt = {
+ (p_flr_key > -1 ? " AND plts.alg_verdieping_key = " + p_flr_key + (p_flr_key > -1 ? " AND plts.alg_verdieping_key = " + p_flr_key
: " AND plts.alg_gebouw_key = " + p_geb_key) : " AND plts.alg_gebouw_key = " + p_geb_key)
+ " AND g.alg_gebouw_key = plts.alg_gebouw_key" + " AND g.alg_gebouw_key = plts.alg_gebouw_key"
+ " AND vrij.mld_vrije_dagen_id = COALESCE(g.mld_vrije_dagen_id, 'Default')" + " AND vrij.mld_vrije_dagen_id(+) = COALESCE(g.mld_vrije_dagen_id, 'Default')"
+ " AND rd.res_discipline_key IN (" + p_res_disc_key_arr.join(",") + ")" + " AND rd.res_discipline_key IN (" + p_res_disc_key_arr.join(",") + ")"
+ (p_resdate ? " AND TRUNC (rrd.res_rsv_deel_van) = " + p_resdate.toSQL() + (p_resdate ? " AND TRUNC (rrd.res_rsv_deel_van) = " + p_resdate.toSQL()
: " AND TRUNC (rrd.res_rsv_deel_van) BETWEEN TRUNC (SYSDATE +"+(p_dateoffset||0)+") AND TRUNC (SYSDATE-1+"+(p_dateoffset||0)+"+"+p_datelimit+") " : " AND TRUNC (rrd.res_rsv_deel_van) BETWEEN TRUNC (SYSDATE +"+(p_dateoffset||0)+") AND TRUNC (SYSDATE-1+"+(p_dateoffset||0)+"+"+p_datelimit+") "
@@ -287,7 +287,7 @@ rdpt = {
+ (p_flr_key > -1 ? " AND plts.alg_verdieping_key = " + p_flr_key + (p_flr_key > -1 ? " AND plts.alg_verdieping_key = " + p_flr_key
: " AND plts.alg_gebouw_key = " + p_geb_key) : " AND plts.alg_gebouw_key = " + p_geb_key)
+ " AND g.alg_gebouw_key = plts.alg_gebouw_key" + " AND g.alg_gebouw_key = plts.alg_gebouw_key"
+ " AND vrij.mld_vrije_dagen_id = COALESCE(g.mld_vrije_dagen_id, 'Default')" + " AND vrij.mld_vrije_dagen_id(+) = COALESCE(g.mld_vrije_dagen_id, 'Default')"
+ (p_resdate ? " AND TRUNC(rrd.res_rsv_deel_van) = " + p_resdate.toSQL() + (p_resdate ? " AND TRUNC(rrd.res_rsv_deel_van) = " + p_resdate.toSQL()
: " AND TRUNC(rrd.res_rsv_deel_van) BETWEEN TRUNC(SYSDATE +"+(p_dateoffset||0)+") AND TRUNC(SYSDATE-1+"+(p_dateoffset||0)+"+"+p_datelimit+")" : " AND TRUNC(rrd.res_rsv_deel_van) BETWEEN TRUNC(SYSDATE +"+(p_dateoffset||0)+") AND TRUNC(SYSDATE-1+"+(p_dateoffset||0)+"+"+p_datelimit+")"
) )

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

@@ -129,9 +129,10 @@ function getFiltClausePersoon(pfiltcode, params)
lfiltClause = " AND 1 = 0"; lfiltClause = " AND 1 = 0";
break; break;
case 'FING': // externe partijen toegang tot facilitor case 'FING': // externe partijen toegang tot facilitor
lfiltClause = " AND p.prs_perslid_key IN (" lfiltClause = " AND EXISTS ("
+ "SELECT prs_perslid_key FROM fac_v_webgebruiker g " + "SELECT 1 FROM fac_v_webgebruiker g "
+ " WHERE g.fac_functie_key = " + F("WEB_FINGOE") + " WHERE g.prs_perslid_key = p.prs_perslid_key"
+ " AND g.fac_functie_key = " + F("WEB_FINGOE")
+ " AND g.fac_gebruiker_alg_level_read < 9" + " AND g.fac_gebruiker_alg_level_read < 9"
+ " AND g.fac_gebruiker_prs_level_read < 9" + " AND g.fac_gebruiker_prs_level_read < 9"
+ ") "; + ") ";

23
APPL/Shared/kenmerk_common.inc
View File

@@ -375,7 +375,7 @@ function BijlagenButton(tfield, tprops, tparams)
lijst = BijlagenList(tparams.module, tprops.niveau, tparams.pkey, actual_kenmerk_key, tfield.otherPath, tprops.sortFilename); lijst = BijlagenList(tparams.module, tprops.niveau, tparams.pkey, actual_kenmerk_key, tfield.otherPath, tprops.sortFilename);
} }
} }
else if (tfield.otherPath) // tprops.niveau == "O" else if (tfield.otherPath) // tprops.niveau == "O" [mld_kenmerk_niveau IN ('O', 'P')]
{ // Opdracht naar opdracht { // Opdracht naar opdracht
var sql = "SELECT mld_typeopdr_key" var sql = "SELECT mld_typeopdr_key"
+ " FROM mld_opdr" + " FROM mld_opdr"
@@ -398,8 +398,11 @@ function BijlagenButton(tfield, tprops, tparams)
+ " COALESCE (k2.mld_kenmerk_omschrijving, sk2.mld_srtkenmerk_omschrijving)" + " COALESCE (k2.mld_kenmerk_omschrijving, sk2.mld_srtkenmerk_omschrijving)"
+ " AND sk1.mld_srtkenmerk_kenmerktype = sk2.mld_srtkenmerk_kenmerktype" // Toch wel op z'n minst + " AND sk1.mld_srtkenmerk_kenmerktype = sk2.mld_srtkenmerk_kenmerktype" // Toch wel op z'n minst
+ " AND k1.mld_kenmerk_key = " + kenmerk_key + " AND k1.mld_kenmerk_key = " + kenmerk_key
+ " AND (k1.mld_typeopdr_key = " + tprops.opdr_type + " OR k1.mld_typeopdr_key IS NULL)" + " AND ( k1.mld_typeopdr_key = " + tprops.opdr_type + " AND k1.mld_kenmerk_niveau = 'O'"
+ " AND (k2.mld_typeopdr_key = " + old_typeopdr_key + " OR k2.mld_typeopdr_key IS NULL)"; + " OR k1.mld_typeopdr_key IS NULL AND k1.mld_kenmerk_niveau = 'P')"
+ " AND ( k2.mld_typeopdr_key = " + old_typeopdr_key + " AND k2.mld_kenmerk_niveau = 'O'"
+ " OR k2.mld_typeopdr_key IS NULL AND k2.mld_kenmerk_niveau = 'P')"
+ " AND k2.mld_kenmerk_verwijder IS NULL";
var oRs = Oracle.Execute(sql); var oRs = Oracle.Execute(sql);
if (oRs.EoF) if (oRs.EoF)
actual_kenmerk_key = -1; // Dan weet ik het ook niet actual_kenmerk_key = -1; // Dan weet ik het ook niet
@@ -1363,14 +1366,20 @@ function kenmerktype_listbox (pfield, pprops, pparams)
+ (pprops.kenmerk_search ? " advmulti=1 " : "") + (pprops.kenmerk_search ? " advmulti=1 " : "")
+ (pfield.required ? " required='required' " : "") + (pfield.required ? " required='required' " : "")
+ (pfield.required > 1 + (pfield.required > 1
? " onChange='checkRequiredGroup(\"" + pparams.required_group + "\", " + (pprops.requiredbyemptyval != null? "{emptyvalue: " + pprops.requiredbyemptyval + "}" : "null") + ");" + (pfield.usedInExpr ? pparams.onchangeExp : "") ? ( pprops.multiEdit
+ "; " + (pprops.multiEdit ? "multi_fld_change(this);" : "") + "' " ? " onChange='multi_fld_change(this);'"
: " onChange='checkRequiredGroup(\"" + pparams.required_group
+ "\", " + (pprops.requiredbyemptyval != null? "{emptyvalue: " + pprops.requiredbyemptyval + "}" : "null")
+ ");"
+ (pfield.usedInExpr ? pparams.onchangeExp + "; " : "")
+ "' "
)
: (pparams.hasAnyFlexExpr : (pparams.hasAnyFlexExpr
? " onChange='" + (pfield.usedInExpr ? pparams.onchangeExp : "") ? " onChange='" + (pfield.usedInExpr ? pparams.onchangeExp : "")
+ "; " + (pprops.multiEdit ? "multi_fld_change(this);" : "") + "' " + "; " + (pprops.multiEdit ? "multi_fld_change(this);" : "") + "' "
: (pprops.multiEdit ? "onChange='multi_fld_change(this);'" : "") : (pprops.multiEdit ? "onChange='multi_fld_change(this);'" : "")
) )
) )
+ " data-icon='fa fa-chevron-down'" + " data-icon='fa fa-chevron-down'"
+ ">" + ">"
+ "<option value='-1' " + (pfield.required? " class='" + pparams.required_class + "'" : "") + "><!--lege waarde--></option>" + "<option value='-1' " + (pfield.required? " class='" + pparams.required_class + "'" : "") + "><!--lege waarde--></option>"

4
APPL/Shared/kenmerk_js.asp
View File

@@ -603,11 +603,7 @@ function multi_fld_change(pfld, ptxt, pparams)
} }
var fldcheck = "mcb_" + $(fld).attr("name").replace("Suggest","").replace("_show","val"); var fldcheck = "mcb_" + $(fld).attr("name").replace("Suggest","").replace("_show","val");
var fldname = $(fld).attr("name");
var isverplicht_group = $("#" + fldcheck).attr("req_" + fldcheck) == "true";
var isverplicht_single = $("#" + fldname).attr("required") == "required";
$("#" + fldcheck).prop("checked", (isgevuld)); $("#" + fldcheck).prop("checked", (isgevuld));
$(fld).toggleClass("required", ((isverplicht_group || isverplicht_single) && isgevuld));
multi_cb_change(); multi_cb_change();
} }

2
UTILS/Exchange/exchange_graph.js
View File

@@ -440,7 +440,7 @@ function graphToImport(data, zaalemail)
if (!eventReadyForProcessing(zaalemail, masterEvent)) { if (!eventReadyForProcessing(zaalemail, masterEvent)) {
continue; continue;
} }
var visibility = thisEvent.sensitivity === "normal" ? 1 : 0; var visibility = masterEvent.sensitivity === "normal" ? 1 : 0; // Gebruik de gegevens van de seriesMaster
tds = [ tds = [
safe.csv((visibility ? masterEvent.subject : lcl_res_rsv_private).slice(0, SUBJECT_MAX_LENGTH)), safe.csv((visibility ? masterEvent.subject : lcl_res_rsv_private).slice(0, SUBJECT_MAX_LENGTH)),
_startDate.toISOString(), _startDate.toISOString(),

2
UTILS/Exchange/ms_graph.js
View File

@@ -844,7 +844,7 @@ function enrichSubscription(userPrincipalName, data) {
var certificate = pfx.GetCert(0); var certificate = pfx.GetCert(0);
var BASE64_PUBLIC_KEY = certificate.GetEncoded(); var BASE64_PUBLIC_KEY = certificate.GetEncoded();
var $filter = "?$select=createdDateTime,changeKey,iCalUId,subject,isCancelled,isOrganizer,seriesMasterId,type,isOnlineMeeting,responseStatus,start,end,locations,attendees,organizer"; var $filter = "?$select=createdDateTime,changeKey,iCalUId,subject,isCancelled,isOrganizer,sensitivity,seriesMasterId,type,isOnlineMeeting,responseStatus,start,end,locations,attendees,organizer";
data.resource += $filter; data.resource += $filter;
data.includeResourceData = true; data.includeResourceData = true;
data.encryptionCertificate = BASE64_PUBLIC_KEY; data.encryptionCertificate = BASE64_PUBLIC_KEY;