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

Branch 2022.2 RC3

Browse Source 
svn path=/Website/trunk/; revision=56161
This commit is contained in:
Koen Reefman
2022-06-09 12:42:08 +00:00
parent b7530d7205
commit 9bc67aac19
38 changed files with 331 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/API2/model_mld_stdmelding.inc
View File

@@ -199,7 +199,8 @@ function model_mld_stdmelding()
"canholdthirdparty": {
"dbs": "mld_stdmelding_thirdparty",
"typ": "check0",
"label": L("lcl_mld_canholdthirdparty")
"label": L("lcl_mld_canholdthirdparty"),
"multiedit": true
},
"subjectlist": {
"dbs": "mld_stdmelding_subject",

30
APPL/CAD/ShowGoogleMap.asp
View File

@@ -21,6 +21,7 @@
var obj_key = getQParamInt("obj_key", -1);
var loc_key = getQParamInt("loc_key", -1);
var bld_key = getQParamInt("bld_key", -1);
var streetview = getQParamInt("streetview", 1);
var sql = "";
var fg_remote_maps = S("ins_fg_remote_maps");
var title = L("lcl_maps");
@@ -69,7 +70,7 @@
var rdX = 0;
var rdY = 0;
}
__Log("rdX=" + rdX + " rdY=" + rdY);
%>
@@ -78,7 +79,11 @@
<title><%=safe.html(title)%></title>
<style type="text/css">
html, body { height: 100%; margin: 0; padding: 0;}
<% if (streetview) { %>
geenhekjeaanbeginregel, #map, #pano { float: left; height: 100%; width: 50%; }
<% } else { %>
geenhekjeaanbeginregel, #map { float: left; height: 100%; width: 100%; }
<% } %>
</style>
<script type="text/javascript" async defer
src='//maps.googleapis.com/maps/api/js?key=<%=safe.htmlattr(fg_remote_maps)%>&callback=initMap'>
@@ -102,14 +107,17 @@
var infowindow = new google.maps.InfoWindow({
content: "<%=safe.jsstring(oms)%>"
});
var panorama = new google.maps.StreetViewPanorama(
document.getElementById('pano'), {
position: coord,
pov: {
pitch: 10
}
});
map.setStreetView(panorama);
if (<%=streetview%>)
{
var panorama = new google.maps.StreetViewPanorama(
document.getElementById('pano'), {
position: coord,
pov: {
pitch: 10
}
});
map.setStreetView(panorama);
}
var marker = new google.maps.Marker({
position: coord,
map: map,
@@ -132,11 +140,11 @@
window.close();
}
}
</script>
</script>
</head>
<body id="googleMap" style="margin:0">
<div id="map"></div>
<div id="pano"></div>
</body>
</html>
<% ASPPAGE_END(); %>
<% ASPPAGE_END(); %>

1
APPL/CAD/mySymbol.asp
View File

@@ -38,6 +38,7 @@ function myContourProcessor(cHandle)
var mySLNKDWF = new SLNKDWF({ dwfFile : Server.MapPath("../slnkdwf/empty.w2d"), // Start with empty drawing
maximize : true,
dwfProcessor : myContourProcessor,
tempFolder : shared.tempFolder(),
asGIF : true,
forceGray : true
});

4
APPL/FAC/fac_faq_search.js
View File

@@ -4,7 +4,7 @@
*/
function updateStdm(purole)
{
var srtdisc_key = $("#srtdisc").val();
var srtdisc_key = $("#srtdisc").val(); // MGE: Kan volgens mij weg, want komt in het overzicht niet voor.
var ldisc_key_str = new Array();
$('#discmulti :selected').each(function(i, selected)
{
@@ -14,6 +14,6 @@ function updateStdm(purole)
+ "&noExpired=1"
+ "&faq=1"
+ "&withExternal=1"
+ (srtdisc_key > 0? "&srtdisc_key=" + srtdisc_key : "")
+ (srtdisc_key > 0? "&srtdisc_key_arr=" + srtdisc_key : "")
+ (ldisc_key_str.length > 0? "&disc_key_arr=" + ldisc_key_str.join(",") : ""));
}

6
APPL/FAC/fac_list.asp
View File

@@ -460,8 +460,10 @@ function sqlTracking(refkey, node)
+ " AND sm.mld_ins_discipline_key = id.ins_discipline_key"
+ " AND m.mld_ins_discipline_key = id2.ins_discipline_key(+)"
+ " AND m.mld_stdmelding_key = sm.mld_stdmelding_key"
+ " AND (COALESCE(m.prs_perslid_key_voor, m.prs_perslid_key) <> DECODE(m.mld_ins_discipline_key, NULL, mld_melding_behandelaar_key, mld_melding_behandelaar2_key)"
+ " OR (DECODE(m.mld_ins_discipline_key, NULL, mld_melding_behandelaar_key, mld_melding_behandelaar2_key) IS NULL))" // die komen straks
+ (urole == "fe"
? " AND (COALESCE(m.prs_perslid_key_voor, m.prs_perslid_key) <> DECODE(m.mld_ins_discipline_key, NULL, mld_melding_behandelaar_key, mld_melding_behandelaar2_key)"
+ " OR (DECODE(m.mld_ins_discipline_key, NULL, mld_melding_behandelaar_key, mld_melding_behandelaar2_key) IS NULL))" // die komen straks
: "")
+ " AND m.fac_activiteit_key IS NULL"
+ " AND m.mld_melding_key = tr.fac_tracking_refkey(+)"
+ " AND tr.fac_srtnotificatie_key = str.fac_srtnotificatie_key(+)"

3
APPL/FAC/fac_report.asp
View File

@@ -605,6 +605,9 @@ function fac_usrrap_list_graph (model, scf_params)
, dataLabelCenterOn: true
}
}
, highlighter: { show: false
, useAxesFormatters: false
}
, legend: { show: true
, escapeHtml: true
, location: "ne"

60
APPL/INS/ins_move_deel_multi_save.asp
View File

@@ -54,7 +54,7 @@ var result = { success: true
, refresh: true
};
var bindings = [];
var bind_msg = "";
for (var i = 0; i < ingesloten.length; i++)
{
var sql_s = "SELECT ins_srtdeel_binding"
@@ -66,8 +66,9 @@ for (var i = 0; i < ingesloten.length; i++)
var bindingBits = oRs_s("ins_srtdeel_binding").Value;
oRs_s.Close();
var bind_typ;
var bind_typ = "";
var bind_key;
var msg = [];
if (bindingBits & BIND_TERREI)
{
@@ -78,8 +79,7 @@ for (var i = 0; i < ingesloten.length; i++)
}
else
{
msg = L("lcl_obj_bind_t")+ " of ";
bind_msg += (bind_msg.indexOf(msg) == -1 ? msg : "");
msg.push(L("lcl_obj_bind_t"));
}
}
@@ -92,8 +92,7 @@ for (var i = 0; i < ingesloten.length; i++)
}
else
{
msg = L("lcl_obj_bind_r")+ " of ";
bind_msg += (bind_msg.indexOf(msg) == -1 ? msg : "");
msg.push(L("lcl_obj_bind_r"));
}
}
@@ -106,39 +105,40 @@ for (var i = 0; i < ingesloten.length; i++)
}
else
{
msg = L("lcl_obj_bind_w")+ " of ";
bind_msg += (bind_msg.indexOf(msg) == -1 ? msg : "");
msg.push(L("lcl_obj_bind_w"));
}
}
if (!bind_typ)
{
abort_with_warning( L("lcl_obj_bind_mandatory") + "\n"
+ ( msg_1.length
? msg_1.join(" "+L("lcl_fac_api_of")+" ") // geen binding kunnen koppelen aan alg key
: " <" + L("lcl_ins_unknown") + ">" // bindingBits bevat geen geldige bind-bit
)
);
}
bindings.push({bind_typ: bind_typ, bind_key: bind_key});
}
bind_msg = bind_msg.substring(0, bind_msg.length - 3);
if (bind_msg == "")
var sql_wis_dwgxy = ", ins_deel_dwgx = null"
+ ", ins_deel_dwgy = null"
+ ", ins_deel_dwgz = null"
for (var i = 0; i < ingesloten.length; i++)
{
var sql_wis_dwgxy = ", ins_deel_dwgx = null"
+ ", ins_deel_dwgy = null"
+ ", ins_deel_dwgz = null"
for (var i = 0; i < ingesloten.length; i++)
// Ik mag het object wijzigen dus voer wijziging uit
sql_u = "UPDATE ins_deel"
+ " SET ins_alg_ruimte_key = " + bindings[i].bind_key
+ " , ins_alg_ruimte_type = " + safe.quoted_sql(bindings[i].bind_typ)
+ (wis_grafisch ? sql_wis_dwgxy : "")
+ " WHERE ins_deel_key = " + ingesloten[i];
var err = Oracle.Execute(sql_u, true);
if (err.friendlyMsg)
{
// Ik mag het object wijzigen dus voer wijziging uit
sql_u = "UPDATE ins_deel"
+ " SET ins_alg_ruimte_key = " + bindings[i].bind_key
+ " , ins_alg_ruimte_type = " + safe.quoted_sql(bindings[i].bind_typ)
+ (wis_grafisch ? sql_wis_dwgxy : "")
+ " WHERE ins_deel_key = " + ingesloten[i];
var err = Oracle.Execute(sql_u, true);
if (err.friendlyMsg)
{
result.message = err.friendlyMsg;
}
result.message = err.friendlyMsg;
}
}
else
{
result.message = L("lcl_obj_bind_mandatory") + "\n" + bind_msg;
}
result.success = !result.message;
Response.Write(JSON.stringify(result));
%><% ASPPAGE_END(); %>
%><% ASPPAGE_END(); %>

6
APPL/Localscripts/FcltJquery.js
View File

@@ -292,7 +292,7 @@ jQuery.extend({
self.timerID = setTimeout(function() { update.apply(self) }, 250);
}
var update = function() {
var update = function(init) {
if (self.timerID) clearTimeout(self.timerID);
var times = function(string, number) {
@@ -312,7 +312,7 @@ jQuery.extend({
.replace(/ {2,}/g, function(space) { return times('&nbsp;', space.length - 1) + ' ' });
}
if ($this.is("textarea#note.mentioning")) // Y van de caret bijhouden voor een mention-suggest
if ($this.is("textarea#note.mentioning") || (init && $this.is("textarea#note"))) // Y van de caret bijhouden voor een mention-suggest
{
var val = cleanValue(this.selectionStart);
shadow.html(val);
@@ -347,7 +347,7 @@ jQuery.extend({
$(this).change(delayedUpdate).keyup(delayedUpdate).keydown(delayedUpdate).blur(update);
update.apply(this);
update.apply(this, [true]);
});

1
APPL/Localscripts/notes.js
View File

@@ -302,6 +302,7 @@ function mention(event)
{
if (event.key == "Enter"
|| (startIndex !== undefined && $("#note").val().substring(startIndex - 1, startIndex) != "@") // De '@' is weggehaald
|| (event.keyCode == 8 && $("#note").prop("selectionStart") == startIndex) // De '@' is weggehaald met een backspace
|| $("#note").prop("selectionStart") < startIndex) // Er is een teken getypt voor de '@'
{
stopMention();

5
APPL/MLD/mld_afronden.asp
View File

@@ -16,11 +16,13 @@ var JSON_Result = true;
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/kenmerk_common.inc" -->
<!-- #include file="mld.inc" -->
<%
protectRequest.validateToken();
var mld_key_arr = getFParamIntArray("mld_key");
var error = 0;
var ingesloten = [];
var warnings = [];
@@ -34,6 +36,7 @@ for (var i = 0; i < mld_key_arr.length; i++)
var emptyFlexRequired = mld.hasRequiredStatusEmptyMelding(mld_key_arr[i], 52); // Melding pseudo status Afgerond(52) (Afgemeld[=5], Afgerond is Afgemeld deel 2, dus -> 52)
if (emptyFlexRequired.kenm_ontbreekt.length)
{
error = 1;
var mldnr = mld.mld_prefix(mld_key_arr[i]) + mld_key_arr[i];
warnings.push(L("lcl_mld_req_status_empty").format(emptyFlexRequired.kenm_ontbreekt.join(", "), mldnr) );
}
@@ -59,7 +62,7 @@ for (var i = 0; i < ingesloten.length; i++)
mld.trackmeldingafronden(ingesloten[i], L("lcl_mld_is_mldafrtrack").format(formattedID));
}
var result = { key: ingesloten.join(","), success: ingesloten.length, warning: warnings.join("\n") };
var result = { key: ingesloten.join(","), success: ingesloten.length, error: error, warning: warnings.join("\n") };
Response.Write(JSON.stringify(result));
%>
<% ASPPAGE_END(); %>

2
APPL/MLD/mld_edit_melding.asp
View File

@@ -1516,7 +1516,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
RWCHECKBOXTR("indult", "fldafr", L("lcl_mld_indult"), mld_melding.indult);
}
if (this_mld.canAfrond)
RWCHECKBOXTR("afgerond", "fldafr", L("lcl_mld_afgerond"), mld_melding.mld_afgerond);
RWCHECKBOXTR("afgerond", "fldafr", L("lcl_mld_afgerond"), mld_melding.mld_afgerond, { "html": "onChange='onChangeAfgerond(this)'" });
if ((mld_melding.kto_opt & 2) == 2 && mld_melding.kto_verstuurd == null && this_mld.canClose)
RWCHECKBOXTR("ktoself", "fldkto", L("lcl_mld_kto_invite"), mld_melding.kto);

7
APPL/MLD/mld_edit_melding.js
View File

@@ -1406,6 +1406,13 @@ function onChangeBehandelteam(behandelteam_key)
}
}
function onChangeAfgerond(checkbox)
{
var afgerond = !!$(checkbox).prop("checked");
$("[data-required-completed=1]").toggleClass("required", afgerond)
.attr("required", (afgerond ? "required" : null));
}
function toggleBehandelgroep(data)
{
if (data.srtgroep & 4)

9
APPL/MLD/mld_flexkenmerk.inc
View File

@@ -33,6 +33,7 @@ function generateFlexKenmerkBlock(params)
var cancel = (params.cancel? params.cancel : false);
var halt = (params.halt? params.halt : false);
var close = (params.close? params.close : false);
var afgerond = 0;
var showClose = (params.showClose? params.showClose : false);
var copy = (params.copy? params.copy : false);
var opdr_status = (params.opdr_status? params.opdr_status : -1);
@@ -178,8 +179,9 @@ function generateFlexKenmerkBlock(params)
// Doordat we in de query controleren tegen old_stdm is er het gewenste
// neveneffect dat de waardes behouden blijven bij (achteraf) wisselen
// van standaardmelding
oRs = Oracle.Execute("SELECT mld_stdmelding_key FROM mld_melding where mld_melding_key = " + mld_key);
old_stdm = oRs(0).value;
oRs = Oracle.Execute("SELECT mld_stdmelding_key, mld_melding_afgerond FROM mld_melding WHERE mld_melding_key = " + mld_key);
old_stdm = oRs("mld_stdmelding_key").Value;
afgerond = oRs("mld_melding_afgerond").Value;
oRs.Close();
if (old_stdm != stdm_arr)
{ // De stdmelding is gewijzigd. De kenmerken (keys) veranderen daardoor ook.
@@ -378,6 +380,9 @@ function generateFlexKenmerkBlock(params)
+ (close
? " OR (k.mld_kenmerk_verplicht_status = 5)"
: "")
+ (afgerond
? " OR (k.mld_kenmerk_verplicht_status = 52)"
: "")
// Characteristic is required when 1) Order has characteristic-required-status 6 (=closed) and 2) order-status is 6 (=closed) or 9 (=completed)
+ (opdr_status == 6 || opdr_status == 9
? " OR (k.mld_kenmerk_verplicht_status = 6)"

12
APPL/MLD/mld_search.js
View File

@@ -11,7 +11,7 @@ function updateDisc(purole, pautfunction)
});
$("#discmulti").load("../Shared/loadDisc.asp?urole=" + purole
+ "&autfunction=" + pautfunction
+ "&srtdisc_key_arr=" + lsrtdisc_key_arr,
+ "&srtdisc_key_arr=" + lsrtdisc_key_arr.join(","),
function ()
{
// Laad de stdmeldingen
@@ -21,16 +21,20 @@ function updateDisc(purole, pautfunction)
function updateStdm(purole, pautfunction)
{
var srtdisc_key = $("#srtdisc").val();
var lsrtdisc_key_arr = new Array();
var ldisc_key_arr = new Array();
$('#srtdiscmulti :selected').each(function(i, selected)
{
lsrtdisc_key_arr[i] = $(selected).val();
});
$("#discmulti :selected").each(function(i, selected)
{
ldisc_key_arr[i] = $(selected).val();
});
$("#sm").load("../Shared/loadStdmelding.asp?urole=" + purole
+ "&autfunction=" + pautfunction
+ (srtdisc_key > 0? "&srtdisc_key=" + srtdisc_key : "")
+ (ldisc_key_arr.length != 0? "&disc_key_arr=" + ldisc_key_arr : ""));
+ (lsrtdisc_key_arr.length != 0? "&srtdisc_key_arr=" + lsrtdisc_key_arr.join(",") : "")
+ (ldisc_key_arr.length != 0? "&disc_key_arr=" + ldisc_key_arr.join(",") : ""));
}
function onChangeKpgroep()

10
APPL/MLD/mld_show_melding.js
View File

@@ -321,11 +321,19 @@ function mld_afrond()
protectRequest.dataToken(data);
$.post("mld_afronden.asp",
data,
FcltCallbackAndThen(fn_mld_melding_reload(mld_key)),
FcltCallbackAndThenAlways(mld_afrond_callback),
"json");
});
}
function mld_afrond_callback(json)
{
if (json.success)
fn_mld_melding_reload(/* global */ mld_key);
else if (json.error == 1) // 1 = verplicht kenmerk ontbreekt
mld_change(/* global */ urole);
}
function mld_verwerk()
{
FcltMgr.confirm(L("lcl_mld_ask_verwerk").format(mldPrefix + mld_key), function() {

3
APPL/MLD/opdr_list.asp
View File

@@ -19,6 +19,7 @@ var LOCKED_USER_OK = { "xmlnode": "melding", "key": getQParamInt("mld_key", null
<%
var urole = getQParamSafe("urole");
var srtdisc_key = getQParamInt("srtdisc", -1); // Soort melding.
// Beperken tot I of E? Standaard niet.
var has_opdrXUit = getQParamInt("has_opdrXUit", 0) == 1; // Wordt er gefilterd?
var internuit = getQParamInt("opdrIUit", (has_opdrXUit ? 0 : 1)) == 1; // Interne uitvoerders.
@@ -45,7 +46,7 @@ var theparams = { urole: urole,
// LET OP: We hebben altijd een mld_key of cnt_key. Effectief heeft 90% van de parameters geen effect?
// ----
behandel_key: getQParamInt("behandel_key", null),
srtdisc: getQParamInt("srtdisc", null),
srtdisc_key_arr : (srtdisc_key != -1 ? [srtdisc_key] : null),
search: getQParam("search", null),
loc_key: getQParamInt("loc_key", null),
bld_key: getQParamInt("bld_key", null),

27
APPL/MLD/opdr_search.asp
View File

@@ -83,7 +83,7 @@ var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
FreezeHandler = FreezeHandler && (handler_key != -1 || (frontend && !justClose));
var alg_startlevel = getQParamInt("alg_startlevel", (bes? 3 : 2)); // Startlevel van plaatsselector (Regio/Locatie). Standaard is locatie (2) of gebouw (3)
var srtdisc_key = getQParamInt("srtdisc", -1); // Soort melding
var srtdisc_key_arr = getQParamIntArray("srtdisc_key_str", []); // Soort melding
var disc_key_arr = getQParamIntArray("disc_key_str", []); // Productgroep
var meldinggrp_key = getQParamInt("meldinggrp_key", -1); // Meldinggroep
var behandelgrp_key = getQParamInt("behandelgrp_key", -1); // Behandelgroep
@@ -91,7 +91,7 @@ var stdm_arr = getQParamIntArray("stdm_str", []); // Melding (Stdmelding)
var alg_eindlevel = getQParamInt("alg_eindlevel", 3); // eindlevel tbv plaatsselector. Standaard Gebouw
if (stdm_arr.length != 0 && disc_key_arr.length == 0 && srtdisc_key == -1)
if (stdm_arr.length != 0 && disc_key_arr.length == 0 && srtdisc_key_arr.length == 0)
{
sql = "SELECT mld_ins_discipline_key"
+ ", ins_srtdiscipline_key"
@@ -103,7 +103,7 @@ if (stdm_arr.length != 0 && disc_key_arr.length == 0 && srtdisc_key == -1)
if (!oRs.eof)
{
disc_key_arr = [oRs("mld_ins_discipline_key").value];
srtdisc_key = oRs("ins_srtdiscipline_key").value;
srtdisc_key_arr = [oRs("ins_srtdiscipline_key").value];
}
}
@@ -370,17 +370,18 @@ oRs.close();
+ " AND m1.ins_srtdiscipline_key = sd.ins_srtdiscipline_key"
+ " AND md.ins_discipline_key = m1.ins_discipline_key"
+ ")"
+ (srtdisc_key != -1
? " AND ins_srtdiscipline_key IN(" + srtdisc_key + ") "
+ (srtdisc_key_arr.length != 0
? " AND ins_srtdiscipline_key IN(" + srtdisc_key_arr.join(",") + ") "
: " ")
+ " ORDER BY 2"
FCLTselector("srtdisc",
FCLTselector("srtdiscmulti",
sql,
{ initKey: srtdisc_key,
{ initKey: srtdisc_key_arr.join(","),
label: L("lcl_vakgroup_type"),
trclass: "secsearch noxd",
onChange: 'updateDisc("' + urole + '", "' + (typeof autfunction == "object" && autfunction instanceof Array? autfunction.join(",") : autfunction) + '");',
emptyOption: (srtdisc_key == -1? L("lcl_search_generic") : null) // Als een srtdisc_key is meegegeven dan geen lege optie
multi: true,
emptyOption: (srtdisc_key_arr.length == 0? L("lcl_search_generic") : null) // Als een srtdisc_key is meegegeven dan geen lege optie
}) %>
<!-- Productgroep -->
@@ -424,10 +425,10 @@ oRs.close();
+ " WHERE m1.ins_discipline_key = ms.mld_ins_discipline_key"
+ " AND ms.mld_stdmelding_verwijder IS NULL)"
+ " AND m1.ins_discipline_key IN (" + discsql_aut + ")"
+ (srtdisc_key != -1
+ (srtdisc_key_arr.length != 0
? " AND m1.ins_discipline_key IN (SELECT ins_discipline_key"
+ " FROM mld_discipline"
+ " WHERE ins_srtdiscipline_key IN (" + srtdisc_key + "))"
+ " WHERE ins_srtdiscipline_key IN (" + srtdisc_key_arr.join(",") + "))"
: "")
+ (disc_key_arr.length != 0
? " AND m1.ins_discipline_key IN (" + disc_key_arr.join(",") + ")"
@@ -513,12 +514,12 @@ oRs.close();
+ " WHERE M.mld_stdmeldinggroep_key = G.mld_stdmeldinggroep_key"
+ " AND M.mld_stdmelding_verwijder IS NULL"
+ " AND M.mld_stdmeldinggroep_key IS NOT NULL"
+ (srtdisc_key != -1
+ (srtdisc_key_arr.length != 0
? " AND mld_ins_discipline_key IN (SELECT ins_discipline_key"
+ " FROM mld_discipline"
+ " WHERE ins_srtdiscipline_key = " + srtdisc_key + ")"
+ " WHERE ins_srtdiscipline_key IN (" + srtdisc_key_arr.join(",") + "))"
: "")
+ (disc_key_arr != 0
+ (disc_key_arr.length != 0
? " AND mld_ins_discipline_key IN (" + disc_key_arr.join(",") + ")"
: "")
+ " AND mld_ins_discipline_key IN (" + grpsql_aut + ")"

18
APPL/MLD/opdr_search.js
View File

@@ -4,11 +4,15 @@
*/
function updateDisc(purole, pautfunction)
{
var lsrtdisc_key_arr = $("#srtdisc :selected").val();
var lsrtdisc_key_arr = new Array();
$('#srtdiscmulti :selected').each(function(i, selected)
{
lsrtdisc_key_arr[i] = $(selected).val();
});
var offerte = $("#offerte").val();
$("#discmulti").load("../Shared/loadDisc.asp?urole=" + purole
+ "&autfunction=" + pautfunction
+ "&srtdisc_key_arr=" + lsrtdisc_key_arr
+ "&srtdisc_key_arr=" + lsrtdisc_key_arr.join(",")
+ (offerte >= 0? "&offerte=" + offerte : ""),
function ()
{
@@ -19,17 +23,21 @@ function updateDisc(purole, pautfunction)
function updateStdm(purole, pautfunction)
{
var srtdisc_key = $("#srtdisc").val();
var lsrtdisc_key_arr = new Array();
var ldisc_key_arr = new Array();
var offerte = $("#offerte").val();
$('#srtdiscmulti :selected').each(function(i, selected)
{
lsrtdisc_key_arr[i] = $(selected).val();
});
$('#discmulti :selected').each(function(i, selected)
{
ldisc_key_arr[i] = $(selected).val();
});
$("#sm").load("../Shared/loadStdmelding.asp?urole=" + purole
+ "&autfunction=" + pautfunction
+ (srtdisc_key > 0? "&srtdisc_key=" + srtdisc_key : "")
+ (ldisc_key_arr.length != 0? "&disc_key_arr=" + ldisc_key_arr : "")
+ (lsrtdisc_key_arr.length != 0? "&srtdisc_key_arr=" + lsrtdisc_key_arr.join(",") : "")
+ (ldisc_key_arr.length != 0? "&disc_key_arr=" + ldisc_key_arr.join(",") : "")
+ (offerte >= 0? "&offerte=" + offerte : ""));
}

4
APPL/MLD/opdr_search_list.asp
View File

@@ -70,7 +70,7 @@ var gebouwkey = getQParamInt("gebouwkey", -1);
var verdiepingkey = getQParamInt("verdiepingkey", -1);
var ruimtekey = getQParamInt("ruimtekey", -1);
var opdrtype =getQParamInt("opdrtype", -1); // Opdrachttype
var srtdisc_key = getQParamInt("srtdisc", -1); // Soort melding
var srtdisc_key_str = getQParamIntArray("srtdiscmulti", [-1]); // Soort melding
var disc_key_str = getQParamIntArray("discmulti", [-1]); // Productgroep
var stdm_key_str = getQParamIntArray("sm", [-1]); // Melding (Stdmelding)
var meldinggrp_key = getQParamInt("meldinggrp_key", -1); // Meldinggroep
@@ -154,7 +154,7 @@ var params = { urole : urole,
enddatefrom: enddate_from,
enddateto: enddate_to,
opdrtype_key: (opdrtype != -1 ? opdrtype : null),
srtdisc_key : (srtdisc_key != -1 ? srtdisc_key : null),
srtdisc_key_arr : (srtdisc_key_str.length > 0 && srtdisc_key_str.join(",").indexOf("-1") == -1? srtdisc_key_str : null),
disc_key_arr : (disc_key_str.length > 0 && disc_key_str.join(",").indexOf("-1") == -1? disc_key_str : null),
stdm_key_arr : (stdm_key_str.length > 0 && stdm_key_str.join(",").indexOf("-1") == -1? stdm_key_str : null),
meldinggrp_key: (meldinggrp_key != -1 ? meldinggrp_key : null),

4
APPL/MSG/msg_message_save.asp
View File

@@ -19,6 +19,8 @@ var JSON_Result = true;
<!-- #include file="../shared/save2db.inc" -->
<%
protectRequest.validateToken();
FCLTHeader.Requires({ plugins:[], js: [] })
// this could be a reply to an existing message, or a brandnew message (key=-1).
@@ -302,4 +304,4 @@ if (!receivers && !sendPortalOption)
var result = {success: true, message: mes, key: new_message_key};
Response.Write(JSON.stringify(result));
%>
<% ASPPAGE_END(); %>
<% ASPPAGE_END(); %>

1
APPL/PDA/afspraak.asp
View File

@@ -586,7 +586,6 @@ var subject = (isReservering
, datum: bez_afspraak_datum
, maxPast : ((urole == "fe")? 0 : S("vis_afspraak_limiet"))
, maxFuture: ((urole == "fe" && S("vis_fe_afspraak_limiet") > 0)? S("vis_fe_afspraak_limiet") : S("vis_afspraak_limiet"))
, selectableDays: (S("bez_use_buildinghours") > 1 ? 3 : 0)
, calendars: 1
, autoopen : (afs_key == -1 && rsv_ruimte_key == -1)
, initTimeEmpty: timeBeginInitEmpty

46
APPL/PDA/melding.asp
View File

@@ -708,8 +708,11 @@ else
$("#enddate").val(endDate.getTime());
var endTime = ("0" + endDate.getHours()).slice(-2) + ':' + ("0" + endDate.getMinutes()).slice(-2);
endDate = new Date(endDate);
endDateStr = calendar_names.daysMin[endDate.getDay()] + " " +
padout(endDate.getDate()) + "-" + padout(endDate.getMonth() + 1) + "-" + padout(endDate.getFullYear());
if ($("#show_enddate").length)
$("#show_enddate").val($("#show_enddate").attr("type") == "date" ? endDate.toISOString().substr(0,10) : endDate.toLocaleDateString());
$("#show_enddate").val(endDateStr);
if ($("#time_from_enddate").length)
$("#time_from_enddate").val(endTime);
}
@@ -785,19 +788,18 @@ else
$("#quickNoteTip").fadeIn();
});
<% }
if (!mld_info.einddatum) { %>
recalcEinddatum(false);
if (mld_key < 0 && !mld_info.einddatum) { %>
recalcEinddatum();
<% } %>
// recalculate enddate on change of object
$("#r_objs").on("change", function _r_objs_change()
{
recalcEinddatum(false);
recalcEinddatum();
});
});
var mld_key = <%=mld_key%>;
function recalcEinddatum(recalc_always)
{
var recalc_always = (recalc_always === undefined ? true : recalc_always);
// Er zijn twee situaties te onderscheiden:
// 1) Startdatum is zichtbaar/wijzigbaar,
// De tijd van de startdatum is altijd de begintijd van de dag (setting "fac_t_startofworkday" bijvoorbeeld 8:00 uur)
@@ -821,7 +823,7 @@ else
var startwerkdag_min = (startOfWorkDay - Math.floor(startOfWorkDay)) * 60;
var startdatebegin = new Date(startdate.getFullYear(), startdate.getMonth(), startdate.getDate(), startwerkdag_uur, startwerkdag_min);
if ("<%=stdm_info.startdatum%>" == "1")
if (<%=stdm_info.startdatum? 1 : 0%> == 1)
{ // Situatie 1: Einddatum = TRUNC(startdatum) + 8:00 uur + SLA
// LET OP!!!: Als setting "mld_disc_params_startdatum" is gezet dan wordt eigenlijk verondersteld dat de SLA in dagen is en niet in uren.
// Echter als de startdatum vandaag is moet wel voor de begintijd de huidige sysdate tijd genomen worden tijdens het opslaan.
@@ -846,24 +848,22 @@ else
// Mobile only has 1 object max
var ins_key = $("#r_objs").val() || -1;
if (!$("#r_objs").length || ($("#r_objs").length && ins_key != -1 && !recalc_always) || recalc_always) // Alleen opnieuw de eindtijd bepalen als er een object met uitvoertijd is.
{
// daarmee kan ik de database de einddatum laten bepalen
var params = { req_info: "calc_einddatum",
startdatum: startdatum,
srtdisc: <%=mld_info.srtdisc%>,
disc: <%=mld_info.disc%>,
stdm_key: stdm_key,
prio: prio,
geb_key: geb_key,
rui_key: rui_key,
ins_key: ins_key
};
// De voorwaarden of de einddatum opnieuw moet worden berekend zijn voor binnenkomst al afgedwongen.
// Nu kan de database de einddatum bepalen.
var params = { req_info: "calc_einddatum",
startdatum: startdatum,
srtdisc: <%=mld_info.srtdisc%>,
disc: <%=mld_info.disc%>,
stdm_key: stdm_key,
prio: prio,
geb_key: geb_key,
rui_key: rui_key,
ins_key: ins_key
};
$.getJSON("<%=rooturl%>/appl/mld/get_mld_info_ajax.asp",
params,
setInitEinddatum);
}
$.getJSON("<%=rooturl%>/appl/mld/get_mld_info_ajax.asp",
params,
setInitEinddatum);
}
</script>
</head>

18
APPL/PDA/order.asp
View File

@@ -661,17 +661,13 @@ oRs.close();
}
BLOCK_START({collapsed: true, title: mld_opdr.opdr_type_omschr});
if (mld_opdr.uitvoerende_key && mld_opdr.uitvoerende_key > 0)
{
var sql = " SELECT prs_bedrijf_naam uitv_naam"
+ " FROM prs_v_aanwezigbedrijf b"
+ " WHERE b.prs_bedrijf_key = " + mld_opdr.uitvoerende_key;
var oRs = Oracle.Execute(sql);
if (!oRs.EoF)
ROFIELD ("fld", mld_opdr.srtdiscbes ? L("lcl_bes_Supplier") : L("lcl_ord_company_uit"), oRs("uitv_naam").Value,
{moreinfo: rooturl+"/appl/pda/bedrijf.asp?bedrijf_key=" + mld_opdr.uitvoerende_key, suppressEmpty: true});
oRs.Close();
}
FCLTuitvoerendeselector("uitvoerende",
"sgUitv",
{ uitvoerendekey: mld_opdr.uitvoerende_key,
label: mld_opdr.srtdiscbes ? L("lcl_bes_Supplier") : L("lcl_ord_company_uit"),
moreinfo: urole != "fe",
readonly: true
});
if (pbtype == "BE")
{

20
APPL/PDA/reservering.asp
View File

@@ -417,6 +417,25 @@ if (!rsv.verwijderd) // geen script nodig als reservering verwijderd is.
if (!validateForm("res"))
return false;
if (<%=S("res_247organisation")%> == 0)
{
var startDate = new Date(parseInt($("#date_from").val()));
var isHoliday = cal_isVrijeDag(startDate) || cal_isWeekend(startDate);
FcltMgr.confirm( "<%=L("lcl_holiday")%>"
, { autoconfirm: !isHoliday
, fncancel: function() { return false; }
}
, function() { res_submit_post(); }
);
}
else
{
res_submit_post();
}
}
function res_submit_post()
{
$.post( $("form[name=res]")[0].action
, $("form[name=res]").serialize()
, McltCallbackAndThenAlways(res_submit_callback)
@@ -676,7 +695,6 @@ else
datum: rsv.ruimte_van, //new Date(rsv.ruimte_van),
maxPast: 0,
maxFuture: (rsv.eff_act_limiet_fe > 0 ? rsv.eff_act_limiet_fe : rsv.eff_act_limiet),
selectableDays: (S("bez_use_buildinghours") > 1 ? 3 : 0),
timeField: true,
timeStep: S("res_h") * 60,
startTime: S("res_t1"),

17
APPL/PDA/reservering_new.asp
View File

@@ -386,6 +386,21 @@ if (rsv_ruimte_key == -1)
if (!validateForm("res_new_1"))
return false;
if (<%=S("res_247organisation")%> == 0)
{
var startDate = new Date(parseInt($("#date_from").val()));
var isHoliday = cal_isVrijeDag(startDate) || cal_isWeekend(startDate);
FcltMgr.confirm( "<%=L("lcl_holiday")%>"
, { autoconfirm: !isHoliday
, fncancel: function() { return false; }
}
, function() { fn_res_next1_confirm(); }
);
}
}
function fn_res_next1_confirm()
{
var activiteit = <%=act_key%>;
var datum = $("#date_from").val();
@@ -499,7 +514,6 @@ if (rsv_ruimte_key == -1)
datum: res_van,
maxPast: 0,
maxFuture: (eff_act_limiet_fe > 0 ? eff_act_limiet_fe : eff_act_limiet),
selectableDays: (S("bez_use_buildinghours") > 1 ? 3 : 0),
initEmpty: (rsv_ruimte_key<0 && restype=="C"),
initTimeEmpty: (rsv_ruimte_key<0 && restype=="C"),
timeField: true,
@@ -518,7 +532,6 @@ if (rsv_ruimte_key == -1)
{ label : L("lcl_to"),
datum: res_tot,
maxFuture: (eff_act_limiet_fe > 0 ? eff_act_limiet_fe : eff_act_limiet),
selectableDays: (S("bez_use_buildinghours") > 1 ? 3 : 0),
timeField: true,
timeStep: S("res_h") * 60,
startTime: S("res_t1"),

6
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -242,7 +242,9 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"] });
if (rrr.mld_opdr_key > 0)
{
var sql = "SELECT mld_opdr_id FROM mld_opdr WHERE mld_opdr_key = " + rrr.mld_opdr_key;
var sql = "SELECT COALESCE(mld_opdr_id, mld_melding_key||'/'||mld_opdr_bedrijfopdr_volgnr) mld_opdr_id"
+ " FROM mld_opdr"
+ " WHERE mld_opdr_key = " + rrr.mld_opdr_key;
oRs = Oracle.Execute(sql);
rrr.mld_opdr_id = oRs("mld_opdr_id").Value;
oRs.close();
@@ -492,7 +494,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"] });
+ " sa.res_srtactiviteit_metopmerk,"
+ " rrr.res_rsv_ruimte_cvab_mode,"
+ " mo.mld_opdr_key,"
+ " mo.mld_opdr_id,"
+ " COALESCE(mo.mld_opdr_id, mo.mld_melding_key||'/'||mo.mld_opdr_bedrijfopdr_volgnr) mld_opdr_id,"
+ " mo.mld_melding_key,"
+ " mo.mld_opdr_bedrijfopdr_volgnr"
+ " FROM res_rsv_ruimte rrr, "

2
APPL/RES/res_plan.js
View File

@@ -382,6 +382,8 @@ function showOpmerking(remark_selector, evt, v2)
// Onderkant popup ongeveer gelijk met onderderkant aangeklikte omschrijving.
// Mocht bovenkant uit zicht verdwijnen dan bovenkant omschrijving gelijk aan bovenkant iframe.
var $rem = $(remark_selector);
if (!$rem.length) // Geen omschrijving tooltip
return;
$rem.find('img').attr('src',$rem.find('img').attr('theSrc'))
if (!String($rem.html()).replace(/[ \t\n\r]/g,""))
{

5
APPL/RES/res_select_room.asp
View File

@@ -57,9 +57,8 @@ var width_px = getQParamInt("width_px", 1024);
<head>
<% FCLTHeader.Generate() %>
</head>
<body class="modal" id="mod_res_selectroom">
<body class="modal<%=S("res_plantable_version") == 1 ? " deprecated" : ""%>" id="mod_res_selectroom">
<%
MODAL_START();
var params = {id: "tab_room_sched",
res_van: date_from,
res_tot: date_to,
@@ -104,6 +103,6 @@ var vraag = JSON.stringify(params, null);
if (plan_rooms_info && plan_bezet_info)
make_plan_room(plan_rooms_info, plan_bezet_info, params);
*/
MODAL_END(); %>
%>
</body>
</html><% ASPPAGE_END(); %>

2
APPL/RES/res_show_rsv_ruimte.asp
View File

@@ -98,7 +98,7 @@ FCLTHeader.Requires({plugins: ["jQuery"]})
+ " , ra.res_activiteit_intervals"
+ " , ra.res_activiteit_image"
+ " , mo.mld_opdr_key"
+ " , mo.mld_opdr_id"
+ " , COALESCE(mo.mld_opdr_id, mo.mld_melding_key||'/'||mo.mld_opdr_bedrijfopdr_volgnr) mld_opdr_id"
+ " , mo.mld_melding_key"
+ " , mo.mld_opdr_bedrijfopdr_volgnr"
+ " FROM res_rsv_ruimte rrr, "

2
APPL/RES/res_xml.asp
View File

@@ -58,4 +58,4 @@
FCLT2XMLResponse({xmlnode: 'reservering', key: res_key[0]});
}
%>
<% ASPPAGE_END(); %>
<% ASPPAGE_END(); %>

9
APPL/Shared/default.csx
View File

@@ -1840,7 +1840,7 @@ table[id^=searchblock] td#usrrapinfo {
background-color: ==activetabbackgroundcolor==;
}
body#planbody.content-box,
body#mod_res_selectroom {
body#mod_res_selectroom.deprecated {
box-sizing: content-box;
}
/* Niet bij lijsten en het planbord */
@@ -2002,11 +2002,16 @@ div.labelgrid input[type=checkbox] {
height: 27px; /* same as the label height */
}
#mod_res_selectroom .labelgrid:hover,
#mod_res_selectroom .labelgrid:hover i,
#mod_res_selectroom .labelgrid:hover label,
#mod_res_selectroom .labelgrid:hover label i {
color: ==menuitemhovercolor==;
background-color: ==menuitemhoverbackgroundcolor==;
}
#mod_res_selectroom div.rrdet {
color: initial;
background-color: initial;
}
div.capaciteitgrid {
font-size: 0.8em;
text-align: right;

2
APPL/Shared/default.inc
View File

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

17
APPL/Shared/header.inc
View File

@@ -274,9 +274,12 @@ FCLTHeader =
FCLTHeader.AddStylesheet(rooturl + "/appl/fontawesome/css/all.min.css");
if (params.outputmode == 1 || params.outputmode == 5) { // Printen is vrij kaal
FCLTHeader.AddStylesheet(rooturl+"/appl/shared/default-print.css");
if (getQParam('autosortby', "") || getFParam('autosortby', "")) // Deze twee wel nodig bij printen
if (getQParam('autosortby', "") || getFParam('autosortby', "")) // Deze zijn wel nodig bij printen
{
%><script type="text/javascript" src="<%=this.AddTimeStamp(rooturl+'/appl/LocalScripts/jquery.min.js')%>"></script><%
%><script type="text/javascript" src="<%=this.AddTimeStamp(rooturl+'/appl/LocalScripts/FcltJquery.js')%>"></script><%
%><script type="text/javascript" src="<%=this.AddTimeStamp(rooturl+'/appl/pda/modernizr.js')%>"></script><%
%><script type="text/javascript" src="<%=this.AddTimeStamp(rooturl+'/appl/LocalScripts/iface.js')%>"></script><%
%><script type="text/javascript" src="<%=this.AddTimeStamp(rooturl+'/appl/LocalScripts/sorttable.js')%>"></script><%
}
return;
@@ -375,27 +378,27 @@ FCLTHeader =
fontfamily: "fclt-skolar-sans, Verdana, Tahoma, Arial, Helvetica, sans-serif",
fontfamily_alt: "Tahoma, Arial, Helvetica, sans-serif",
fontfamily_titles: "fclt-skolar-sans, sans-serif",
headerimage: "../appl/pictures/banner.png",
loginbgimage: "../appl/pictures/loginbg.jpg",
logincolor: "#A4B2C4",
loginbackgroundcolor: "#CC5252",
newsbgimage: "../appl/pictures/loginbg.jpg",
newscolor: "#FFFFFF",
portalmenubgimage: "../appl/pictures/loginbg.jpg",
portalmenucardbgimage: "../appl/pictures/portalcardbg.jpg",
portalbgimage: "../appl/pictures/framebodybg.jpg",
framebgimage: "../appl/pictures/framebodybg.jpg", //"../appl/pictures/nobg.jpg",
textcolor: "#343F4D",
inputbackgroundcolor: "#EBEFFF",
linkcolor: "#0237FF",
linkhovercolor: "#F26522",
requiredbordercolor: "#D50000",
headerbackgroundcolor: "#FFFFFF",
headercolor: "#666666",
dividercolor: "#DDDDDD",

10
APPL/Shared/kenmerk_common.inc
View File

@@ -792,6 +792,15 @@ function kv2html(pfield, pparams)
if (!((pparams.colCount&1) && pparams.kenmerk_2col) && !pparams.props.notr)
kvhtml += '\n</tr>';
}
/* Verplicht bij (sub)status afgerond moeten we clientside kunnen togglen */
if (pfield.reqbystatus == "52" && !inArray(pfield.kkenmerktype, ["B", "l", "L", "Q"]) && !pfield.readonlyfield && !pfield.maskeren)
{
var jQuery_selector = "#" + (pfield.kkenmerktype == "S" ? "Suggest" : "")
+ pparams.props.nameprefix + pfield.idCounter
+ (pfield.kkenmerktype == "S" ? "_show" : "val");
kvhtml += '<script>$("' + jQuery_selector + '").attr("data-required-completed", 1);</script>';
}
}
return kvhtml;
}
@@ -2277,6 +2286,7 @@ function listKenmerk(sql, module, pkey, props)
thisfield.kregexp = oRs("kenmerk_regexp").Value;
thisfield.kdomein_key = oRs("kenmerkdomein_key").Value;
thisfield.required = oRs("kenmerk_verplicht").Value; // dit is een integer, geen boolean
thisfield.reqbystatus = module == "MLD" ? oRs("kenmerk_verplicht_status").Value : -1;
thisfield.reqgroup = oRs("kenmerk_groep").Value;
thisfield.otherPath = oRs("otherpath").Value; // otherKenmerkPath, alleen voor meldingen en facturen (tbv kopieren)

8
APPL/Shared/loadStdmelding.asp
View File

@@ -20,7 +20,7 @@ var minfo = urole == "mi"; // NOT APPLICABLE?
var frontend = (urole == "fe" || (!fronto && !backo && !minfo));
var autfunction_arr = getQParamArray("autfunction", []); // Check of user rechten heeft op meegegeven artikelen
var srtdisc_key = getQParamInt("srtdisc_key", -1);
var srtdisc_key_arr = getQParamIntArray("srtdisc_key_arr", []); // Vakgroeptype (Soort melding) van de melding.
var disc_key_arr = getQParamIntArray("disc_key_arr", []); // Productgroep (discipline): -2 als lege waarde meegegeven omdat -1 een geldige waarde is
var stdm_arr = getQParamIntArray("stdm_str", []); // Stdmelding string (eventueel initi<74>le waarden)
var noExpired = getQParamInt("noExpired", 0) == 1;
@@ -61,8 +61,8 @@ var stdmsql = "SELECT DISTINCT sm.mld_stdmelding_key"
? " AND sm.mld_stdmelding_notfrontend = 0"
: "")
// srtdisc wordt niet afgedwongen via afhankelijkheid in het geval van discipline is alle (-1). Dus gewoon meenemen.
+ (srtdisc_key > 0
? " AND d.ins_srtdiscipline_key = " + srtdisc_key
+ (srtdisc_key_arr.length != 0
? " AND d.ins_srtdiscipline_key IN (" + srtdisc_key_arr.join(",") + ")"
: "")
+ (disc_key_arr.length != 0
? " AND sm.mld_ins_discipline_key IN (" + disc_key_arr.join(",") + ")"
@@ -92,4 +92,4 @@ FCLTselectorOptions(stdmsql,
});
%>
<% ASPPAGE_END(); %>
<% ASPPAGE_END(); %>

39
APPL/Shared/xml_converter.inc
View File

@@ -40,7 +40,9 @@ function STR2Stream(xmlstr, xslfile, Stream, params)
var myErr = xmldoc.parseError;
__Log("XML2STR3 Error in xmlfile: " + myErr.reason);
Response.Write ("<html><body><b>Error in xmlfile:</b><br>" + myErr.reason + "</body></html>");
} else {
}
else
{
xslproc = xslt.createProcessor();
xslproc.input = xmldoc;
xslproc.addParameter("mode", params.mode);
@@ -259,7 +261,8 @@ function make_xml(params)
var oRs = Oracle.Execute(sql);
var xml_content = oRs("xml_blob").Value;
xml_content = addParameterNode(xml_content, params.extraparams)
xml_content = addParameterNode(xml_content, params.extraparams);
xml_content = addLanguageNode(xml_content, params)
if (!xml_content)
shared.record_not_found();
@@ -347,6 +350,38 @@ function addParameterNode(p_xml, p_extraparams)
return p_xml;
}
function addLanguageNode(p_xml, params)
{
var lang_path = custpath + "\\xsl\\language_" + user_lang + ".xml";
if (fso.FileExists(Server.MapPath(lang_path)))
{
// Eerst laden van bestaande xml.
var xmlDoc = new ActiveXObject("MSXML2.DOMDocument.6.0");
xmlDoc.async = false;
xmlDoc.loadXML(p_xml);
// Nu de in te voegen xml laden.
var xmlIns = new ActiveXObject("Msxml2.DOMDocument.6.0");
xmlIns.async = false;
xmlIns.load(Server.MapPath(lang_path));
if (xmlIns.parseError.errorCode != 0)
{
var myErr = xmlIns.parseError;
_AiAi(myErr.reason + " in " + lang_path);
}
else
{
var langNode = xmlIns.selectSingleNode("/*"); // de root-node uit het zojuist geladen taal-bestand
var clone = xmlDoc.importNode(langNode, true);
var nodeParent = xmlDoc.selectSingleNode("//facilitor/lcl"); // In deze node moet het worden toegevoegd.
nodeParent.appendChild(clone);
__Log(lang_path + " added to XML");
p_xml = xmlDoc.documentElement.xml;
}
}
return p_xml;
}
// Veel gebruikte functies vanuit API's
// http://davidwalsh.name/convert-xml-json

25
UTILS/PutOrders/puo_xmltools.js
View File

@@ -252,11 +252,9 @@ function fetchXMLContent( node
Log2File(0, "fetchXMLContent error: " + e.description, "W");
xml_content = "";
}
finally
{
LogString2File(3, "make_xml", xml_content, "xml");
}
var xmlDoc = xml_content?SafeLoadTextXML(xml_content):null;
xml_content = addLanguageNode(xmlDoc, { userlang: userlang });
LogString2File(3, "make_xml", xml_content, "xml");
prev_XMLContent.node = node;
prev_XMLContent.refkey = refkey;
@@ -268,6 +266,25 @@ function fetchXMLContent( node
return xmlDoc;
}
function addLanguageNode(p_xml, params)
{
var lang_path = custabspath + "/xsl/language_" + params.userlang + ".xml";
var fso = new ActiveXObject("Scripting.FileSystemObject");
if (p_xml && fso.FileExists(lang_path))
{
var xmlIns = new ActiveXObject("Msxml2.DOMDocument.6.0");
xmlIns.async = false;
xmlIns.load(lang_path);
TestAndRaiseAnXMLError("Error in "+lang_path, xmlIns);
var langNode = xmlIns.selectSingleNode("/*"); // de root-node uit het zojuist geladen taal-bestand
var clone = p_xml.importNode(langNode, true);
var nodeParent = p_xml.selectSingleNode("//facilitor/lcl"); // In deze node moet het worden toegevoegd.
nodeParent.appendChild(clone);
Log2File(1, lang_path + " added to XML");
}
return (p_xml?p_xml.documentElement.xml:"");
}
function mergeXMLAttachments(iXml, p_xslPath)
{

39
UTILS/gen_scheduler/gen_cleanup.js
View File

@@ -4,9 +4,14 @@
// In kader van FCLT#62383
// Een parameter: UDL voor database connectie
var doDelete = (WScript.Arguments.Length > 0 && WScript.Arguments(0) == "DODELETE");
if (!doDelete)
WScript.Echo("Simulation only. Call me using DODELETE to actually change something");
var fso = new ActiveXObject("Scripting.FileSystemObject");
function __Log(s)
{
WScript.Echo(s);
var logPath = "../../../temp/" + CustId;
var flog = fso.OpenTextFile(logPath + "/gencleanup.log", 8 /* ForAppending */, true /* create */);
flog.WriteLine(s);
@@ -78,7 +83,8 @@ function cleanup_bijlagen()
var sql = "UPDATE fac_bijlagen"
+ " SET fac_bijlagen_root_key = fac_bijlagen_key"
+ " WHERE fac_bijlagen_verwijder IS NOT NULL";
Oracle.Execute(sql);
if (doDelete)
Oracle.Execute(sql);
// Alle records die op verwijderd staan en waaraan niet meer gerefereerd wordt in een niet-te-verwijderen
// record mogen opgeruimd worden.
@@ -102,6 +108,7 @@ function cleanup_bijlagen()
deleted.total++;
var del_key = oRs("fac_bijlagen_key").Value;
var del_file = flexfilespath + "/" + oRs("map").Value + "/" + oRs("filename").Value;
WScript.Echo("Considering: " + del_file)
try
{
// Controle: bestaat er og een actief bestand.
@@ -117,9 +124,14 @@ function cleanup_bijlagen()
//__Log(del_file);
if (fso.FileExists(del_file))
{
fso.DeleteFile(del_file);
if (doDelete)
{
fso.DeleteFile(del_file);
__Log("Deleted: " + del_file)
}
else
__Log("PSEUDO delete " + del_file);
deleted.files++;
//__Log("Deleted: " + del_file);
}
}
oRs_a.Close();
@@ -128,7 +140,10 @@ function cleanup_bijlagen()
sql_d = "DELETE"
+ " FROM fac_bijlagen"
+ " WHERE fac_bijlagen_key = " + del_key;
Oracle.Execute(sql_d);
if (doDelete)
Oracle.Execute(sql_d);
else
__Log("PSEUDO DELETE fac_bijlagen_key = " + del_key);
deleted.records++;
}
catch(e)
@@ -138,6 +153,7 @@ function cleanup_bijlagen()
}
oRs.MoveNext();
}
oRs.Close();
__Log( "files deleted: " + deleted.files + "\n"
+ "records deleted: " + deleted.records + "\n"
+ "errors: " + deleted.errors + "\n"
@@ -222,8 +238,12 @@ function cleanup_temp()
var err = "";
var delFolder = nextPath.substr(0, nextPath.length-1);
if (doDelete)
{
try { fso.DeleteFolder(delFolder, true); } catch (e) { err = " FAILED"; };
__Log(" delete folder: " + delFolder + err);
__Log(" delete folder: " + delFolder + err);
}
else
__Log("PSUEDO delete folder: " + delFolder + err);
}
}
}
@@ -253,8 +273,12 @@ function cleanup_temp()
files_deleted++;
var err ="";
if (doDelete)
{
try { thisFile.Delete(); } catch (e) { err = " FAILED"; };
__Log(" delete file: " + p_thisPath + vName + err);
__Log(" delete file: " + p_thisPath + vName + err);
}
else
__Log("PSUEDO delete file: " + p_thisPath + vName + err);
}
}
}
@@ -262,7 +286,6 @@ function cleanup_temp()
//
// Main
//
var doDelete = false;
var tempFolder = "../../../temp/" + CustId + "/";
var cleanup_regexp_arr =
[ { expr_folder: "", max_checklevel: 9, expr_file: "^(?:log_"+CustId+"_)\\S+\\\.html$", keep: "d60"} // Alle log_CustId_*.html-bestanden in TEMP\CustId van meer dan 60 dagen oud verwijderen.
@@ -309,8 +332,10 @@ try
var sql = "BEGIN fac.initsession(NULL); END;";
var oRs = Oracle.Execute(sql)
__Log("Start cleanup_bijlagen")
cleanup_bijlagen();
__Log("Start cleanup_temp")
cleanup_temp();
}