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

Merge 2016.2 Gold A patches

Browse Source 
svn path=/Website/trunk/; revision=31158
This commit is contained in:
Jos Groot Lipman
2016-10-19 15:50:01 +00:00
parent 35c2f0aceb a86e965ee5
commit f1b5a16432
23 changed files with 424 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/FAC/fac.inc
View File

@@ -139,7 +139,7 @@ fac = { myfunctionssqlstring:
var fieldarr = [];
for (var j in pfieldstrarr)
{
fieldarr.push("REGEXP_LIKE(' ' || " + pfieldstrarr[j] + " || ' ', "+ safe.quoted_sql("(\\W" + conditions[i] + "\\W)") + ", 'i')");
fieldarr.push("REGEXP_LIKE(" + pfieldstrarr[j] + ", "+ safe.quoted_sql("(^|\\W)" + conditions[i] + "(\\W|$)") + ", 'i')");
}
resarr.push("(" + fieldarr.join(" OR ") + ")");
}
@@ -174,7 +174,7 @@ fac = { myfunctionssqlstring:
if (conditions[i].length)
{
if (wholeword) // REGEXP_LIKE(' ' || fac_faq_answer || ' ', '(\WMelding\W)', 'i')
resarr.push("REGEXP_LIKE(' ' || " + pfieldstr + " || ' ', "+ safe.quoted_sql("(\\W" + conditions[i] + "\\W)") + ", 'i')");
resarr.push("REGEXP_LIKE(" + pfieldstr + ", "+ safe.quoted_sql("(^|\\W)" + conditions[i] + "(\\W|$)") + ", 'i')");
else
resarr.push(pfieldstr+ " LIKE "+ safe.quoted_sql_wild("%"+conditions[i] + "%"));
}

12
APPL/FAC/fac_verify_data.asp
View File

@@ -301,6 +301,18 @@ checker("Controle: queries die geen records mogen opleveren",
+ " WHERE mld_melding_status NOT IN (1, 5, 6)"
+ " AND m.mld_melding_key != mld_melding_start_key)"
},
{ msg: "Workflows met verwijderde of vervallen standaardmeldingen",
sql: " SELECT mld_workflowstep_key,"
+ " mld_workflowstep_omschrijving,"
+ " ms.mld_stdmelding_omschrijving,"
+ " ms.mld_stdmelding_verwijder,"
+ " ms.mld_stdmelding_vervaldatum"
+ " FROM mld_workflowstep mws, mld_stdmelding ms"
+ " WHERE mws.mld_stdmelding_key = ms.mld_stdmelding_key"
+ " AND (ms.mld_stdmelding_verwijder IS NOT NULL"
+ " OR ms.mld_stdmelding_vervaldatum IS NOT NULL)"
+ "ORDER BY mld_workflowstep_key"
},
{ msg: "Opdrachten waar statusveld leeg is",
sql: " SELECT mld_melding_key, mld_opdr_key"
+ " FROM mld_opdr"

7
APPL/INS/ins.inc
View File

@@ -698,6 +698,7 @@ ins = {checkAutLevel:
var boRs = Oracle.Execute(bsql);
var add = boRs("aantal").Value > 0;
iresult.hasAnyReadXcp = boRs("aantal").Value > 0 && iresult.canRead("WEB_INSMAN"); // Enige rechten om exceptions (xcp) waarden te lezen.
boRs.close();
// Nu schrijven.
var bsql = "SELECT COUNT(*) aantal"
@@ -1777,11 +1778,11 @@ ins = {checkAutLevel:
else if (inspSoon) // Binnenkort is aangevinkt.
{
if (dtsoonfrom != null && dtsoonto != null) // Binnenkort.
sql = "SELECT * FROM (" + sql + ") x WHERE inspectie_next BETWEEN " + dtsoonfrom.toSQL(true) + " AND " + dtsoonto.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "");
sql = "SELECT * FROM (" + sql + ") x WHERE ins_deelsrtcontrole_plandatum BETWEEN " + dtsoonfrom.toSQL(true) + " AND " + dtsoonto.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "");
else if (dtsoonfrom == null && dtsoonto != null) // Te laat + binnenkort.
sql = "SELECT * FROM (" + sql + ") x WHERE inspectie_next < " + dtsoonto.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "");
sql = "SELECT * FROM (" + sql + ") x WHERE ins_deelsrtcontrole_plandatum < " + dtsoonto.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "");
else if (dtsoonfrom != null && dtsoonto == null) // Binnenkort + toekomst.
sql = "SELECT * FROM (" + sql + ") x WHERE inspectie_next >= " + dtsoonfrom.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "");
sql = "SELECT * FROM (" + sql + ") x WHERE ins_deelsrtcontrole_plandatum >= " + dtsoonfrom.toSQL(true) + (sqlBC != ''? " OR " + sqlBC : "");
else if (dtsoonfrom == null && dtsoonto == null)
sql = "SELECT * FROM (" + sql + ") x WHERE 1 = 1"; // Alles tonen onafhankelijk van sqlBC.
}

16
APPL/INS/ins_list.inc
View File

@@ -476,17 +476,26 @@ function ins_list (pautfunction, params)
var istatus = oRs("ins_deelsrtcontrole_status").Value != null? oRs("ins_deelsrtcontrole_status").Value : -1;
if (inspDone) return lclass;
var dt = new Date(oRs("inspectie_next").Value);
var ins_deelsrtcontrole_plandatum = oRs("ins_deelsrtcontrole_plandatum").Value;
if (ins_deelsrtcontrole_plandatum == null)
var dt = new Date(oRs("inspectie_next").Value);
else
var dt = new Date(oRs("ins_deelsrtcontrole_plandatum").Value);
dt.setHours(0,0,0,0); // trunc datum
var dtsoon = new Date;
dtsoon.setDate(dtsoon.getDate() + S("ins_inspect_soon_days"));
dtsoon.setHours(0,0,0,0); // trunc datum
var dtlate = new Date(new Date().setHours(0,0,0,0));
if (dt >= dtsoon)
// Als het een eerste controle(1) is, dan staat "Onbekend/Undetermined" in beeld. Dan ook rood weergeven.
var nonext = oRs("nonext").Value == 1;
var ctr_controle_type = oRs("ctr_controle_type").Value;
var undetermined = (nonext && ctr_controle_type == 1); // Eerste Controle(1).
if (dt >= dtsoon && !undetermined)
return lclass; // meer dan S("ins_inspect_soon_days") dagen in de toekomst
if (dt >= dtlate)
if (dt >= dtlate && !undetermined)
return lclass + " expired1"; // Binnenkort
return lclass + " expired2"; // Te laat
@@ -627,6 +636,7 @@ function ins_list (pautfunction, params)
var nonext = oRs("nonext").Value == 1;
if (nonext)
{ // Er is nog geen inspectie geweest. Eerste controle moet nog plaatsvinden.
// 1: Controle, 2: Vervanging, 3: Certificering.
switch (oRs("ctr_controle_type").Value)
{
case 1: { txt = L("lcl_ins_controle_first"); break; } // Eerste controle.

2
APPL/MGT/workflow_graph_png.asp
View File

@@ -29,6 +29,8 @@ DOCTYPE_Disable = 1;
{
var step = xxx_data[s];
var to = step.id;
if (!step.stdmelding.name)
step.stdmelding.name = "<<not found>>"; // vervallen of verwijderd. Eigenlijk not-supported configuratie
chl.push("WS_"+to+ " [ shape=box fontsize=12 label=\"{0}\"]".format(step.stdmelding.name.replace(/\//g, "/\\n")));
if (step.rules)

4
APPL/MJB/mjb_dragdropyear.asp
View File

@@ -50,7 +50,7 @@ if (ctrdisc_key > 0)
<form id="dragdropyearsform" name="dragdropyearsform" action="mld_close_save.asp?x=x" method="post">
<%
BLOCK_START("mldDragDropYears", L("lcl_mjb_dragdrop_year"));
BLOCK_START("mldDragDropYears", L("lcl_shared_needed_info"));
//RWFIELDTR("dragdropyear", "fld", L("lcl_mjb_years"), "", { required: true, datatype: "number" })
var jaar = new Date().getFullYear();
var sqljaren = [];
@@ -60,7 +60,7 @@ if (ctrdisc_key > 0)
FCLTselector("dragdropyear",
sqljaren.join(" UNION "),
{ initKey: jaar + 5,
label: L("lcl_mjb_years")
label: L("lcl_mld_year")
});
BLOCK_END();

9
APPL/MJB/mjb_search_list.asp
View File

@@ -224,8 +224,8 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
mjbSrtContrKeyArray.push(rowdata.insSrtControleKey);
}
url = "../mjb/mjb_dragdropyear.asp?ctrdisc_key=" + ctrdisc_key;
FcltMgr.openModalDetail(url, L("lcl_mjb_dragdrop_years"), {callback: dragDropCallback});
url = "../mjb/mjb_dragdropyear.asp?ctrdisc_key=<%=ctrdisc_key%>";
FcltMgr.openModalDetail(url, L("lcl_mjb_dragdrop"), {callback: dragDropCallback});
}
</script>
<%
@@ -699,10 +699,9 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
.format(oRs("ins_deel_key").Value,
oRs("ins_srtcontrole_key").Value,
safe.jsstring(oRs("ins_deel_omschrijving").Value));
return "<span class='details' title='{2}' onclick='{0}'>{1}</span>"
return "<span class='details' onclick='{0}'>{1}</span>"
.format(safe.htmlattr(fncall),
safe.html(oRs("ins_srtcontrole_omschrijving").Value),
safe.htmlattr(L("lcl_details")));
safe.html(oRs("ins_srtcontrole_omschrijving").Value));
}
else
return safe.html(oRs("ins_srtcontrole_omschrijving").Value);

30
APPL/MLD/mld_edit_melding_save.asp
View File

@@ -537,19 +537,23 @@ if (savemode)
+ " WHERE m.mld_srtkenmerk_key = t.mld_srtkenmerk_key"
+ " AND m.mld_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
var flextrack =
saveFlexKenmerken(mld_key, { kenmerkTable: "mld_kenmerkmelding",
kenmerkParentKey : "mld_melding_key",
kenmerkWaarde: "mld_kenmerkmelding_waarde",
kenmerkKey: "mld_kenmerk_key",
currentKenmerkenSQL: currentKenmerkenSQL,
allKenmerkenSQL: allKenmerkenSQL,
requestQF: Request.Form,
isNew: isNew,
flexPath: "MLD/M",
tracking: true,
module: "MLD"
});
var flextrack = [];
if (isNew || this_mld.canFlexChange) // anders veel te riskant (FSN#38017)
{
var flextrack =
saveFlexKenmerken(mld_key, { kenmerkTable: "mld_kenmerkmelding",
kenmerkParentKey : "mld_melding_key",
kenmerkWaarde: "mld_kenmerkmelding_waarde",
kenmerkKey: "mld_kenmerk_key",
currentKenmerkenSQL: currentKenmerkenSQL,
allKenmerkenSQL: allKenmerkenSQL,
requestQF: Request.Form,
isNew: isNew,
flexPath: "MLD/M",
tracking: true,
module: "MLD"
});
}
var doneParams = { mld_key : mld_key, autoprint: false, warning: "", autoorder: autoorder, success: true };

1
APPL/PDA/melding_new.asp
View File

@@ -172,7 +172,6 @@ if (srtdisc_key > 0)
, asideColumn: S("mld_selector_mode")==1?"ins_discipline_omschrijving":null
, ID: "factable"
, showAll: true
, noSearch: true /* visually disturbing */
, emptySetString: L("lcl_empty")
});
}

6
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -902,7 +902,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
if (isNaN(act_key) || act_key<0) act_key = -1;
var s = "load_kenmerk.asp?urole=<%=urole%>&act_key=" + act_key + "<%=(serie?"&serie=1":"")%>&act_change=1";
s += "&rsv_ruimte_key=<%=rsv_ruimte_key%>";
s += "&readofe="+(<%=rsv_ruimte_key%>==-1 ? 0 : 1);
s += "&readofe=<%=readonlyFE?1:0%>";
$("#resFlexList,#resFlex2List").load(s, function ()
{
@@ -1074,7 +1074,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
);
// Als meegeven dan is het readonly hierboven en moeten we het maar hidden oplossen.
if ((getQParamInt("activiteit_key", rrr.activiteit_key) > 0) || rrr.res_ruimte_extern || readonlyFE)
if ((getQParamInt("activiteit_key", -1) > 0) || rrr.res_ruimte_extern || readonlyFE)
{
oRs = Oracle.Execute(sql);
var resDuur = 0;
@@ -1527,7 +1527,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
defaults : rrr.flex_defaults, // pacta: { bsn: "12345678", plaats: "Enschede", postcode:"1234AB" }
rsv_ruimte_key : ((restype == "CV" && rsv_copy_key > -1) ? rsv_copy_key : rsv_ruimte_key), // ook bij 'ruimte erbij'
reado: false,
readofe: (rsv_ruimte_key == -1 ? true : readonlyFE),
readofe: readonlyFE,
flexcolumns: S("res_flexcolumns"),
hide: rrr.activiteit_key<0
});

19
APPL/RES/res_flexkenmerk.inc
View File

@@ -107,23 +107,16 @@ function generateFlexKenmerkBlock(params)
{ // Mag ik de kenmerken wijzigen?
if (reado) return true; // Als meegegeven dan altijd readonly
if (volgnummer < 100) // FO && BO
if (volgnummer < 100) // FO && BO altijd, FE alleen buiten de expire-tijden
{
var tmp_ro = !my_resrechten.canWrite("WEB_RESFOF") && !my_resrechten.canWrite("WEB_RESBOF");
if (rsv_ruimte_key == -1)
tmp_ro = tmp_ro && !my_resrechten.canWrite("WEB_RESUSE");
else
tmp_ro = tmp_ro && frontend;
return tmp_ro;
if (my_resrechten.canWrite("WEB_RESFOF") || my_resrechten.canWrite("WEB_RESBOF"))
return false; // die mogen altijd
return readofe; // als ik via de FE-uitzondering binnen ben wordt <100 readonly
}
else if (volgnummer >= 100 && volgnummer <= 800) // FE && FO && BO
{
var tmp_ro = !my_resrechten.canWrite("WEB_RESFOF") && !my_resrechten.canWrite("WEB_RESBOF");
if (rsv_ruimte_key == -1)
tmp_ro = tmp_ro && !my_resrechten.canWrite("WEB_RESUSE");
else
tmp_ro = !frontend && (tmp_ro || (!my_resrechten.canWrite("WEB_RESUSE") && !readofe));
return tmp_ro;
return false; // Zonder FE||FO||BO was je hier echt nooit gekomen
}
else if (volgnummer > 800 && volgnummer < 900) // FO
return !my_resrechten.canWrite("WEB_RESFOF");

168
APPL/RES/res_list_ppi.inc
View File

@@ -148,91 +148,113 @@ function res_list_ppi(pautfunction, params)
if (room_key_arr)
sql_room_key = " AND beschik.res_discipline_key IN (" + room_key_arr.join(",") + ")";
// leuke functie om voor alle uren een resultaat op te leveren
// zie res_list_ppi.inc;7 voor wat er gegenereerd wordt
settings.overrule_setting("res_rap_t1", S("res_rap_t1") >= 0 ? S("res_rap_t1") : S("res_t1"));
settings.overrule_setting("res_rap_t2", S("res_rap_t2") >= 0 ? S("res_rap_t2") : S("res_t2"));
// Leuke functie om voor alle uren een resultaat op te leveren.
// Zie res_list_ppi.inc;7 voor wat er gegenereerd wordt.
var rap_t1_overruled = S("res_rap_t1") < 0;
var rap_t2_overruled = S("res_rap_t2") < 0;
settings.overrule_setting("res_rap_t1", rap_t1_overruled? S("res_t1") : S("res_rap_t1"));
settings.overrule_setting("res_rap_t2", rap_t2_overruled? S("res_t2") : S("res_rap_t2"));
function forhours(fn)
{
var i;
var res = []
for (i = S("res_rap_t1"); i < S("res_rap_t2"); i++)
// Wel met hele uren rekenen, anders geeft dat hier problemen.
for (i = Math.floor(S("res_rap_t1")); i < Math.floor(S("res_rap_t2") + 0.6); i++)
res.push(fn.call(null, i));
return res;
}
//__Log(forhours(function (h) { return String(h); }));
var sql = " SELECT beschik.alg_ruimte_key"
+ ", beschik.res_discipline_key"
+ " , beschik.res_discipline_key"
+ (dayschedule
? "," + forhours(function (h) { return "b" + String(h); })
: ", ROUND(bezetting,2) bezetting")
+ ", ROUND(beschikbaar,2) beschikbaar"
+ ", di.alg_regio_key"
+ ", l.alg_district_key"
+ ", l.alg_locatie_key"
+ ", alg_gebouw_key"
+ ", alg_verdieping_key"
? " ," + forhours(function (h) { return "b" + String(h); })
: " , ROUND(bezetting,2) bezetting")
+ " , ROUND(beschikbaar,2) beschikbaar"
+ " , di.alg_regio_key"
+ " , l.alg_district_key"
+ " , l.alg_locatie_key"
+ " , alg_gebouw_key"
+ " , alg_verdieping_key"
+ " FROM (SELECT alg_ruimte_key"
+ ", rarg.res_discipline_key"
+ (dayschedule ? ("," + forhours(function (h) { return " SUM(n" + String(h) + ") b" + String(h); }))
: ", SUM(GREATEST(LEAST(to_number(TO_CHAR(res_rsv_ruimte_tot, 'SSSSS')) / 3600, COALESCE(res_ruimte_eindtijd, " + S("res_t2") + ")," + S("res_rap_t2") + "),"+S("res_rap_t1")+")"
+ " - LEAST(GREATEST(to_number(TO_CHAR(res_rsv_ruimte_van, 'SSSSS')) / 3600, COALESCE(res_ruimte_begintijd, " + S("res_t1") + ")," + S("res_rap_t1") + "),"+ S("res_rap_t2") +")) bezetting")
+ " FROM ("
+ " SELECT r.res_rsv_ruimte_key"
+ ", ra.alg_ruimte_key"
+ ", ra.res_alg_ruimte_key"
+ ", rr.res_discipline_key"
+ " , rarg.res_discipline_key"
+ (dayschedule
? (" ," + forhours(function (h) { return " SUM(n" + String(h) + ") b" + String(h); }))
: " , SUM(GREATEST(LEAST(to_number(TO_CHAR(res_rsv_ruimte_tot, 'SSSSS')) / 3600"
+ " , COALESCE(res_ruimte_eindtijd, " + S("res_t2") + ")"
+ " ," + S("res_rap_t2")
+ " )"
+ " ," + (rap_t1_overruled? 0 : S("res_rap_t1")) // Als res_rap_t1 overruled is (geen waarde had) dan GREATEST automatisch 1-ste waarde te laten kiezen.
+ " )"
+ " - LEAST(GREATEST(to_number(TO_CHAR(res_rsv_ruimte_van, 'SSSSS')) / 3600"
+ " , COALESCE(res_ruimte_begintijd, " + S("res_t1") + ")"
+ " ," + S("res_rap_t1")
+ " )"
+ " ," + (rap_t2_overruled? 24 : S("res_rap_t2")) // Als res_rap_t2 overruled is (geen waarde had) dan LEAST automatisch 1-ste waarde te laten kiezen.
+ " )"
+ " ) bezetting")
+ " FROM (SELECT r.res_rsv_ruimte_key"
+ " , ra.alg_ruimte_key"
+ " , ra.res_alg_ruimte_key"
+ " , rr.res_discipline_key"
+ (dayschedule
? " ," + forhours(function (h) { return "r.n" + String(h); })
: "")
+ " , r.res_rsv_ruimte_van"
+ " , r.res_rsv_ruimte_tot"
+ " , ra.res_alg_ruimte_aanmaak"
+ " , ra.res_alg_ruimte_verwijder"
+ " , rr.res_ruimte_begintijd"
+ " , rr.res_ruimte_eindtijd"
+ " FROM "
+ (dayschedule
? " res_v_res_dag_bezetting r"
: " res_rsv_ruimte r")
+ " , res_ruimte_opstelling ro"
+ " , res_ruimte rr"
+ " , res_alg_ruimte ra"
+ " WHERE r.res_rsv_ruimte_verwijder IS NULL"
+ " AND r.res_status_fo_key IN (1, 2)"
+ " AND r.res_ruimte_opstel_key = ro.res_ruimte_opstel_key"
+ " AND ro.res_ruimte_key = rr.res_ruimte_key"
+ " AND rr.res_ruimte_key = ra.res_ruimte_key) rarg"
+ " WHERE res_rsv_ruimte_van BETWEEN " + ora_date3 + " AND " + ora_date4
+ " AND TO_CHAR(res_rsv_ruimte_van, 'd') >= 2" // --veronderstelt NLS_TERRITORY='AMERICA', 2 is maandag
+ " AND TO_CHAR(res_rsv_ruimte_van, 'd') <= 6"
+ " AND TRUNC(res_rsv_ruimte_van) NOT IN (SELECT mld_vrije_dagen_datum FROM mld_vrije_dagen)"
+ " AND rarg.res_alg_ruimte_aanmaak <= " + ora_date2
+ " AND (rarg.res_alg_ruimte_verwijder IS NULL"
+ " OR rarg.res_alg_ruimte_verwijder >= " + ora_date1 + ")"
+ " GROUP BY alg_ruimte_key"
+ " , rarg.res_discipline_key) bez"
+ " , (SELECT DISTINCT rr1.res_discipline_key"
+ " , ra.alg_ruimte_key"
+ " , ((fac.Count_Work_Days(" + ora_date1 + "-1 , " + ora_date2 + "))"
+ (dayschedule
? "," + forhours(function (h) { return "r.n" + String(h); })
: "")
+ ", r.res_rsv_ruimte_van"
+ ", r.res_rsv_ruimte_tot"
+ ", ra.res_alg_ruimte_aanmaak"
+ ", ra.res_alg_ruimte_verwijder"
+ ", rr.res_ruimte_begintijd"
+ ", rr.res_ruimte_eindtijd"
+ " FROM "
+ (dayschedule
? "res_v_res_dag_bezetting r"
: "res_rsv_ruimte r")
+ ", res_ruimte_opstelling ro"
+ ", res_ruimte rr"
+ ", res_alg_ruimte ra"
+ " WHERE r.res_rsv_ruimte_verwijder IS NULL"
+ " AND r.res_status_fo_key IN (1, 2)"
+ " AND r.res_ruimte_opstel_key = ro.res_ruimte_opstel_key"
+ " AND ro.res_ruimte_key = rr.res_ruimte_key"
+ " AND rr.res_ruimte_key = ra.res_ruimte_key) rarg"
+ " WHERE res_rsv_ruimte_van BETWEEN " + ora_date3 + " AND " + ora_date4
+ " AND TO_CHAR(res_rsv_ruimte_van, 'd') >= 2" // --veronderstelt NLS_TERRITORY='AMERICA', 2 is maandag
+ " AND TO_CHAR(res_rsv_ruimte_van, 'd') <= 6"
+ " AND TRUNC(res_rsv_ruimte_van) NOT IN (SELECT mld_vrije_dagen_datum FROM mld_vrije_dagen)"
+ " AND rarg.res_alg_ruimte_aanmaak <= " + ora_date2
+ " AND (rarg.res_alg_ruimte_verwijder IS NULL"
+ " OR rarg.res_alg_ruimte_verwijder >= " + ora_date1 + ")"
+ " GROUP BY alg_ruimte_key"
+ ", rarg.res_discipline_key) bez"
+ ", (SELECT DISTINCT rr1.res_discipline_key"
+ ", ra.alg_ruimte_key"
+ ", ((fac.Count_Work_Days(" + ora_date1 + "-1 , " + ora_date2 + "))"
+ (dayschedule
? ""
: " * (LEAST(COALESCE(rr1.res_ruimte_eindtijd, " + S("res_t2") + ")," + S("res_rap_t2") + ") - GREATEST(COALESCE(rr1.res_ruimte_begintijd, " + S("res_t1") + ")," + S("res_rap_t1") + ")") + ")) beschikbaar"
+ " FROM res_ruimte rr1, res_alg_ruimte ra "
+ " WHERE rr1.res_ruimte_key = ra.res_ruimte_key "
+ " AND ra.res_alg_ruimte_aanmaak <= " + ora_date2
+ " AND ( ra.res_alg_ruimte_verwijder IS NULL "
+ " OR ra.res_alg_ruimte_verwijder >= " + ora_date1 + ")) beschik"
+ ", alg_v_ruimte_gegevens_all ruimte_geg"
+ ", alg_locatie l"
+ ", alg_district di"
? ""
: " * (LEAST(COALESCE(rr1.res_ruimte_eindtijd, " + S("res_t2") + ")"
+ " ," + (rap_t2_overruled? 24 : S("res_rap_t2")) // Als res_rap_t2 overruled is (geen waarde had) dan LEAST automatisch 1-ste waarde te laten kiezen.
+ " )"
+ " - GREATEST(COALESCE(rr1.res_ruimte_begintijd, " + S("res_t1") + ")"
+ " ," + (rap_t1_overruled? 0 : S("res_rap_t1")) // Als res_rap_t1 overruled is (geen waarde had) dan GREATEST automatisch 1-ste waarde te laten kiezen.
+ " )"
+ " )")
+ " ) beschikbaar"
+ " FROM res_ruimte rr1"
+ " , res_alg_ruimte ra"
+ " WHERE rr1.res_ruimte_key = ra.res_ruimte_key"
+ " AND ra.res_alg_ruimte_aanmaak <= " + ora_date2
+ " AND (ra.res_alg_ruimte_verwijder IS NULL"
+ " OR ra.res_alg_ruimte_verwijder >= " + ora_date1 + ")) beschik"
+ " , alg_v_ruimte_gegevens_all ruimte_geg"
+ " , alg_locatie l"
+ " , alg_district di"
+ " WHERE beschik.alg_ruimte_key = bez.alg_ruimte_key(+)"
+ " AND beschik.res_discipline_key = bez.res_discipline_key(+)"
+ " AND beschik.alg_ruimte_key = ruimte_geg.alg_ruimte_key"
+ " AND ruimte_geg.alg_locatie_key = l.alg_locatie_key"
+ " AND l.alg_district_key = di.alg_district_key"
+ " AND beschik.res_discipline_key = bez.res_discipline_key(+)"
+ " AND beschik.alg_ruimte_key = ruimte_geg.alg_ruimte_key"
+ " AND ruimte_geg.alg_locatie_key = l.alg_locatie_key"
+ " AND l.alg_district_key = di.alg_district_key"
+ sql_room_key
+ sql_dis
+ sql_loc
@@ -655,13 +677,13 @@ function forhours(fn)
if (res_rap_t1h < 10) res_rap_t1h = "0" + res_rap_t1h;
var res_rap_t1m = Math.floor((S("res_rap_t1") - res_rap_t1h)*60);
if (res_rap_t1m < 10) res_rap_t1m = "0" + res_rap_t1m;
var res_rap_t1s = res_rap_t1h+ ":" + res_rap_t1m
var res_rap_t1s = res_rap_t1h + ":" + res_rap_t1m
var res_rap_t2h = Math.floor(S("res_rap_t2"));
if (res_rap_t2h < 10) res_rap_t2h = "0" + res_rap_t2h;
var res_rap_t2m = Math.floor((S("res_rap_t2") - res_rap_t2h)*60);
if (res_rap_t2m < 10) res_rap_t2m = "0" + res_rap_t2m;
var res_rap_t2s = res_rap_t2h+ ":" + res_rap_t2m
var res_rap_t2s = res_rap_t2h + ":" + res_rap_t2m
var doTotals = (groupres != 16 && groupres != 18 && groupres != 19)
@@ -672,7 +694,7 @@ function forhours(fn)
totalShow: (doTotals ? fntotalShow : null),
filterParams: params,
outputmode: outputmode,
title: L("lcl_res_PPI_title")+" "+L("lcl_res_PPI_fromto").format(res_rap_t1s, res_rap_t2s) ,
title: L("lcl_res_PPI_title") + " " + L("lcl_res_PPI_fromto").format(res_rap_t1s, res_rap_t2s),
showAll: showall
});

28
APPL/Shared/LogOff.asp
View File

@@ -15,25 +15,15 @@ var JSON_Result = true;
<%
protectRequest.validateToken();
var result = { success: true,
return_url: S("logoff_return_url")
};
var result = { success: true };
// FACFAC tracken we altijd
if (user.has("WEB_FACFAC"))
shared.trackaction("PRSLOG", user_key, L("lcl_logged_off").format(Session("ASPFIXATION").slice(-6)));
if (Session("idp_key") > 0)
{
var sql = "SELECT fac_idp_remote_logouturl"
+ " FROM fac_idp"
+ " WHERE fac_idp_key = " + Session("idp_key");
var oRs = Oracle.Execute(sql);
if (oRs("fac_idp_remote_logouturl").Value)
result.return_url = oRs("fac_idp_remote_logouturl").Value;
}
if (Session("org_user_key") > 0)
{
result.return_url = rooturl + "/";
var was_key = user_key;
var other_key = parseInt(Session("org_user_key"), 10);
var other_naam = user.naam();
@@ -46,6 +36,18 @@ if (Session("org_user_key") > 0)
}
else
{
result.return_url = S("logoff_return_url");
if (Session("idp_key") > 0)
{
var sql = "SELECT fac_idp_remote_logouturl"
+ " FROM fac_idp"
+ " WHERE fac_idp_key = " + Session("idp_key");
var oRs = Oracle.Execute(sql);
if (oRs("fac_idp_remote_logouturl").Value)
result.return_url = oRs("fac_idp_remote_logouturl").Value;
oRs.Close();
}
doLogoff();
}
Response.Write(JSON.stringify(result));

2
APPL/Shared/resultset_flex.inc
View File

@@ -357,7 +357,7 @@ function getSqlFlex(flexModule, flexId, flexParams)
+ " WHERE sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key"
+ " AND km.mld_kenmerk_key = k.mld_kenmerk_key"
+ " AND sk.mld_srtkenmerk_verwijder IS NULL"
+ (flexParams && (flexParams.readuse || flexparams.readman)? " AND k.mld_kenmerk_volgnummer < 800":"");
+ (flexParams && (flexParams.readuse || flexParams.readman)? " AND k.mld_kenmerk_volgnummer < 800":"");
break;
}

2
CUST/AAIT/export/gen_export_exact_dekking.bat
View File

@@ -34,8 +34,10 @@ call ..\..\..\utils\gen_export\gen_export.bat AAPM_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat AARW_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat AASA_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat AASI_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat AAVG_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat AAVL_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat AAZC_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat ASMS_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat NMMS_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat RABO_DEKKING
call ..\..\..\utils\gen_export\gen_export.bat ZKHM_DEKKING

10
CUST/HSLE/xsl/cust.xsl
View File

@@ -1255,7 +1255,7 @@
</td>
</tr>
<tr>
<td class="tekst">Datum:</td><td class="tekst" colspan="3"><xsl:value-of select="einddatum/datum"/></td>
<td class="tekst" align="left" style="width:25%">Datum:</td><td class="tekst" colspan="3" align="right"><xsl:value-of select="einddatum/datum"/></td>
</tr>
<tr>
<td class="tekst">Naam evenement:</td><td class="tekst" colspan="3"><xsl:value-of select="kenmerk[@naam='Naam evenement']"/></td>
@@ -1264,8 +1264,14 @@
<td class="tekst">Aantal personen:</td><td class="tekst" colspan="3"><xsl:value-of select="kenmerk[@naam='Aantal personen']"/></td>
</tr>
<tr>
<td class="tekst" style="padding-bottom:20px;">Voorkeursruimte:</td><td class="tekst" colspan="3" style="padding-bottom:20px;"><xsl:value-of select="kenmerk[@naam='Voorkeursruimte']"/></td>
<td class="tekst">Voorkeursruimte:</td><td class="tekst" colspan="3"><xsl:value-of select="kenmerk[@naam='Voorkeursruimte']"/></td>
</tr>
<tr>
<td class="tekst">Naam:</td><td class="tekst" colspan="3"><xsl:value-of select="voor/naam_full"/></td>
</tr>
<tr>
<td class="tekst" style="padding-bottom:20px;">Kostenplaats:</td><td class="tekst" colspan="3" style="padding-bottom:20px;"><xsl:value-of select="kostenplaats/nr"/></td>
</tr>
<tr>
<td class="tekst" colspan="4"><b>Programma</b></td>
</tr>

10
CUST/PCHE/xsl/cust.xsl
View File

@@ -60,8 +60,12 @@
<td colSpan="9" class="factuur">
<xsl:value-of select="bedrijf/naam"/>
<br/>
<xsl:if test="bedrijf/contact != ''">
<xsl:value-of select="bedrijf/contact"/>
<xsl:if test="bedrijf/contact_persoon != ''">
<xsl:value-of select="bedrijf/contact_persoon"/>
<br/>
</xsl:if>
<xsl:if test="bedrijf/kenmerk[@key=1060] != ''">
<xsl:value-of select="bedrijf/kenmerk[@key=1060]"/>
<br/>
</xsl:if>
<xsl:value-of select="bedrijf/post_adres"/>
@@ -335,4 +339,4 @@ Hierbij ontvangt u de factuur voor uw waardekaarten die besteld zijn via ons sys
</html>
</xsl:template>
</xsl:stylesheet><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. -->
</xsl:stylesheet><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. -->

5
CUST/PNBR/cust.css
View File

@@ -55,7 +55,10 @@ div#PersFAC ul li span.menukop, div#ProfFAC ul li span.menukop {
#facforum .ui-state-default a:link {color: #000000;
}
span.notetoggler {
span.notetoggler, span.rsTruncmore {
font-weight: bold;
}
span.notetoggler {
color: #333;
}

27
CUST/RABO/export/gen_export_status_axxerion.bat Normal file
View File

@@ -0,0 +1,27 @@
REM GEN_EXPORT_STATUS_AXXERION.BAT
REM
REM Maakt bestand met statuswijzigingen aan. Indien het bestand gevuld
REM is wordt het bestand op de FTP server geplaatst.
REM
REM Context : roep deze file aan indien nodig, of schedule deze
REM Verseist: de randvoorwaarde voor het gebruik van gen_export
REM
REM $Revision$
REM $Id$
REM
REM (c) 2009, SG facilitor, +31 (53) 4800710, helpdesk@sgfacilitor.nl
REM
CALL ..\..\..\utils\gen_export\gen_export.bat STATUS_AXXERION
REM ================================================== delete empty file(s)
cd axxerion
for %%A in (*.xml) do if %%~zA==0 del %%A
cd ..
move .\AXXERION\status*.xml d:\Apps\Facilitor\ftp_sites\RABO\status\

55
CUST/RABO/import/RaboAxxerion.xsl Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
<xsl:output method="xml" indent="yes" encoding="utf-8" />
<xsl:decimal-format name="european" decimal-separator="," grouping-separator="." />
<xsl:param name="mode" />
<xsl:variable name="Rev">
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)" />
</xsl:variable>
<xsl:template match="facilitor">
<facilitor>
<xsl:for-each select="meldingen">
<xsl:for-each select="melding">
<xsl:choose>
<xsl:when test="@type='response'">
<xsl:copy-of select="."/>
</xsl:when>
<xsl:otherwise>
<xsl:element name="melding">
<xsl:attribute name="key">
<xsl:value-of select="@key"/></xsl:attribute>
<xsl:attribute name="type">insert</xsl:attribute>
<datum><xsl:value-of select="concat(substring(datum,7,4), '-', substring(datum,4,2), '-', substring(datum,1,2), 'T', substring(datum,12,5))"/></datum>
<melder>
<xsl:value-of select="melder"/>
</melder>
<locatiecode>
<xsl:value-of select="substring-after(substring-before(locatie, ' '), 'PR')"/>
</locatiecode>
<stdmelding>501</stdmelding>
<omschrijving>
Melder: <xsl:value-of select="melder"/>
Organisatie: <xsl:value-of select="organisatie"/>
Telefoonnummer: <xsl:value-of select="telefoonnummer"/>
Emailadres: <xsl:value-of select="emaildadres"/>
Kwis: <xsl:value-of select="kwis"/>
Vakgroep: <xsl:value-of select="vakgroep"/>
Melding: <xsl:value-of select="stdmelding1"/>
Melding2: <xsl:value-of select="stdmelding2"/>
Onderwerp: <xsl:value-of select="onderwerp"/>
Omschrijving: <xsl:value-of select="omschrijving"/>
Locatie: <xsl:value-of select="locatie"/>
Ruimte: <xsl:value-of select="ruimte"/>
Prioriteit: <xsl:value-of select="prioriteit"/>
SLA datum: <xsl:value-of select="sla_datum"/>
Inventaris: <xsl:value-of select="inventaris"/>
</omschrijving>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:for-each>
</facilitor>
</xsl:template>
</xsl:stylesheet>
<!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. --><!-- Stylesheet edited using Stylus Studio - (c) 2004-2007. Progress Software Corporation. All rights reserved. -->

115
CUST/RABO/import/api_mldsoap_axxerion.js Normal file
View File

@@ -0,0 +1,115 @@
// GetStatus.js
// Haalt statuswijzigingen op van de FTP server.
//
// $Revision$
// $Id$
//
// Opzet in kader van PNBR#
function padout(number) { return (number < 10) ? "0" + number : number; }
function date2string(mydate) {
return padout(mydate.getFullYear()) + "-" + padout(mydate.getMonth() + 1) + "-" + padout(mydate.getDate())
+ " " + padout(mydate.getHours()) + "-" + padout(mydate.getMinutes() + 1) + "-" + padout(mydate.getSeconds());
}
var api = WScript.Arguments(0); // api
var folder = WScript.Arguments(1); // folder
var url = WScript.Arguments(2); // url
try {
var fh, lenght;
fso = new ActiveXObject("Scripting.FileSystemObject");
objRS = new ActiveXObject("ADODB.Recordset");
objRS.CursorLocation = 3 // useClient
objRS.Fields.Append ("Name", 200, 100) // adVarChar
objRS.Fields.Append ("created", 7 ) // adDate
objRS.Open();
try
{
var backdir_api = ".\\BACKUP"+(new Date).getFullYear()+"\\";
if (!fso.FolderExists(backdir_api))
fso.CreateFolder(backdir_api);
backdir_api += api + "\\";
if (!fso.FolderExists(backdir_api))
fso.CreateFolder(backdir_api);
}
catch (e)
{
WScript.Echo("Cannot create backup folder " + backDir + "\n" + e.description);
WScript.Quit();
}
// plaats de bestandsnamen en creatiedata in een resultset om deze vervolgens te kunnen filteren.
folder = folder.replace(/\//g,"\\");
//WScript.Echo("Folder: " + folder);
var f = fso.GetFolder(folder);
var fc = new Enumerator(f.files);
var filecount = 0;
for (; !fc.atEnd(); fc.moveNext())
{
filename = fc.item().name;
//WScript.Echo("File: " + filename);
var file = fso.GetFile(folder + filename);
var dt = new Date(file.DateCreated);
//WScript.Echo("File: " + filename + " timestamp:" + date2string(dt));
if (fc.item().name.toUpperCase().indexOf(".XML") != -1 && fc.item().name.toUpperCase().indexOf("MELDING") != -1) {
filecount++;
objRS.AddNew();
objRS("Name") = filename;
objRS("created") = file.DateCreated;
}
}
if (filecount > 0) {
objRS.Sort = "created ASC";
objRS.MoveFirst();
while (!objRS.EOF)
{
filename = objRS("Name").Value;
WScript.Echo("File (sorted): " + filename);
objRS.MoveNext();
var fileStream = new ActiveXObject("ADODB.Stream");
fileStream.open();
fileStream.CharSet = "Windows-1252"; // het doel
fileStream.LoadFromFile(folder + filename);
//WScript.Echo("Filesize " + fileStream.Size);
fileStream.Position = 0;
//WScript.Echo("Request1: " + fileStream.ReadText);
XMLReq = fileStream.ReadText;
WScript.Echo("Request: " + XMLReq);
var objXMLHTTP = new ActiveXObject("MSXML2.ServerXMLHTTP.6.0");
objXMLHTTP.open("POST",
url
);
objXMLHTTP.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
objXMLHTTP.send(XMLReq);
//WScript.Echo("Status: " + objXMLHTTP.status);
//WScript.Echo("StatusText: " + objXMLHTTP.statusText);
WScript.Echo("Result: " + objXMLHTTP.responseText);
if (objXMLHTTP.status == 200) {
jsDate = new Date;
dateString = padout(jsDate.getFullYear()) + "-" + padout(jsDate.getMonth() + 1) + "-" + padout(jsDate.getDate());
timeString = padout(jsDate.getHours()) + "-" + padout(jsDate.getMinutes() + 1) + "-" + padout(jsDate.getSeconds());
backDir = backdir_api + dateString + "_" + api + "\\";
if (!fso.FolderExists(backDir))
fso.CreateFolder(backDir)
// deze file backuppen
//WScript.Echo("from:" + filename);
//WScript.Echo("to:" + backDir + timeString + "_" + filename);
fso.MoveFile(folder + filename, backDir + timeString + "_" + filename);
}
}
}
}
catch (e)
{
WScript.Echo("Serieuze fout in api_opdrsoap_com4.js: " + e.description)
WScript.Quit(1);
}

23
CUST/RABO/import/gen_import_mld_axxerion.bat Normal file
View File

@@ -0,0 +1,23 @@
REM GEN_IMPORT_MLD_AXXERION.BAT
REM
REM AAIT
REM
REM Importeert statusberichten vanuit een extern systeem
REM
REM Context : roep deze file aan indien nodig, of schedule deze
REM Verseist: de randvoorwaarde voor het gebruik van gen_import
REM
REM $Revision$
REM $Id$
REM
REM (c) 2010, SG|facilitor bv, +31 (53) 4800700, support@sgfacilitor.nl
REM
cscript .\api_mldsoap_axxerion.js MLD_AXXERION d:\Apps\Facilitor\ftp_sites\RABO\meldingen\ "https://rabo.facilitor.nl/default.asp?fac_id=RABO&API=MLD_AXXERION&APIKEY=EH-XITJvuCMmmQ6O9EqOr8Ed1mXHYooo" >>genimport.log 2>>&1
REM @Work
REM cscript .\api_mldsoap_axxerion.js MLD_AXXERION w:\Branch20161\CUST\RABO\import\ "http://facws001/branch20161/default.asp?fac_id=RABO&API=MLD_AXXERION&APIKEY=EH-XITJvuCMmmQ6O9EqOr8Ed1mXHYooo" >>genimport.log 2>>&1
:einde

11
CUST/UWVA/custfunctions.wsc
View File

@@ -375,11 +375,14 @@ function (prs_key, data)
var loc_key = -1;
for (wp in data.werkplekken)
{
if (!data.werkplekken[wp].prs_werkplek_aanduiding.isVirtueel && wp < 1) // pak er maar eentje, TODO hoofdwerkplek
if (!data.werkplekken[wp].isVirtueel && wp < 1) // pak er maar eentje, TODO hoofdwerkplek
{
txt += data.werkplekken[wp].prs_werkplek_aanduiding.substring(0,5)
+ ", etage "+ data.werkplekken[wp].prs_werkplek_aanduiding.substring(6,8)
+ ", kamer "+ data.werkplekken[wp].prs_werkplek_aanduiding.substring(9);
var wparr = data.werkplekken[wp].prs_werkplek_aanduiding.split("-");
txt += wparr[0];
if (wparr.length > 1)
txt += ", etage " + wparr[1];
if (wparr.length > 2)
txt += ", kamer " + wparr[2];
loc_key = data.werkplekken[wp].alg_locatie_key;
}