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

Merge 2025.3 RC3 patches

Browse Source 
svn path=/Website/branches/v2025.4/; revision=70906
This commit is contained in:
Koen Reefman
2025-11-12 10:50:00 +00:00
parent 6639d638e5
commit eeb3202f32
21 changed files with 160 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/API2/model_locations.inc
View File

@@ -41,6 +41,7 @@ function model_alg_locatie()
"mjb_score" : { dbs: "alg_locatie_mjb_score1" , typ: "number" , "label": L("lcl_alg_locatie_mjb_score1")},
"coordinate_x" : { dbs: "alg_locatie_x" , typ: "number" , "label": L("lcl_geoxcoord")},
"coordinate_y" : { dbs: "alg_locatie_y" , typ: "number" , "label": L("lcl_geoycoord")},
"expires" : { dbs: "alg_locatie_vervaldatum" , typ: "date" , "label": L("lcl_alg_vervaldatum")},
"externnr" : { dbs: "alg_locatie_externnr" , typ: "varchar" , "label": L("extern_nr"), "readonly": !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR")) },
"externsyncdate": { dbs: "alg_locatie_externsyncdate" , typ: "datetime" , "label": L("extern_syncdate"), "readonly": !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR")) },
"seqnr" : { dbs: "alg_locatie_volgnr" , typ: "number" , "label": L("lcl_alg_locatie_volgnr") },

3
APPL/API2/model_mld_melding_tag.inc
View File

@@ -114,7 +114,8 @@ function model_mld_melding_tag()
"active": {
"dbs": "mld_melding_tag_actief",
"label": L("mld_melding_tag_actief"),
"typ": "check0"
"typ": "check0",
"defaultvalue": 1
},
"begindate": {
"dbs": "mld_melding_tag_datum_van",

16
APPL/BES/bes.inc
View File

@@ -1918,6 +1918,7 @@
voorraad_srtdeel: function _voorraad_srtdeel(pautfunction, params)
{
// Valid and supported parameters are:
// params.catalogus_type: key
// params.catalogus_key : key
// params.besgroep_key :
// params.item_key :
@@ -1988,6 +1989,9 @@
+ " AND g.ins_discipline_key = bd.ins_discipline_key"
+ " AND bd.ins_discipline_key = dp.bes_ins_discipline_key"
+ " AND sd.bes_srtdeel_verwijder IS NULL"
+ (params.catalogus_type
? " AND dp.bes_disc_params_bestelmode = " + params.catalogus_type
: "")
+ (params.catalogus_key
? " AND dp.bes_ins_discipline_key_inkoop = " + params.catalogus_key
+ " AND (sd.bes_srtdeel_vervaldatum IS NULL OR sd.bes_srtdeel_vervaldatum > SYSDATE)"
@@ -2071,6 +2075,9 @@
+ " AND g.ins_discipline_key = bd.ins_discipline_key"
+ " AND bd.ins_discipline_key = dp.bes_ins_discipline_key"
+ " AND sd.bes_srtdeel_verwijder IS NULL"
+ (params.catalogus_type
? " AND dp.bes_disc_params_bestelmode = " + params.catalogus_type
: "")
+ (params.catalogus_key
? " AND dp.bes_ins_discipline_key_inkoop = " + params.catalogus_key
+ " AND (sd.bes_srtdeel_vervaldatum IS NULL OR sd.bes_srtdeel_vervaldatum > SYSDATE)"
@@ -2187,6 +2194,9 @@
+ " AND bd1.ins_discipline_key = dp1.bes_ins_discipline_key"
+ " AND sd1.bes_srtdeel_nr = sd.bes_srtdeel_nr" // Dezelfde omschrijving.
+ " AND dp1.bes_ins_discipline_key_inkoop = bd.ins_discipline_key)" // Gekoppeld aan inkoopcatalogus.
+ (params.catalogus_type
? " AND dp.bes_disc_params_bestelmode = " + params.catalogus_type
: "")
+ (params.catalogus_key
? " AND bd.ins_discipline_key = " + params.catalogus_key
+ " AND (sd.bes_srtdeel_vervaldatum IS NULL OR sd.bes_srtdeel_vervaldatum > SYSDATE)"
@@ -2283,6 +2293,9 @@
+ " AND bd1.ins_discipline_key = dp1.bes_ins_discipline_key"
+ " AND sd1.bes_srtdeel_nr = sd.bes_srtdeel_nr" // Dezelfde omschrijving.
+ " AND dp1.bes_ins_discipline_key_inkoop = bd.ins_discipline_key)" // Gekoppeld aan inkoopcatalogus.
+ (params.catalogus_type
? " AND dp.bes_disc_params_bestelmode = " + params.catalogus_type
: "")
+ (params.catalogus_key
? " AND bd.ins_discipline_key = " + params.catalogus_key
+ " AND (sd.bes_srtdeel_vervaldatum IS NULL OR sd.bes_srtdeel_vervaldatum > SYSDATE)"
@@ -2377,6 +2390,9 @@
+ " AND bd1.ins_discipline_key = dp1.bes_ins_discipline_key"
+ " AND sd1.bes_srtdeel_nr = sd.bes_srtdeel_nr" // Dezelfde omschrijving.
+ " AND dp1.bes_ins_discipline_key_inkoop = bd.ins_discipline_key)" // Gekoppeld aan inkoopcatalogus.
+ (params.catalogus_type
? " AND dp.bes_disc_params_bestelmode = " + params.catalogus_type
: "")
+ (params.catalogus_key
? " AND bd.ins_discipline_key = " + params.catalogus_key
+ " AND (sd.bes_srtdeel_vervaldatum IS NULL OR sd.bes_srtdeel_vervaldatum > SYSDATE)"

2
APPL/BES/bes_search.js
View File

@@ -47,7 +47,7 @@ function updateDisc(pautfunction, pdisc, psrtgroup, psrtdeel)
$("#instock").closest("tr").show();
}
var ldisctype = $('#disctype :selected').val();
var ldisctype = $('#disctype :selected').val() || -1;
$("#disc").load("../Shared/loadBESDisc.asp?" + serializeObj(
{ autfunction: pautfunction,
disctype: ldisctype,

6
APPL/BES/bes_voorraad_list.inc
View File

@@ -25,6 +25,7 @@ function bes_voorraad_list (pautfunction, params)
// params.urole : the usuals two-letter lowercase string
// params.outputmode : print to 0 = screen, 1 = printer, 2 = excel, etc.
// params.showall : boolean (true | false)
// params.catalogus_type: key
// params.catalogus_key : key
// params.besgroep_key :
// params.item_key :
@@ -212,8 +213,8 @@ function bes_voorraad_list (pautfunction, params)
rst.addColumn(new Column({caption: "Uit-maar nog in magazijn", content: "aantal_uitmaarnoginmagazijn", datatype: "number", total: true}));
rst.addColumn(new Column({caption: L("lcl_bes_voorraad"), content: "voorraad", datatype: "number", total: true}));
rst.addColumn(new Column({caption: L("lcl_bes_unity"), content: "eenheid_extern"}));
rst.addColumn(new Column({caption: L("lcl_bes_voorraadmin"), content: "voorraadmin"}));
rst.addColumn(new Column({caption: L("lcl_bes_voorraadmax"), content: "voorraadmax"}));
rst.addColumn(new Column({caption: L("lcl_bes_voorraadmin"), content: "voorraadmin", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_bes_voorraadmax"), content: "voorraadmax", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_bes_lopend"), content: "aantal_open_order", datatype: "number", total: true}));
rst.addColumn(new Column({caption: L("lcl_bes_bestellen"), content: fncolTeBestellen, datatype: "number", total: true}));
}
@@ -245,4 +246,3 @@ function bes_voorraad_list (pautfunction, params)
<%
}
%>

20
APPL/BES/bes_voorraad_search.asp
View File

@@ -78,6 +78,16 @@ var authparams = user.checkAutorisation(autfunction);
<input type="hidden" name="urole" value="<%=urole%>">
<% // <!-- Catalogus type -->
var sql = "SELECT SUM(CASE"
+ " WHEN dp.bes_disc_params_bestelmode = 0"
+ " THEN 1"
+ " ELSE 0"
+ " END) aantal_uitcat"
+ " , SUM(CASE"
+ " WHEN dp.bes_disc_params_bestelmode = 1"
+ " THEN 1"
+ " ELSE 0"
+ " END) aantal_vrij"
+ " , SUM(CASE"
+ " WHEN dp.bes_disc_params_bestelmode = 2"
+ " THEN 1"
+ " ELSE 0"
@@ -91,10 +101,16 @@ var authparams = user.checkAutorisation(autfunction);
+ " , bes_disc_params dp"
+ " WHERE bd.ins_discipline_key = dp.bes_ins_discipline_key";
var oRs = Oracle.Execute(sql);
var aantal_bestel = oRs("aantal_bestel").Value;
var aantal_actueel = oRs("aantal_actueel").Value;
var aantal_uitcat = oRs("aantal_uitcat").Value; // Uit catalogus(0).
var aantal_vrij = oRs("aantal_vrij").Value; // Vrij aanmaken(1).
var aantal_bestel = oRs("aantal_bestel").Value; // Bestellijst(2).
var aantal_actueel = oRs("aantal_actueel").Value; // Actuele lijst(3).
oRs.Close();
var sql_arr = [];
if (aantal_uitcat > 0)
sql_arr.push("SELECT 0, " + safe.quoted_sql("Uit catalogus") + " FROM DUAL");
if (aantal_vrij > 0)
sql_arr.push("SELECT 1, " + safe.quoted_sql("Vrij aanmaken") + " FROM DUAL");
if (aantal_bestel > 0)
sql_arr.push("SELECT 2, " + safe.quoted_sql(L("lcl_bes_orderlist")) + " FROM DUAL");
if (aantal_actueel > 0)

1
APPL/BES/bes_voorraad_search_list.asp
View File

@@ -70,6 +70,7 @@ else
{ urole : urole,
outputmode: outputmode,
showall: showall,
catalogus_type: (disctype != -1? disctype : null),
catalogus_key: (disc != -1? disc : null),
besgroep_key: (besgroep_key != -1? besgroep_key : null),
item_key: (item_key != -1? item_key : null),

6
APPL/FAC/fac_nieuws.asp
View File

@@ -45,6 +45,7 @@ var showmore = getQParamInt("showmore", 0);
var portal = getQParamInt("portal", 1);
var widget = getQParamInt("asWidget", 0) == 1;
var additionalNews = 0;
var newsTitle = L("lcl_mynews");
var canEdit = !!user.has("WEB_MSGBOF");
var msg_rights = msg.func_enabled(-1);
@@ -360,6 +361,9 @@ sqln = "SELECT * FROM (" + sqln + ")"
var nieuwsdatum = toDateString(oRs("fac_nieuws_van").Value, true, true);
var detail_html_arr = [];
if (oRs("fac_nieuws_groep_omschrijving").Value) {
if (nieuwsgroep_key > 0) {
newsTitle = oRs("fac_nieuws_groep_omschrijving").Value;
}
detail_html_arr.push('<span' + (useCarousel ? ' class="details" data-groep-key="' + nieuws_groep_key + '"' : '') +'>' + safe.html(oRs("fac_nieuws_groep_omschrijving").Value) + '</span>');
}
if (nieuwsdatum != "") {
@@ -528,7 +532,7 @@ sqln = "SELECT * FROM (" + sqln + ")"
<header class="d-flex justify-content-between align-items-center">
<div class="d-flex align-items-center gap-3">
<% if (i > 0 || hasAddButton) { %>
<h1><%=safe.html(L("lcl_mynews"))%></h1>
<h1><%=safe.html(newsTitle)%></h1>
<% }
Response.Write('</div><div class="d-flex align-items-center gap-3">');
if (useCarousel) {

82
APPL/FAC/fac_setting_search.asp
View File

@@ -4,11 +4,9 @@
$Id$
File: fac_settings_search.asp
Status: 40%
Description: Toont zoekvelden voor lijst van menuopties
Parameters: ??
Context: Via URL (alleen prssys)
Note: For internal use only
Parameters: module, autosearch
Context: Vanuit menu (alleen prssys)
*/ %>
<!-- #include file="../Shared/common.inc" -->
@@ -53,54 +51,48 @@ var module = getQParam("module", "");
</head>
<body id="searchbody">
<form name="u2" method="get" action="fac_settings_list.asp" target="workFrame" onsubmit='anysearch = true;'>
<% SEARCH_PAGE_START({ header: L("lcl_filterblok") });
<%
SEARCH_PAGE_START({ header: L("lcl_filterblok") });
SEARCH_BLOCK_START("searchtable", L("lcl_filterblok")); %>
<!-- module -->
<!-- module -->
<%
sql = "SELECT DISTINCT "
+ " fac_setting_module fac_module,"
+ " fac_setting_module fac_module "
+ "FROM fac_setting "
+ (module!="" ? " WHERE fac_setting_module = " + safe.quoted_sql(module) :"")
+ "ORDER BY fac_setting_module";
if (module == "")
{
FCLTselector("sModule",
sql,
{ label: L("lcl_fac_module")
, trclass: "primsearch"
, emptyOption: L("lcl_search_generic")
})
}
else
{ // Er is maar 1 optie, dus geen emptyOption.
FCLTselector("sModule",
sql,
{ label: L("lcl_fac_module")
, trclass: "primsearch"
})
}
CHECKBOXTR(L("lcl_lcl_overruled"), "fldcheck", "is_overrule", false);
// Niet elke setting-module heeft een officiele modulenaam..
var sql = "SELECT DISTINCT "
+ " fs.fac_setting_module fac_module"
+ ", fs.fac_setting_module || ' - ' || lcl.l(fm.fac_module_remark) modulenaam"
+ " FROM fac_setting fs, fac_module fm "
+ " WHERE fs.fac_setting_module = fm.fac_module_name(+)"
+ (module != ""
? " AND fs.fac_setting_module = " + safe.quoted_sql(module)
: "")
+ " ORDER BY fac_setting_module";
FCLTselector("sModule", sql, { label: L("lcl_fac_module")
, emptyOption: ((module == "") ? L("lcl_search_generic") : false)
/* , readonly : (module != "") werkt niet */
, required : (module != "")
})
CHECKBOXTR(L("lcl_lcl_overruled"), "fldcheck", "is_overrule", false);
SEARCH_BLOCK_END();
SEARCH_BLOCK_START();
%>
<!-- Zoektekst -->
<tr class="primsearch">
<td class="label">
<label for="zoek"><%=L("lcl_lcl_search_fields")%></label>
</td>
<td>
<input type="text" class="fld wildcard" name="zoek" id="zoek">
</td>
</tr>
<!-- Zoektekst -->
<tr class="primsearch">
<td class="label">
<label for="zoek"><%=L("lcl_lcl_search_fields")%></label>
</td>
<td>
<input type="text" class="fld wildcard" name="zoek" id="zoek">
</td>
</tr>
<% SEARCH_BLOCK_END();
var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit()", icon: "fa-clipboard-list" } ];
SIMPLE_BLOCK_START();
CreateButtons(buttons, { entersubmit: true, showIcons: true});
SIMPLE_BLOCK_END();
SEARCH_PAGE_END();
var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit()", icon: "fa-clipboard-list" } ];
SIMPLE_BLOCK_START();
CreateButtons(buttons, { entersubmit: true, showIcons: true});
SIMPLE_BLOCK_END();
SEARCH_PAGE_END();
%>
</form>

26
APPL/MLD/mld.inc
View File

@@ -6763,7 +6763,7 @@ mld = {
? " AND ( mld_stdmeldinggroep_key = " + params.stdmeldinggroep_key
+ " OR mld_stdmeldinggroep_key IS NULL)" // Deze mag natuurlijk ook
: "") // Dan geldt alleen de vakgroeptype-scope
+ " ORDER BY mld_melding_tag_datum_tot, mld_melding_tag_naam"; // denk ik?
+ " ORDER BY mld_melding_tag_datum_tot DESC, mld_melding_tag_naam";
var result =
FCLTselector_HTML("tag_key",
sql_tag,
@@ -7151,18 +7151,20 @@ mld = {
+ " )";
}
var sql_c = "SELECT cnt_prs_bedrijf_key"
+ " , cnt_contract_key"
+ " , prio"
+ " , COUNT(DISTINCT cnt_prs_bedrijf_key) aantal"
+ " FROM (" + sql_p
+ (obj_key_arr && obj_key_arr.length > 0 ? " UNION " + sql_o : "")
+ " )"
+ " GROUP BY cnt_prs_bedrijf_key, cnt_contract_key, prio"
+ " ORDER BY prio DESC"
+ " FETCH FIRST 1 ROW ONLY";
var sql_c = "SELECT MIN(cnt_prs_bedrijf_key) cnt_prs_bedrijf_key"
+ " , COUNT(*) aantal"
+ " FROM (SELECT cnt_prs_bedrijf_key"
+ " , cnt_contract_key"
+ " , prio"
+ " , COUNT(DISTINCT cnt_prs_bedrijf_key) aantal"
+ " FROM (" + sql_p
+ (obj_key_arr && obj_key_arr.length > 0 ? " UNION " + sql_o : "")
+ " )"
+ " GROUP BY cnt_prs_bedrijf_key, cnt_contract_key, prio"
+ " ORDER BY prio DESC"
+ " )";
var oRs_c = Oracle.Execute(sql_c);
if (!oRs_c.EOF && oRs_c("aantal").Value == 1)
if (oRs_c("aantal").Value == 1)
{
prs_bedrijf_key = oRs_c("cnt_prs_bedrijf_key").Value;
}

9
APPL/MLD/opdr_edit_uren.asp
View File

@@ -98,10 +98,11 @@ oRs.Close();
<script type="text/javascript">
var anyChange = false; // Voorkom te veel refreshes
<% function getWeekString(datum) {
var yearStart = new Date(datum.getFullYear(), 0, 1);
var dayOfYear = (datum.getTime() - yearStart.getTime()) / oneDay + 1;
var weekNr = Math.ceil(dayOfYear / 7);
return datum.getFullYear() + "-" + weekNr;
var sql = "SELECT TO_CHAR({0}, 'IYYY-IW') weeknr FROM DUAL".format(datum.toSQL());
var oRs = Oracle.Execute(sql);
var txt = oRs("weeknr").Value;
oRs.Close()
return txt;
}
%> FcltMgr.setTitle(L("lcl_mld_ord_weeklijst") + "<%=getWeekString(datefrom)%>");

8
APPL/PDA/iface.inc
View File

@@ -287,9 +287,9 @@ function FOOTER(params)
} %>
<footer class="fixed-bottom page-footer">
<a href="Facilitor.asp" class="tappable"><%=I("fa-home fa-xl")%></a>
<a href="fac_list.asp" class="tappable"><%=I("fa-ballot-check fa-xl")%></a>
<a href="message_list.asp" class="tappable"<%=berichten ? ' data-badge="' + berichten + '"' : ''%>>
<a href="<%=rooturl%>/appl/pda/Facilitor.asp" class="tappable"><%=I("fa-home fa-xl")%></a>
<a href="<%=rooturl%>/appl/pda/fac_list.asp" class="tappable"><%=I("fa-ballot-check fa-xl")%></a>
<a href="<%=rooturl%>/appl/pda/message_list.asp" class="tappable"<%=berichten ? ' data-badge="' + berichten + '"' : ''%>>
<%=I("fa-bell fa-xl")%>
<span class="fclt-noti-badge badge rounded-pill bg-danger"><%=berichten%></span>
</a>
@@ -313,7 +313,7 @@ function FOOTER(params)
last_msg_oRs.Close();
}
oRs.Close();
%> <a href="berichten.asp" class="tappable"<%=new_msg ? ' data-badge="!"' : ''%>><%=I("fa-circle-y fa-xl")%></a>
%> <a href="<%=rooturl%>/appl/pda/berichten.asp" class="tappable"<%=new_msg ? ' data-badge="!"' : ''%>><%=I("fa-circle-y fa-xl")%></a>
<% } %>
<%=DROPDOWN(hamburger_actions)%>
</footer>

2
APPL/PDA/melding.asp
View File

@@ -2604,7 +2604,7 @@ if (mld_key > -1 && this_mld.canReject && action != "forward")
function mld_reject_callback(data)
{
// mobile kan slechts 1 melding per keer afwijzen
if (data.reject_arr[0].inspect)
if (data.reject_arr[0]?.inspect)
{
var insdata = data.reject_arr[0].inspect;
protectRequest.dataToken(insdata);

2
APPL/PRS/prs_perslid_list.inc
View File

@@ -213,7 +213,7 @@ function perslid_list(pautfunction, params)
+ " FROM prs_kostenplaats kp"
+ " WHERE kp.prs_kostenplaats_key = COALESCE(p.prs_kostenplaats_key, d.prs_kostenplaats_key)"
+ " ) prs_kostenplaats_nr"
+ " , (SELECT prs_perslid_naam_friendly FROM prs_v_perslid_fullnames_all pf WHERE pf.prs_perslid_key = d.prs_perslid_key_verantw) prs_perslid_verantw"
+ " , (SELECT prs_perslid_naam_friendly FROM prs_v_perslid_fullnames_all pf WHERE pf.prs_perslid_key = p.prs_perslid_key_verantw) prs_perslid_verantw"
+ (anyflex
? ", (SELECT LISTAGG("
+ (multiflex ? lcl.xsql("k.prs_kenmerk_omschrijving", "k.prs_kenmerk_key")

4
APPL/RES/res_show_objcat.asp
View File

@@ -756,8 +756,8 @@ var bulkFields = " distinct "
+ " , " + toLocalDate("rr.res_rsv_ruimte_tot") + " local_res_rsv_ruimte_tot"
+ " , ra.res_rsv_artikel_verwijder ddVerwijder"
+ " , CASE "
+ " WHEN (ra.res_rsv_artikel_levering BETWEEN res_rsv_ruimte_van "
+ " AND res_rsv_ruimte_tot) "
+ " WHEN (ra.res_rsv_artikel_levering BETWEEN rr.res_rsv_ruimte_van "
+ " AND rr.res_rsv_ruimte_tot) "
+ " THEN 1 "
+ " ELSE 0 "
+ " END levbinnentijd"

2
APPL/Shared/default.css
View File

@@ -5541,7 +5541,7 @@ td.bessrtdeelfoto {
background: var(--menuiconcolor-gradient);
background-clip: text; /* Gradient op tekst toepassen */
-webkit-text-fill-color: transparent; /* Tekstkleur transparant maken zodat gradient zichtbaar is */
transition: transform var(--fclt-animation-duration-s) ease; /* Gestandaardiseerd (fclt-card) */
transition: transform var(--fclt-animation-duration-s) ease-in-out; /* Gestandaardiseerd (fclt-card) */
}
/* ---------------------------------------------------

2
APPL/Shared/default.inc
View File

@@ -8,7 +8,7 @@
Context: Vanuit ELK asp bestand
*/
var FCLTVersion="2025.3RC2";
var FCLTVersion="2025.3RC3";
var FCLTMinDatabaseSchema="52"; // Alleen de cijfers
var custpath = rooturl + "/cust/" + customerId; // path to customer files

3
APPL/Shared/default.xsl
View File

@@ -218,7 +218,8 @@
var groups = matched[i].match(new RegExp(strre, "i")); // Zonder 'g'lobal-flag
if (groups) {
if (module && key) {
var frc = '<img frc="M=' + module + ':K=' + key + '"/>';
var filename = groups[1];
var frc = '<img frc="M=' + module + ':K=' + key + ':F=' + encodeURIComponent(filename) + '"/>';
safehtml = safehtml.replace(matched[i], frc);
} else { // Dan maar strippen
safehtml = safehtml.replace(matched[i], "[Image]");

4
APPL/Shared/loadBESDisc.asp
View File

@@ -32,13 +32,13 @@ var discsql = "SELECT bd.ins_discipline_key"
+ " , " + lcl.xsqla('bd.ins_discipline_omschrijving','bd.ins_discipline_key')
+ " FROM bes_discipline bd"
+ " WHERE bd.ins_discipline_verwijder IS NULL"
+(disctype == 2
+(disctype <= 2
? " AND bd.ins_discipline_key IN (SELECT dp.bes_ins_discipline_key_inkoop"
+ " FROM bes_disc_params dp"
+ " WHERE dp.bes_ins_discipline_key_inkoop IS NOT NULL)"
: "")
+ " AND bd.ins_discipline_key IN (" + discsql_aut + ")"
+ (disctype > 0
+ (disctype >= 0
? " AND bd.ins_discipline_key IN (SELECT bes_ins_discipline_key"
+ " FROM bes_disc_params"
+ " WHERE bes_disc_params_bestelmode = " + disctype + ")"

23
APPL/Shared/xml_converter.inc
View File

@@ -199,17 +199,34 @@ function STR2Stream(xmlstr, xslfile, Stream, params)
}
else
{
var filedata = props.files[0];
var fileIndex = 0;
if (props.files.length > 1) {
var codes = flexcode.split(":");
for (var i = 0; i < codes.length && !fileIndex; i++) {
var code = codes[i].substr(0,1);
var data = codes[i].substr(2);
if (code == "F") { // Dan is; data = filename
for (var j = 0; j < props.files.length; j++) {
if (props.files[j].name == data) {
fileIndex = j;
break;
}
}
}
}
}
var filedata = props.files[fileIndex];
if (filedata.resized)
var file = filedata.resized;
else
var file = props.AttachPath + props.files[0].name;
var file = props.AttachPath + filedata.name;
if (!fso.FileExists(file))
{
__DoLog("Flexcode {0}, file {1} not found".format(flexcode, file));
var newbody = p_bodyhtml.substr(0, imgstart) + "<img src=\"MISSING_" + safe.htmlattr(props.files[0].name) + "\">" + p_bodyhtml.substr(imgend + 1);
var newbody = p_bodyhtml.substr(0, imgstart) + "<img src=\"MISSING_" + safe.htmlattr(filedata.name) + "\">" + p_bodyhtml.substr(imgend + 1);
p_bodyhtml = newbody;
}
else

25
UTILS/PutOrders/puo_sendmail.js
View File

@@ -271,6 +271,10 @@ v_aanduiding = "sendMail 2k";
var http_request = doHTTP(url, { method: "GET", headers: { "accept": "application/json" }});
var props = eval('(' + http_request.responseText + ')');
if ("message" in props)
{
Log2File(1, props.message); // bijvoorbeeld "Invalid APIKEY"
}
}
if (props.flexlog)
Log2File(1, props.flexlog);
@@ -283,11 +287,28 @@ v_aanduiding = "sendMail 2k";
}
else
{
var filedata = props.files[0];
var fileIndex = 0;
if (props.files.length > 1) {
var codes = flexcode.split(":");
for (var i = 0; i < codes.length && !fileIndex; i++) {
var code = codes[i].substr(0,1);
var data = codes[i].substr(2);
if (code == "F") { // Dan is; data = filename
for (var j = 0; j < props.files.length; j++) {
if (props.files[j].name == data) {
fileIndex = j;
break;
}
}
}
}
}
var filedata = props.files[fileIndex];
if (filedata.resized)
var file = filedata.resized;
else
var file = props.AttachPath + props.files[0].name;
var file = props.AttachPath + filedata.name;
rnd_cid = oCrypto.hex_random(10);
cidname = "flex" + rnd_cid + ".png";
p_bodyhtml = p_bodyhtml.substr(0, startPos - 4) + "src=\"cid:" + cidname + "\"" + p_bodyhtml.substr(eindPos + 1);