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

Merge 2015.2 patches

Browse Source 
svn path=/Website/trunk/; revision=30983
This commit is contained in:
Jos Groot Lipman
2016-10-05 13:04:19 +00:00
parent c11670320f 3348c7a66e
commit 7312065cfc
51 changed files with 505 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/API/api_gen_import.asp
View File

@@ -48,6 +48,7 @@
customerId: customerId,
keep_old: 300, // Parallelle import 300 seconden ondersteunen
user_key: user_key,
stylesheet: API.apidata.stylesheet,
keep_backup: true // mits fac_import_app_folder gezet
});
var import_key = res.import_key;

1
APPL/API2/model_ins_srtcontrole.inc
View File

@@ -143,6 +143,7 @@ function model_ins_srtcontrole()
"label": L("lcl_prs_kosten"),
"typ": "key",
"foreign": "prs_kostenplaats",
"foreignfiltercode": "A", // Alle kostenplaatsen tonen.
"filter": "exact"
},
"costs": {

2
APPL/API2/model_mld_workflowstep.inc
View File

@@ -83,6 +83,8 @@ function model_mld_workflowstep(mystart_key)
+ " from mld_stdmelding m"
+ " , mld_v_aanwezigdiscipline d"
+ " where m.mld_ins_discipline_key = d.ins_discipline_key"
+ " and (mld_stdmelding_vervaldatum IS NULL OR mld_stdmelding_vervaldatum > SYSDATE)"
+ " and m.mld_stdmelding_verwijder IS NULL"
+ " order by d.ins_discipline_omschrijving asc"
+ " , m.mld_stdmelding_omschrijving asc)",
"key": "mld_stdmelding_key",

8
APPL/CAD/rap_sle.asp
View File

@@ -27,11 +27,11 @@ if (floorKey != -1)
+ " " + S("prs_pers_string") + " bezitter, "
+ " ssle.ins_srtdeel_key"
+ " FROM ins_srtdeel_srtdeel ss,"
+ " ins_srtdeel ssle,"
+ " ins_deel sle,"
+ " ins_v_aanwezigsrtdeel ssle,"
+ " ins_v_aanwezigdeel sle,"
+ " prs_v_aanwezigperslid p,"
+ " ins_srtdeel scil,"
+ " ins_deel cil,"
+ " ins_v_aanwezigsrtdeel scil,"
+ " ins_v_aanwezigdeel cil,"
+ " alg_ruimte r "
+ " WHERE ss.ins_srtdeel_key_2 = ssle.ins_srtdeel_key "
+ " AND ssle.ins_srtdeel_key = sle.ins_srtdeel_key "

6
APPL/IMP/imp_shared.js
View File

@@ -31,6 +31,7 @@
// van de import file gemaakt onder fac_import_app_folder/BACKUP2015/....
// Merk op: vanuit gen_import.wsf wordt keep_backup *niet* gezet
// omdat gen_import.wsf (nog) zelf de backup maakt
// stylesheet: optionele overrule van de import-XSL-stylesheet
function impReadStream(fileStream, import_app_key, params)
{
params = params || {};
@@ -114,7 +115,10 @@ function impReadStream(fileStream, import_app_key, params)
var import_action = oRs("fac_import_app_action").value;
var procprefix = oRs("fac_import_app_prefix").value||"FAC";
var charset = oRs("fac_import_app_charset").value;
var xslfile = oRs("fac_import_app_xsl").value?params.fac_home + "CUST/" + params.customerId + "/" + oRs("fac_import_app_xsl").value:"";
if (params.stylesheet) // vanuit de API bv, die is sterker
var xslfile = params.fac_home + "CUST/" + params.customerId + "/" + params.stylesheet;
else
var xslfile = oRs("fac_import_app_xsl").value?params.fac_home + "CUST/" + params.customerId + "/" + oRs("fac_import_app_xsl").value:"";
var folder = oRs("fac_import_app_folder").Value;
oRs.Close();

1
APPL/INS/ins.inc
View File

@@ -513,6 +513,7 @@ ins = {checkAutLevel:
var readslebof = iresult.canRead("WEB_SLEBOF");
iresult.readslebof = readslebof;
iresult.canRead = readslebof; // Lezen
iresult.canReadAny = iresult.canRead;
var writeslebof = iresult.canWrite("WEB_SLEBOF");
var writeslefof = iresult.canWrite("WEB_SLEFOF");

4
APPL/INS/ins_edit_inspect.asp
View File

@@ -463,7 +463,7 @@ if (ins_key_arr.length == 1)
<input type="hidden" name="deelsrtcont_key" id="deelsrtcont_key" value="<%=ingeslotendsc[0]%>">
<% } %>
<input type="hidden" name="finish" id="finish" value="0">
<% var blocktext = (insPlan? L("lcl_ins_schedule") : (insClose? L("lcl_ins_close") + "/" + L("lcl_ins_finish") : L("lcl_details") ));
<% var blocktext = (insPlan? L("lcl_ins_schedule") : (insClose? L("lcl_ins_stop") : L("lcl_details") ));
BLOCK_START("insMultiEdit", blocktext);
if (ins_key_arr.length == 1)
{
@@ -633,7 +633,7 @@ if (ins_key_arr.length == 1)
if (insPlan || (insEdit && (insstatus == 0 || insstatus == 2)))
FCLTcalendar("plandatum",
{ label: L("lcl_opdr_plandate"),
{ label: L("lcl_ins_controle_plandate"),
datum: minDate > inspect_data.deelsrtcontrole_plandatum? minDate : inspect_data.deelsrtcontrole_plandatum,
trclass: "invoerinsp",
minDate: minDate,

35
APPL/INS/ins_inspect_list.asp
View File

@@ -245,7 +245,29 @@ var authparams = user.checkAutorisation("WEB_INSUSE");
+ " , di.ins_deel_aanmaak"
+ " , di.ins_deel_aantal"
+ " , idsc.ins_deelsrtcontrole_datum"
+ " , COALESCE(idsc.ins_deelsrtcontrole_plandatum, ins_deelsrtcontrole_datum_org) inspectie_org"
+ " , COALESCE(idsc.ins_deelsrtcontrole_plandatum"
+ " , CASE"
+ " WHEN idsc.ins_deelsrtcontrole_status = 2 AND idsc.ins_deelsrtcontrole_datum_org IS NULL" // Alle eerste inspectie.
+ " THEN fac.nextcyclusdate (COALESCE(" + lastinspect + ", di.ins_deel_aanmaak)"
+ " , di.ins_srtcontrole_mode"
+ " , di.ins_srtcontrole_eenheid"
+ " , di.ins_srtcontrole_periode"
+ " , di.ins_srtcontrole_bits"
+ " , CASE"
+ " WHEN di.ins_srtcontrole_mode = 1" // Interval modus
+ " THEN 1"
+ " WHEN di.ins_srtcontrole_eenheid = 0 AND"
+ " TRUNC (COALESCE (" + lastinspect + ", di.ins_deel_aanmaak), 'HH24' ) >= TRUNC (SYSDATE, 'HH24')"
+ " THEN 1" // Uurlijks: Als de datum in de toekomst ligt, bepaal dan de volgende datum (1 step verder).
+ " WHEN di.ins_srtcontrole_eenheid > 0 AND"
+ " TRUNC (COALESCE (" + lastinspect + ", di.ins_deel_aanmaak),'DDD') >= TRUNC (SYSDATE, 'DDD')"
+ " THEN 1" // Dagelijks t/m jaarlijks: Als de datum in de toekomst ligt, bepaal dan de volgende datum (1 step verder).
+ " WHEN " + lastinspect + " IS NULL"
+ " THEN 1" // Als Eerste inspectie, bepaal dan ook de volgende (1 step) datum.
+ " ELSE 0" // Vindt de eerste datum vandaag of in de toekomst
+ " END)"
+ " ELSE ins_deelsrtcontrole_datum_org"
+ " END) inspectie_org"
+ " , CASE WHEN idsc.ins_deelsrtcontrole_plandatum > idsc.ins_deelsrtcontrole_datum_org THEN 1 ELSE 0 END isrespijt"
+ " , NULL nonext"
+ " , CASE"
@@ -489,9 +511,12 @@ var authparams = user.checkAutorisation("WEB_INSUSE");
boRs.close();
var buttons = [{ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" }]
if (add)
buttons.push({ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openModalDetail('" + addurl_add + "', '" + L("lcl_add") + "', {callback: FcltMgr.reload })" })
buttons.push({ icon: "wijzigen.png", title: L("lcl_ins_change_xcp"), action: "FcltMgr.openModalDetail('" + addurl_editxcp + "', '" + L("lcl_ins_change_xcp") + "', {callback: FcltMgr.reload })" })
if (this_ins.canChangeXcp || this_ins.hasAnyWriteXcp)
{ // Het xcp scherm werkt erg slecht in readonly mode. Vooralsnog gewoon onderdrukken.
if (add)
buttons.push({ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openModalDetail('" + addurl_add + "', '" + L("lcl_add") + "', {callback: FcltMgr.reload })" })
buttons.push({ icon: "wijzigen.png", title: L("lcl_ins_change_xcp"), action: "FcltMgr.openModalDetail('" + addurl_editxcp + "', '" + L("lcl_ins_change_xcp") + "', {callback: FcltMgr.reload })" })
}
}
var rst = new ResultsetTable({ keyColumn: "ins_deel_key", //dummy
@@ -525,7 +550,7 @@ var authparams = user.checkAutorisation("WEB_INSUSE");
rst.addAction({ action: "insStart", caption: L("lcl_ins_start"), enabler: "eStartD", isDefault: true });
rst.addAction({ action: "insPlan", caption: L("lcl_ins_schedule"), enabler: "ePlan" });
rst.addAction({ action: "insStart", caption: L("lcl_ins_start"), enabler: "eStart" });
rst.addAction({ action: "insClose", caption: L("lcl_ins_close") + "/" + L("lcl_ins_finish"), enabler: "eClose" });
rst.addAction({ action: "insClose", caption: L("lcl_ins_stop"), enabler: "eClose" });
rst.addAction({ action: "insFinish", caption: L("lcl_ins_finish"), enabler: "eFinish" });
var cnt = rst.processResultset();

42
APPL/INS/ins_inspect_save.asp
View File

@@ -255,7 +255,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
}
ingesloten.push({ins_key: ins_key_arr[i], srtcont_key: srtcont_key_arr[i], dlsrtcont_key: dlsrtcont_key,
inspectiemode: ins_srtcontrole_mode, inspectiestatus: ins_deelsrtcontrole_status});
inspectiemode: ins_srtcontrole_mode, inspectiestatus: ins_deelsrtcontrole_status, ins_deel_aanmaak: ins_deel_aanmaak});
tobehandled++;
}
@@ -659,6 +659,46 @@ else if (savemode == "E")
}
//else Er zijn nog geen inspecties geweest voor dit object en er is nog geen plandatum voor dit object ingevuld.
// Volgende inspectiedatum kun je niet berekenen en is dus onbekend (leeg)
else
{ // Vindt het ins_srtcontrole_type.
var sql = "SELECT ctr_disc_params_controle_type"
+ " FROM ins_srtcontrole isc,"
+ " ctr_disc_params cdp"
+ " WHERE ins_srtcontrole_key = " + ingesloten[0].srtcont_key
+ " AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key";
var oRs = Oracle.Execute(sql);
var srtcontrole_type = oRs("ctr_disc_params_controle_type").Value;
oRs.Close();
var thisyear = (new Date()).getFullYear();
plandatum = getFParamDate("plandatum");
var plandatum_jaar = plandatum.getFullYear();
// Kunnen we het plan record verwijderen?
// De inspectiedatum voor taken die nog nooit een inspectie hebben gehad is voor een Vervanging(2) of Certificering(3)
// een periode verder dan de registratie/aanmaak datum van het object.
// Voor een controle is er geen inspectiedatum en wordt er dan altijd "Eerste controle" in beeld getoond.
// Ofwel een inspectie kun je direct vanaf het aanmaken van het object doen.
// Voor controles(1):
// - Als de planning in dit jaar is dan kan het inspectierecord verwijderd worden.
// Voor Vervanging(2) en Certificering(3):
// - inspectiedatum in het verleden of dit jaar: als de planning in dit jaar is, dan kan het inspectierecord verwijderd worden.
// - inspectiedatum in de toekomst: als de planning in hetzelfde jaar is als de inspectiedatum dan kan het inspectierecord verwijderd worden.
if (ismjob && isjaarlijks)
{
if (srtcontrole_type == 1 && plandatum_jaar == thisyear) // Controles(1).
mjobdelete = true;
else if (srtcontrole_type == 2 || srtcontrole_type == 3) // Vervanging(2) of Certificering(3).
{ // Bereken de volgende inspectiedatum.
sql = "SELECT ins.nextcyclusdate (" + ingesloten[0].ins_key + ", " + ingesloten[0].srtcont_key + ", 1) nextdate FROM DUAL"
oRs = Oracle.Execute(sql);
var nextdate = new Date(oRs("nextdate").Value);
var nexdate_jaar = nextdate.getFullYear();
if ((nexdate_jaar <= thisyear && plandatum_jaar == thisyear) ||
(nexdate_jaar > thisyear && plandatum_jaar == nexdate_jaar))
mjobdelete = true;
}
}
}
}
if (mjobdelete)

13
APPL/INS/ins_list.inc
View File

@@ -475,11 +475,6 @@ function ins_list (pautfunction, params)
var lclass = "";
var istatus = oRs("ins_deelsrtcontrole_status").Value != null? oRs("ins_deelsrtcontrole_status").Value : -1;
if (istatus == 2)
lclass = "pending";
if (istatus == 5)
lclass = "unsolved";
if (inspDone) return lclass;
var dt = new Date(oRs("inspectie_next").Value);
dt.setHours(0,0,0,0); // trunc datum
@@ -853,7 +848,7 @@ function ins_list (pautfunction, params)
rst.addAction({ action: "insShowInsp", caption: L("lcl_change"), enabler: "eShowInsp" });
rst.addAction({ action: "insPlan", caption: L("lcl_ins_schedule"), multi: !tiny, multiOnce: true, enabler: "ePlan" });
rst.addAction({ action: "insStart", caption: L("lcl_ins_start"), multi: !tiny, multiOnce: true, enabler: "eStart" });
rst.addAction({ action: "insClose", caption: L("lcl_ins_close") + "/" + L("lcl_ins_finish"), multi: !tiny, multiOnce: true, enabler: "eClose" });
rst.addAction({ action: "insClose", caption: L("lcl_ins_stop"), multi: !tiny, multiOnce: true, enabler: "eClose" });
rst.addAction({ action: "insFinish", caption: L("lcl_ins_finish"), multi: !tiny, multiOnce: true, enabler: "eFinish" });
}
else
@@ -887,12 +882,6 @@ function ins_list (pautfunction, params)
</script>
<div id="legenda" style="display:none; line-height: 30px;">
<table id="inslegenda">
<tr class="pending">
<td title="<%= L("lcl_ins_controle_busy") %>"><%= L("lcl_ins_controle_busy") %></td>
</tr>
<tr class="unsolved">
<td title="<%= L("lcl_ins_controle_act_req") %>"><%= L("lcl_ins_controle_act_req") %></td>
</tr>
<tr class="expired1">
<td title="<%= L("lcl_ins_controle_soon") %>"><%= L("lcl_ins_controle_soon") %></td>
</tr>

6
APPL/INS/ins_list.js
View File

@@ -226,7 +226,7 @@ function insPlan(rowArray)
function insStart(rowArray, isMulti)
{
if (isMulti || confirm(L("lcl_ins_starting")))
if (isMulti || confirm(rowArray.length == 1 ? L("lcl_ins_starting"): L("lcl_ins_starting_m")))
{
var insKeyString = getKeyString(rowArray);
var srtcontrolekeyArray = new Array();
@@ -266,12 +266,12 @@ function insClose(rowArray)
// var url = "appl/ins/ins_inspect.asp?close=1&ins_keys=" + insKeyString + "&srtcont_keys=" + srtcontrolekeyArray.join(",") + "&deelsrtcont_key=" + deelsrtcontrkeyArray.join(",");
//else
var url = "appl/ins/ins_edit_inspect.asp?close=1&ins_keys=" + insKeyString + "&srtcont_keys=" + srtcontrolekeyArray.join(",") + "&deelsrtcont_keys=" + deelsrtcontrkeyArray.join(",");
FcltMgr.openDetail(url, L("lcl_ins_close"));
FcltMgr.openDetail(url, L("lcl_ins_stop"));
}
function insFinish(rowArray, isMulti)
{
if (isMulti || confirm(L("lcl_ins_finishing")))
if (isMulti || confirm(rowArray.length == 1 ? L("lcl_ins_finishing") : L("lcl_ins_finishing_m")))
{
var insKeyString = getKeyString(rowArray);
var deelsrtcontrkeyArray = new Array();

31
APPL/INS/ins_search.asp
View File

@@ -300,20 +300,25 @@ var authparams = user.checkAutorisation(autfunction);
if (insInspect) // Ook inspectiezoekvelden
{
if (ctrdisc_key > 0)
var ctr_disc_sql = " = " + ctrdisc_key;
else
ctr_disc_sql = " IN (SELECT w.ins_discipline_key"
+ " FROM fac_v_webgebruiker w"
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.prs_perslid_key = " + user_key + ")";
if (ctrdisc_key == -1)
{
// <!-- Controle Type -->
sql = "SELECT ins_discipline_key"
+ " , ins_discipline_omschrijving"
+ " FROM ctr_discipline"
+ " WHERE ins_discipline_key IN (SELECT w.ins_discipline_key"
+ " FROM fac_v_webgebruiker w"
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.prs_perslid_key = " + user_key + ")"
+ " WHERE ins_discipline_key " + ctr_disc_sql
+ " ORDER BY 2";
FCLTselector("ctr_discipline",
sql,
@@ -334,7 +339,8 @@ var authparams = user.checkAutorisation(autfunction);
+ " ins_srtcontrole_periode"
+ " FROM ins_srtcontrole isc, ins_v_allsrtinstallatie asi"
+ " WHERE asi.ins_srtinstallatie_key = isc.ins_srtinstallatie_key"
+ " AND asi.niveau = isc.ins_srtcontrole_niveau"
+ " AND asi.niveau = isc.ins_srtcontrole_niveau"
+ " AND ctr_discipline_key " + ctr_disc_sql
+ " ORDER BY UPPER("+lcl.xsql('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key')+")";
FCLTselector("sel_srtcontrole",
sql,
@@ -347,9 +353,10 @@ var authparams = user.checkAutorisation(autfunction);
+ " , COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)"
+ " FROM ins_srtcontrole isc"
+ " , ins_srtcontroledl_xcp xcp"
+ " WHERE isc.ins_srtcontrole_key = xcp.ins_srtcontrole_key"
+ " WHERE isc.ins_srtcontrole_key = xcp.ins_srtcontrole_key(+)"
+ " AND ctr_discipline_key " + ctr_disc_sql
+ " AND COALESCE (xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep) IS NOT NULL"
+ " ORDER BY UPPER (COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep))";
+ " ORDER BY UPPER (COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep))";
FCLTselector("groep",
sql,
{ label: L("ins_srtcontrole_groep"),
@@ -578,7 +585,7 @@ var authparams = user.checkAutorisation(autfunction);
<!-- Actie vereist (Afgemelde inspecties (status 5)) -->
<tr><td align=left><input type="checkbox" class="fldcheck" name="insInspClosed" id="insInspClosed" value="1" checked <%=inspClosed? "checked" : ""%>></td><td><label for="insInspClosed"><%=L("lcl_ins_controle_act_req")%></label></td></tr>
<!-- Binnenkort. Zonder begindatum is te laat + binnenkort. Zonder einddatum is binnenkort + toekomst -->
<tr><td><input type="checkbox" class="fldcheck" name="insInspSoon" id="insInspSoon" value="1" CHECKED></td><td><label for="insInspSoon"><%=L("lcl_ins_controle_soon")%></label></td></tr>
<tr><td><input type="checkbox" class="fldcheck" name="insInspSoon" id="insInspSoon" value="1" CHECKED></td><td><label for="insInspSoon"><%=L("lcl_ins_controle_soon")%>:</label></td></tr>
<tr>
<td></td>
<td>

2
APPL/INS/ins_show_inspect.asp
View File

@@ -229,7 +229,7 @@ switch(sctype)
if (canEdit)
buttons.push({title: L("lcl_change"), action: "ins_edit()", icon: "wijzigen.png" });
if (canClose)
buttons.push({title: L("lcl_ins_close") + "/" + L("lcl_ins_finish"), action: "ins_edit('C')", icon: "close.png" });
buttons.push({title: L("lcl_ins_stop"), action: "ins_edit('C')", icon: "close.png" });
if (canFinish)
buttons.push({title: L("lcl_ins_finish"), action: "ins_finish()", icon: "close.png" });
if (canMelding)

15
APPL/INS/ins_xcp.asp
View File

@@ -30,7 +30,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "suggest", "kenmerk"],
// Eigenlijk tot nu toe geen multi ins_key waarden. Slechts <20><>n ins_key waarden wordt gesubmit.
var ins_key = getQParamInt("ins_key");
var srtcont_key = getQParamInt("srtcont_key", -1); // voorgekozen inspectiesoort
var srtcont_key = getQParamInt("srtcont_key", -1); // voorgekozen inspectiesoort vanuit MJOB of Graphics thema
var deelsrtcont_key = getQParamInt("deelsrtcont_key", -1); // bestaande inspectie
var transitParam = buildTransitParam(["srtcont_key", "deelsrtcont_key"]);
var add = getQParamInt("add", 0) == 1; // Controle inspectie (ins_srtcontrole) waarvan de periode op 0 staat actief maken.
@@ -515,6 +515,9 @@ if (srtcont_key > 0)
function calcKosten(number)
{
if (!$("#kosten" + number).length) // geen rechten of niet geconfigureerd
return;
var kosten = parseFloat($("#kosten" + number).val().replace(',', '.'));
if ($("#kosten" + number).val() != '' && !isNaN(kosten))
{
@@ -528,6 +531,9 @@ if (srtcont_key > 0)
function calcUren()
{
if (!$("#uren").length) // geen rechten of niet geconfigureerd
return;
var uren = parseFloat($("#uren").val().replace(',', '.'));
if ($("#uren").val() != '' && !isNaN(uren))
$("#uren").val(num2currEditable(uren));
@@ -535,6 +541,9 @@ if (srtcont_key > 0)
function calcMateriaal()
{
if (!$("#materiaal").length) // geen rechten of niet geconfigureerd
return;
var materiaal = parseFloat($("#materiaal").val().replace(',', '.'));
if ($("#materiaal").val() != '' && !isNaN(materiaal))
{
@@ -629,8 +638,8 @@ if (srtcont_key > 0)
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.fac_gebruiker_prs_level_write < 9"
+ " AND w.fac_gebruiker_alg_level_write < 9"
+ " AND w.prs_perslid_key = " + user_key + ")"
+ " GROUP BY di.ins_srtcontrole_key"
+ " , di.ins_srtcontrole_omschrijving"

90
APPL/INS/ins_xcp_save.asp
View File

@@ -24,12 +24,60 @@ var ins_key = getQParamInt("ins_key");
var srtcontrole_key = getFParamInt("sel_srtcontrole"); // ins_srtcontrole_key.
var this_ins = ins.func_enabled_deel(ins_key, {srtcont_key: srtcontrole_key});
// Ophalen standaard waarden.
var sql = "SELECT isc.ins_srtcontrole_eenheid"
+ " , isc.ins_srtcontrole_periode"
+ " , isc.ins_srtcontrole_bits"
+ " , isc.ins_srtcontrole_kosten"
+ " , isc.ins_srtcontrole_kosten2"
+ " , isc.ins_srtcontrole_kosten3"
+ " , isc.ins_srtcontrole_uren"
+ " , isc.ins_srtcontrole_materiaal"
+ " , isc.ins_srtcontrole_percentage"
+ " , ins_srtcontrole_groep"
+ " , isc.ins_srtcontrole_eind"
+ " , isc.ins_srtcontrole_opmerking"
+ " , isc.ctr_discipline_key"
+ " FROM ins_srtcontrole isc"
+ " , ins_deel d"
+ " , ins_srtdeel sd"
+ " WHERE sd.ins_srtdeel_key = d.ins_srtdeel_key"
+ " AND (isc.ins_srtcontrole_niveau = 'S'"
+ " AND isc.ins_srtinstallatie_key = d.ins_srtdeel_key"
+ " OR isc.ins_srtcontrole_niveau = 'G'"
+ " AND isc.ins_srtinstallatie_key = sd.ins_srtgroep_key"
+ " OR isc.ins_srtcontrole_niveau = 'D'"
+ " AND isc.ins_srtinstallatie_key = d.ins_discipline_key)"
+ " AND d.ins_deel_key = " + ins_key
+ " AND isc.ins_srtcontrole_key = " + srtcontrole_key;
var oRs = Oracle.Execute(sql);
lcl.set_dialect(oRs("ctr_discipline_key").Value, "INS_TAB_DISCIPLINE_KEY");
var eenheid_std = oRs("ins_srtcontrole_eenheid").Value;
var periode_std = oRs("ins_srtcontrole_periode").Value;
var bits_std = oRs("ins_srtcontrole_bits").Value;
var kosten1_std = oRs("ins_srtcontrole_kosten").Value;
var kosten2_std = oRs("ins_srtcontrole_kosten2").Value;
var kosten3_std = oRs("ins_srtcontrole_kosten3").Value;
var uren_std = oRs("ins_srtcontrole_uren").Value;
var materiaal_std = oRs("ins_srtcontrole_materiaal").Value;
var perc_std = oRs("ins_srtcontrole_percentage").Value;
var groep_std = oRs("ins_srtcontrole_groep").Value;
var opmerk_std = oRs("ins_srtcontrole_opmerking").Value;
var vervaldatum_std = new Date(oRs("ins_srtcontrole_eind").Value);
oRs.Close();
// Mag ik de parameters van het inspectie object aanpassen?
user.anything_todo_or_abort(this_ins.canChangeXcp);
var xcp_key = getFParamInt("xcp_key"); // ins_srtcontroledl_xcp_key.
var mode = getFParamInt("mode"); // ins_srtcontrole_mode.
var eenheid = getFParamInt("eenheid"); // ins_srtcontroledl_xcp_eenheid.
if (!(eenheid >= 0)) // uurlijks is 0
eenheid = eenheid_std;
var periode = null;
if (eenheid > -1)
periode = getFParamInt("periode", null); // ins_srtcontroledl_xcp_periode.
@@ -82,48 +130,7 @@ else
// Als de nieuwe waarde gelijk is aan de standaard waarden dan deze niet opslaan.
// Ophalen standaard waarden.
var sql = "SELECT isc.ins_srtcontrole_eenheid"
+ " , isc.ins_srtcontrole_periode"
+ " , isc.ins_srtcontrole_bits"
+ " , isc.ins_srtcontrole_kosten"
+ " , isc.ins_srtcontrole_kosten2"
+ " , isc.ins_srtcontrole_kosten3"
+ " , isc.ins_srtcontrole_uren"
+ " , isc.ins_srtcontrole_materiaal"
+ " , isc.ins_srtcontrole_percentage"
+ " , ins_srtcontrole_groep"
+ " , isc.ins_srtcontrole_eind"
+ " , isc.ins_srtcontrole_opmerking"
+ " , isc.ctr_discipline_key"
+ " FROM ins_srtcontrole isc"
+ " , ins_deel d"
+ " , ins_srtdeel sd"
+ " WHERE sd.ins_srtdeel_key = d.ins_srtdeel_key"
+ " AND (isc.ins_srtcontrole_niveau = 'S'"
+ " AND isc.ins_srtinstallatie_key = d.ins_srtdeel_key"
+ " OR isc.ins_srtcontrole_niveau = 'G'"
+ " AND isc.ins_srtinstallatie_key = sd.ins_srtgroep_key"
+ " OR isc.ins_srtcontrole_niveau = 'D'"
+ " AND isc.ins_srtinstallatie_key = d.ins_discipline_key)"
+ " AND d.ins_deel_key = " + ins_key
+ " AND isc.ins_srtcontrole_key = " + srtcontrole_key;
var oRs = Oracle.Execute(sql);
lcl.set_dialect(oRs("ctr_discipline_key").Value, "INS_TAB_DISCIPLINE_KEY");
var eenheid_std = oRs("ins_srtcontrole_eenheid").Value;
var periode_std = oRs("ins_srtcontrole_periode").Value;
var bits_std = oRs("ins_srtcontrole_bits").Value;
var kosten1_std = oRs("ins_srtcontrole_kosten").Value;
var kosten2_std = oRs("ins_srtcontrole_kosten2").Value;
var kosten3_std = oRs("ins_srtcontrole_kosten3").Value;
var uren_std = oRs("ins_srtcontrole_uren").Value;
var materiaal_std = oRs("ins_srtcontrole_materiaal").Value;
var perc_std = oRs("ins_srtcontrole_percentage").Value;
var groep_std = oRs("ins_srtcontrole_groep").Value;
var opmerk_std = oRs("ins_srtcontrole_opmerking").Value;
var vervaldatum_std = new Date(oRs("ins_srtcontrole_eind").Value);
var datumdiffer = vervaldatum != null && (vervaldatum? vervaldatum.getTime() : null) != (vervaldatum_std? vervaldatum_std.getTime() : null)
var paramsdiffer = ((eenheid != -1 && (eenheid != eenheid_std || (periode != null && periode != periode_std) || (bits != null && bits != bits_std))) ||
(kosten1 != null && kosten1 != kosten1_std) ||
@@ -194,7 +201,6 @@ else
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
result.message += " " + err.friendlyMsg;
oRs.Close();
}
}

13
APPL/MJB/mjb_search.asp
View File

@@ -193,8 +193,17 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
<table><!-- x rijen, 2 kolommen: label + veld -->
<% sql = "SELECT ins_srtcontrole_key"
+ " , ins_srtcontrole_omschrijving"
+ " FROM ins_srtcontrole"
+ " WHERE (ins_srtcontrole_eind IS NULL OR ins_srtcontrole_eind > SYSDATE)"
+ " FROM ins_srtcontrole isc"
+ " , ctr_disc_params cdp"
+ " , ctr_discipline cd"
+ " WHERE isc.ctr_discipline_key = cdp.ctr_ins_discipline_key"
+ " AND cdp.ctr_ins_discipline_key = cd.ins_discipline_key"
+ " AND cd.ins_discipline_verwijder IS NULL"
+ " AND cdp.ctr_disc_params_ismjob = 1"
+ " AND (ins_srtcontrole_eind IS NULL OR ins_srtcontrole_eind > SYSDATE)";
if (ctrdisc_key > 0)
sql += " AND cd.ins_discipline_key = " + ctrdisc_key
FCLTselector("srtcontrole", // Soort controle
sql,
{ initKey: srtcontrole,

46
APPL/MJB/mjb_search_list.asp
View File

@@ -41,9 +41,11 @@ var authparamsCTRUSE = user.checkAutorisation(autfunctionCTRUSE);
var authparamsCTRUSE = user.checkAutorisation(autfunctionCTRUSE, true, null, true); // Pessimistic.
var hasReadCTRUSE = authparamsCTRUSE && authparamsCTRUSE.ALGreadlevel < 9 && authparamsCTRUSE.PRSreadlevel < 9;
// Als ik op minstens 1 discipline alleen leesrechten heb, dan zal vanwege het pessimistisch testen de writelevel 9 zijn.
// Dan heb ik dus geen hasWriteCTRUSE rechten.
var hasWriteCTRUSE = authparamsCTRUSE && authparamsCTRUSE.ALGwritelevel < 9 && authparamsCTRUSE.PRSwritelevel < 9;
// Rechten om exception (xcp) waarden van de inspectie/taaak te kunnen zien en om details van het object te kunnen zien.
// Rechten om exception (xcp) waarden van de inspectie/taak te kunnen zien en om details van het object te kunnen zien.
var autfunctionINSMAN = "WEB_INSMAN";
var authparamsINSMAN = user.checkAutorisation(autfunctionINSMAN, true, null, true); // Pessimistic.
var hasReadINSMAN = authparamsINSMAN && authparamsINSMAN.ALGreadlevel < 9 && authparamsINSMAN.PRSreadlevel < 9;
@@ -231,7 +233,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
%>
</head>
<body id="listbody">
<div id='timetip'>xx</div>
<div id='timetip'></div>
<%
// De datum (jaar) van de *eerstvolgende* onderhoudsbeurt volgt uit:
@@ -254,12 +256,22 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
+ " , e.ins_srtcontrole_percentage"
+ " , e.ins_srtcontrole_opmerking"
+ " , EXTRACT (YEAR FROM COALESCE(c.plandatum"
+ " , ADD_MONTHS(COALESCE(c.laatste, e.ins_deel_aanmaak), 12 * e.ins_srtcontrole_periode))) vervangingsjaar"
+ " , ADD_MONTHS(COALESCE(c.laatste"
+ " , CASE"
+ " WHEN e.ctr_controle_type = 1" // Controle(1).
+ " THEN SYSDATE"
+ " ELSE e.ins_deel_aanmaak" // Vervanging(2) of Certificering(3).
+ " END), CASE"
+ " WHEN e.ctr_controle_type = 1" // Controle(1).
+ " THEN 1"
+ " ELSE 12 * e.ins_srtcontrole_periode" // Vervanging(2) of Certificering(3).
+ " END))) vervangingsjaar"
+ " , e.ins_deel_aantal"
+ " , e.ins_srtcontrole_eind"
+ " , e.ins_srtcontrole_afbouwtijd"
+ " , e.fin_btwtabelwaarde_key"
+ " , e.ins_srtcontroledl_xcp_eind"
+ " , e.ctr_controle_type"
+ " FROM (SELECT el.ins_deel_key"
+ " , el.ins_srtcontroledl_xcp_key"
+ " , el.ins_srtcontrole_omschrijving"
@@ -278,8 +290,20 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
+ " , el.ins_srtcontrole_afbouwtijd"
+ " , el.fin_btwtabelwaarde_key"
+ " , el.ins_srtcontroledl_xcp_eind"
+ " , el.ctr_controle_type"
+ " FROM ins_v_defined_inspect_xcp el"
+ " WHERE el.ctr_controle_type = 2" // TODO Altijd 'Vervanging' ?
+ " WHERE el.ins_srtcontrole_periode > 0"
+ " AND el.ctr_ismjob = 1"
// Je moet read CTRUSE rechten hebben op de CTR disciplines om de taken te kunnen zien.
+ " AND el.ctr_discipline_key IN (SELECT w.ins_discipline_key"
+ " FROM fac_v_webgebruiker w"
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.prs_perslid_key = " + user_key
+ " AND el.ctr_discipline_key = w.ins_discipline_key)"
// Vroeg filteren is *heel* goed voor performance
+ (dist_key > 0
? " AND el.ins_alg_locatie_key IN (SELECT alg_locatie_key FROM alg_locatie WHERE alg_district_key = " + dist_key + ")"
@@ -299,21 +323,9 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
+ (srtdeel_key > 0
? " AND el.ins_srtdeel_key = " + srtdeel_key
: "")
+ " AND el.ins_srtcontrole_periode > 0"
+ " AND el.ctr_ismjob = 1"
+ (groep
? " AND UPPER(ins_srtcontrole_groep) LIKE " + safe.quoted_sql_wild("%" + groep + "%")
: "")
// Je moet read CTRUSE rechten hebben op de CTR disciplines om de taken te kunnen zien.
+ " AND el.ctr_discipline_key IN (SELECT w.ins_discipline_key"
+ " FROM fac_v_webgebruiker w"
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.prs_perslid_key = " + user_key
+ " AND el.ctr_discipline_key = w.ins_discipline_key)"
+ (srtcontrole.length > 0
? " AND el.ins_srtcontrole_key IN (" + srtcontrole.join(",") + ")"
: "")
@@ -672,7 +684,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
{ // Alleen voor groupby Element(6) en Taak(7)
if (hasReadINSMAN)
{
return "<span class='details' title='{2}' onclick='naardeel({0}, this)'>{1}</span>".format(oRs("keyColumn").Value, safe.html(oRs("ins_deel_omschrijving").Value), safe.htmlattr(L("lcl_mld_deel_details")));
return "<span class='details' title='{2}' onclick='naardeel({0}, this)'>{1}</span>".format(oRs("keyColumn").Value, safe.html(oRs("ins_deel_omschrijving").Value), (oRs("ins_deel_opmerking").Value == null ? safe.htmlattr(L("lcl_mld_deel_details")) : safe.htmlattr(oRs("ins_deel_opmerking").Value)));
}
else
return "<span title='{2}'>{1}</span>".format(oRs("keyColumn").Value, safe.html(oRs("ins_deel_omschrijving").Value), safe.htmlattr(oRs("ins_deel_opmerking").Value));

2
APPL/MLD/mld.inc
View File

@@ -3588,7 +3588,7 @@ __Log(result);
{ dbs: "mld_melding_datum", typ: "datetime", val: new Date() },
{ dbs: "mld_melding_einddatum", typ: "datetime", val: enddate_std },
{ dbs: "mld_melding_t_uitvoertijd.tijdsduur",
obj: "MLD_T_UITVOERTIJD", typ: "number", val: prio.uitvoertijd },
obj: "MLD_T_UITVOERTIJD", typ: "float", val: prio.uitvoertijd },
{ dbs: "mld_melding_t_uitvoertijd.eenheid",
obj: "MLD_T_UITVOERTIJD", typ: "varchar", val: prio.eenheid },
{ dbs: "mld_alg_locatie_key", typ: "key", val: locatiekey }

2
APPL/MLD/mld_edit_melding.asp
View File

@@ -948,7 +948,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
disable: true
}
}
RWFIELDTR("respijt", "fldrespijt", L("lcl_mld_respijt"), mld_melding.respijt? Math.round(mld_melding.respijt * 100) / 100 : "", {maxlength: 3, datatype: "float", selector: selectparams});
RWFIELDTR("respijt", "fldrespijt", L("lcl_mld_respijt"), mld_melding.respijt? Math.round(mld_melding.respijt * 1000) / 1000 : "", {maxlength: 8, datatype: "float", selector: selectparams});
if (this_mld.canSLAChange)
RWCHECKBOXTR("indult", "fldafr", L("lcl_mld_indult"), mld_melding.indult);

14
APPL/MLD/mld_edit_melding.js
View File

@@ -40,12 +40,6 @@ function checkInput()
var str = $("#respijt").val();
if (str == "")
$("#respijt").val(0); // Bij een lege waarde 0 dagen submitten.
else if (!isGoodInteger(str))
{
alert(L("lcl_mld_invalid_kenmerk_format"));
$("#respijt").select();
return false;
}
}
return true
}
@@ -712,14 +706,14 @@ function process_stdm_info(data, stdmChanged) // stdmChanged is optioneel.
var toggleomschrijving = (stdm_info.freetext != 0 || stdm_info.subject != 0);
$("#mldOmschrijving").toggle(toggleomschrijving);
// Alleen individueel tonen/verstoppen als het blok daadwerkelijk verschijnt.
// Alleen individueel tonen/verstoppen als het blok daadwerkelijk verschijnt.
if (toggleomschrijving)
{
$("#melding_omschrijving").toggle(stdm_info.freetext != 0); // verstop de omschrijving
$("#melding_omschrijving").closest('td').prev().toggle(stdm_info.freetext != 0); // verstop ook het bijbehorende label
$("#melding_onderwerp").toggle(stdm_info.subject != 0); // verstop het onderwerp
$("#melding_onderwerp").closest('td').prev().toggle(stdm_info.subject != 0); // verstop ook bijbehorende label
}
}
if (stdm_info.freetext == 2 && !$("#melding_omschrijving")[0].readOnly)
{ // class required zetten
@@ -729,7 +723,7 @@ function process_stdm_info(data, stdmChanged) // stdmChanged is optioneel.
{ // class required verwijderen
$("#melding_omschrijving").removeClass("required");
}
if (stdm_info.subject == 2 && !$("#melding_onderwerp")[0].readOnly)
{ // class required zetten
$("#melding_onderwerp").addClass("required");
@@ -737,7 +731,7 @@ function process_stdm_info(data, stdmChanged) // stdmChanged is optioneel.
else
{ // class required verwijderen
$("#melding_onderwerp").removeClass("required");
}
}
// Het niveau van onroerendgoed die geselecteerd moet zijn vanaf waar objecten gekozen kunnen worden.
$("#alg_onrgoed_obj_niveau").val(stdm_info.alg_onrgoed_obj_niveau);

6
APPL/MLD/mld_edit_melding_save.asp
View File

@@ -258,15 +258,15 @@ if (savemode)
// Checken of een geldige respijt aanwezig was.
// De eenheid van respijt wordt gelijk genomen aan de eenheid van de stdmelding en is dus altijd readonly.
// Als respijt niet aanwezig was dan ook eenheid niet opslaan (val wordt altijd opgeslagen, maar frm niet).
var respijtpresent = Request.Form("respijt").count > 0 && getFParamInt("respijt") > 0;
var respijtpresent = Request.Form("respijt").count > 0 && getFParamFloat("respijt") > 0;
if (respijtpresent)
fields.push({ dbs: "mld_melding_t_respijt.tijdsduur",
obj: "MLD_T_UITVOERTIJD", typ: "number", frm: "respijt", track: L("lcl_mld_respijt") },
obj: "MLD_T_UITVOERTIJD", typ: "float", frm: "respijt", track: L("lcl_mld_respijt") },
{ dbs: "mld_melding_t_respijt.eenheid",
obj: "MLD_T_UITVOERTIJD", typ: "varchar", val: stdm_info.prioriteiten[(prio > 0? prio : old_prio)].eenheid, track: L("lcl_mld_respijt_eenheid") });
else // Leegmaken
fields.push({ dbs: "mld_melding_t_respijt.tijdsduur",
obj: "MLD_T_UITVOERTIJD", typ: "number", val: null, track: L("lcl_mld_respijt") },
obj: "MLD_T_UITVOERTIJD", typ: "float", val: null, track: L("lcl_mld_respijt") },
{ dbs: "mld_melding_t_respijt.eenheid",
obj: "MLD_T_UITVOERTIJD", typ: "varchar", val: null, track: L("lcl_mld_respijt_eenheid") });

8
APPL/MLD/opdr_list.inc
View File

@@ -1030,8 +1030,12 @@ function opdr_list (params)
rst.addColumn(new Column({caption: L("lcl_orderdate"), content: "mld_opdr_datumbegin", datatype: "date", nowrap: true}));
rst.addColumn(new Column({caption: L("lcl_time"), content: "mld_opdr_datumbegin", datatype: "time", combine: true, nomidnight: true}));
rst.addColumn(new Column({caption: L("lcl_mld_mldstatus"), content: fnMldStatus}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_status"), content: fnOpdrStatus, combine: true}));
var hasMLD = user.has(["WEB_MLDBOF","WEB_MLDFOF"]);
if (hasMLD)
{
rst.addColumn(new Column({caption: L("lcl_mld_mldstatus"), content: fnMldStatus}));
}
rst.addColumn(new Column({caption: L("lcl_mld_opdr_status"), content: fnOpdrStatus, combine: hasMLD}));
if (S("mld_plandate_in_list") == 1) {
rst.addColumn(new Column({caption: L("lcl_opdr_plandate"), content: "mld_opdr_plandatum", datatype: "date", nowrap: true}));

6
APPL/PDA/default.css
View File

@@ -305,15 +305,15 @@ select,
textarea,
button,
.ui-btn {
font-family: system, -apple-system, "Helvetica Neue", "Lucida Grande", Helvetica, Arial, sans-serif /*{global-font-family}*/ !important;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif /*{global-font-family}*/ !important;
}
.ui-header {
font-family: system, -apple-system-headline, "Helvetica Neue", "Lucida Grande", Helvetica, Arial, sans-serif /*{global-font-family}*/ !important;
font-family: -apple-system-headline, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif /*{global-font-family}*/ !important;
}
.ui-footer{
font-family: system, -apple-system-short-footnote, "Helvetica Neue", "Lucida Grande", Helvetica, Arial, sans-serif /*{global-font-family}*/ !important;
font-family: -apple-system-footnote, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif /*{global-font-family}*/ !important;
}
input,

8
APPL/PDA/melding.asp
View File

@@ -400,13 +400,13 @@ if (addSubheader)
if (jdata.autoorder)
{
var data = { mld_key: <%=mld_key%>,
message: jdata.message,
message: jdata.message || jdata.toaster,
autoorder: 1
};
<% protectRequest.dataToken("data"); %>
$.post("../mld/mld_edit_opdr_save.asp",
data,
FcltCallbackAndThenAlways(afsluiten),
McltCallbackAndThenAlways(afsluiten),
"json");
}
else
@@ -415,8 +415,6 @@ if (addSubheader)
function afsluiten(jdata)
{ // Sluit onszelf.
//jqToast(jdata.message);
alert(jdata.message);
window.location.href = "melding.asp?mld_key=<%=mld_key%>";
}
@@ -464,7 +462,7 @@ if (action != "forward")
if (mld_key > -1) // bestaande
{
BLOCK_START({collapsed: true, title: (mld_info.mld_onderwerp == null ? L("lcl_mld_frame_algemeen") : mld_info.mld_onderwerp)});
BLOCK_START({collapsed: true, title: (mld_info.mld_onderwerp == null ? L("lcl_mld_frame_algemeen") : safe.html(mld_info.mld_onderwerp))});
var prs_melder = new Perslid(mld_info.melder_key);
ROFIELD("fld", L("lcl_caller") , prs_melder.naam(), { moreinfo: "tel:"+(prs_melder.prs_perslid_mobiel()||prs_melder.prs_perslid_telefoonnr()) });
ROFIELD("fld", L("lcl_mld_date_time") , toDateTimeString(mld_info.melddatum));

5
APPL/PDA/orders_list.asp
View File

@@ -50,7 +50,6 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
if (mld_key > -1)
{
var sql = "SELECT sd.ins_srtdiscipline_prefix"
+ " , m. mld_melding_status"
+ " FROM mld_melding m"
+ " , mld_stdmelding s"
+ " , mld_discipline md"
@@ -61,7 +60,6 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
+ " AND md.ins_discipline_key = s.mld_ins_discipline_key";
var oRs = Oracle.Execute(sql);
var meldingNr = oRs("ins_srtdiscipline_prefix").Value + mld_key;
var status = oRs("mld_melding_status").Value;
oRs.Close();
var this_mld = mld.func_enabled_melding(mld_key);
addAllowed = this_mld.canAddOpdr;
@@ -266,7 +264,7 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
}
function fncolSubHeader(oRs)
{
return (oRs("plaatsmelding").Value? "<div class='listbodykop'>" + safe.html(oRs("plaatsmelding").Value) + "<br>" : "")
return "<div class='listbodykop'>" + (oRs("plaatsmelding").Value? safe.html(oRs("plaatsmelding").Value) + "<br>" : "")
+ L("lcl_mld_enddate") + ": " + toDateTimeString(oRs("mld_opdr_einddatum").Value, false, false, true) + "</div>"
+ "<div class='listbodytext'>" + safe.html(shorttxt(oRs("mld_opdr_omschrijving").Value, S("rs_mobile_maxchar"))) + "</div>";
};
@@ -280,7 +278,6 @@ var verdieping_key = getQParamInt("verdieping_key", user.alg_verdieping_key({wit
case 3: listtitle = L("lcl_mobile_opdrachten3") + " " + CurrentPositionMinus1; break; /* is niveau hoger */
case 4: listtitle = L("lcl_mobile_opdrachten") + " " + L("lcl_mobile_objbijmelding") + " " + meldingNr; break;
}
// var addaction = (((listmode == 4) && (status!=0)&&(status!=2)&&(status!=3)) ? "../pda/order.asp?mld_key="+mld_key : "");
var addaction = (addAllowed? "../pda/order.asp?mld_key=" + mld_key : "");
PAGE_START();

1
APPL/PRS/prs_edit_perslid.asp
View File

@@ -40,6 +40,7 @@ var endEmpty = 1;
// if (!alg.canWriteRuimte(room_key, authparams.mALGreadlevel))
// user.auth_required_or_abort(false);
var prs_flags = 0;
if (prs_key > -1)
{
sql = "SELECT p.prs_perslid_key, "

6
APPL/RES/res.inc
View File

@@ -997,9 +997,9 @@ res = {
{
// reservering is van mij of een collega.
if ( rresult.canChangeUrole == "fe"
&& rsv_ruimte_contact_key == user_key
&& user.isCollega(rsv_ruimte_contact_key)
&& user.isCollega(rsv_ruimte_host_key))
|| rsv_ruimte_contact_key == user_key
|| user.isCollega(rsv_ruimte_contact_key)
|| user.isCollega(rsv_ruimte_host_key))
{
// status_bo is nog niet "afgemeld" (5) of "verwerkt" (6)
// status_fo is niet "vervallen" (4)

2
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -1183,7 +1183,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
<tr><td class="label"><label for='sel_room'><%=L("lcl_room")%>:</label></td>
<td><div id='req_sel_room'>
<input type="text" id="sel_room"
class="<%=!rrr.res_ruimte_extern? "button fldresroomedit required" : ""%> fldresroom"
class="<%=((!rrr.res_ruimte_extern && !readonlyFE) ? "button fldresroomedit required" : "")%> fldresroom"
readonly
<% if (!rrr.res_ruimte_extern && !readonlyFE) { %> onclick="FindAvailableRooms()" <% } %>
value="<%=L("lcl_res_select_room")%>"

2
APPL/RES/res_edit_rsv_ruimte_save.asp
View File

@@ -470,7 +470,7 @@ if (isNew) // Nieuw, dan moeten we ook nog een res_reservering record aanmaken
else // update
{
// Hardness controle schrijfrechten
user.auth_required_or_abort(this_res.canChange || !this_res.canChangeFEExtended);
user.auth_required_or_abort(this_res.canChange || this_res.canChangeFEExtended);
// Bij wijzigen tijdstip ruimte (naar voren) schuiven voorzieningen mogelijk mee.
if (date_from < this_res.earliest_expire_change)

2
APPL/RES/res_show_rsv_ruimte.asp
View File

@@ -353,7 +353,7 @@ FCLTHeader.Requires({plugins: ["jQuery"]})
buttons.push( {title: "Touch", icon: "../Pictures/hand_point.png", action: "res_touch()" });
}
if (this_res.canChange || this_res.canReadFEOnly)
if (this_res.canChange || this_res.canChangeFEExtended)
buttons.push( {title: L("lcl_change"), icon: "wijzigen.png", action: "res_change()"});
else if (this_res.canWriteNoShow)
buttons.push({action: "resNoShow()", title: L("lcl_res_no_show"), icon: "noshow.png"});

2
APPL/SCF/scaffolding.inc
View File

@@ -283,7 +283,7 @@ function scf_RWFIELDTR(model, fld, val, key, params)
user_key,
{ label: field.label,
kostenplaatsKey: val?val.id:null,
filtercode: "AA",
filtercode: "foreignfiltercode" in field? field.foreignfiltercode : "AA",
required: params.required
});
}

2
APPL/SLE/sle_list.js
View File

@@ -10,7 +10,7 @@ function sleEdit(row)
if (sleData)
{
var sleSrtGroepKey = sleData.sleSrtGroepKey;
var url = "appl/SLE/sle_srtdeel.asp?ins_srtdeel_key=" + ins_srtdeel_key;
var url = "appl/sle/sle_srtdeel.asp?ins_srtdeel_key=" + ins_srtdeel_key;
FcltMgr.openDetail(url, L("lcl_sle_objectsoorten"));
}
}

2
APPL/SLE/sleutel_search.asp
View File

@@ -12,7 +12,7 @@
<%
FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"],
js: ["../SLE/sleutel_search.js"]
js: ["../sle/sleutel_search.js"]
});
/***** Get webform parameters *****/

BIN
CUST/AAAH/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/AAFR/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/AAHU/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/AALB/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/AAPM/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/AASI/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/AAVG/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/GDZW/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/GULU/oracle.udl Normal file
View File

Binary file not shown.

BIN
CUST/GVBA/oracle.udl Normal file
View File

Binary file not shown.

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

@@ -913,7 +913,9 @@
</xsl:template>
<xsl:template match="melding" mode="evenement">
<table border="0" width="100%" cellpadding="2">
<table border="0" width="100%" cellpadding="2">
<xsl:choose>
<xsl:when test="$srtnotificatiecode = 'MLDMAI'">
<tr>
<td colspan="4" class="caption" style="padding-top:20px;padding-bottom:10px">
<b>Bevestiging Evenement</b>
@@ -961,7 +963,7 @@
</tr>
<tr>
<td class="tekst">
<b>Aantal personen:</b></td><td class="tekst"><xsl:value-of select="kenmerk[@naam='Reservering']/reservering/rsv_ruimte/bezoekers"/></td>
<b>Aantal personen:</b></td><td class="tekst"><xsl:value-of select="kenmerk[@naam='Aantal personen']"/></td>
</tr>
<tr>
<td class="tekst">
@@ -989,7 +991,7 @@
<td class="tekst"><xsl:value-of select="kenmerk[@key='843']"/></td>
</tr>
<tr>
<td class="tekst"><b>Bewegwijzering:</b></td>
<td class="tekst"><b>Titel bewegwijzering:</b></td>
<td class="tekst"><xsl:value-of select="kenmerk[@key='842']"/></td>
</tr>
<tr>
@@ -1240,8 +1242,192 @@
</b>
</td>
</tr>
</table>
</xsl:template>
</xsl:when>
<xsl:otherwise>
<tr>
<td colspan="4" class="caption" style="padding-top:20px;">
<b>Aanvraag Evenement</b>
</td>
</tr>
<tr>
<td colspan="4" class="tekst" style="padding-bottom:20px;">
Let op; dit is slechts een registratie van je evenementen aanvraag. De definitieve bevestiging volgt.
</td>
</tr>
<tr>
<td class="tekst">Datum:</td><td class="tekst" colspan="3"><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>
</tr>
<tr>
<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>
</tr>
<tr>
<td class="tekst" colspan="4"><b>Programma</b></td>
</tr>
<tr>
<td class="tekst">Beschrijving programma:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Beschrijving prog.']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst">Begintijd van:</td><td class="tekst" colspan="3"><xsl:value-of select="kenmerk[@naam='Begintijd van']"/></td>
</tr>
<tr>
<td class="tekst" style="padding-bottom:20px;">Eindtijd tot:</td><td class="tekst" colspan="3" style="padding-bottom:20px;"><xsl:value-of select="kenmerk[@naam='Eindtijd tot']"/></td>
</tr>
<tr>
<td class="tekst" colspan="4"><b>Cateringwensen</b></td>
</tr>
<tr>
<td class="tekst">Ontvangst:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Ontvangst']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst">Pauze:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Pauze']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst">Lunch:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Lunch']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst">Borrel:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Borrel']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst" style="padding-bottom:20px;">Anders:</td>
<td class="tekst" colspan="3" style="padding-bottom:20px;">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Anders']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst" colspan="4"><b>AVM Middelen</b></td>
</tr>
<tr>
<td class="tekst">Beamer:</td>
<td class="tekst" colspan="3">
<xsl:choose>
<xsl:when test="kenmerk[@naam='Beamer']">Ja</xsl:when>
<xsl:otherwise>Nee</xsl:otherwise>
</xsl:choose>
</td>
</tr>
<tr>
<td class="tekst">Geluidsinstallatie:</td>
<td class="tekst" colspan="3">
<xsl:choose>
<xsl:when test="kenmerk[@naam='Geluidsinstallatie']">Ja</xsl:when>
<xsl:otherwise>Nee</xsl:otherwise>
</xsl:choose>
</td>
</tr>
<tr>
<td class="tekst">Laptop:</td>
<td class="tekst" colspan="3">
<xsl:choose>
<xsl:when test="kenmerk[@naam='Laptop']">Ja</xsl:when>
<xsl:otherwise>Nee</xsl:otherwise>
</xsl:choose>
</td>
</tr>
<tr>
<td class="tekst">Microfoon:</td>
<td class="tekst" colspan="3">
<xsl:choose>
<xsl:when test="kenmerk[@naam='Microfoon']">Ja</xsl:when>
<xsl:otherwise>Nee</xsl:otherwise>
</xsl:choose>
</td>
</tr>
<tr>
<td class="tekst">AVM ondersteuning (tijd):</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='AVM ondersteuning (tijd)']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst" style="padding-bottom:20px;">Anders (AVM):</td>
<td class="tekst" colspan="3" style="padding-bottom:20px;">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Anders (AVM)']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst" colspan="4"><b>Overige middelen/wensen</b></td>
</tr>
<tr>
<td class="tekst">Bloemen:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Bloemen']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst">Gewenste opstelling zaal:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Gewenste opstelling zaal']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst">Titel bewegwijzering:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Titel bewegwijzering']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst">Overig:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Overig']"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td class="tekst">Omschrijving:</td>
<td class="tekst" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</tr>
</xsl:otherwise>
</xsl:choose>
</table>
</xsl:template>
<xsl:template match="melding" mode="full">

BIN
CUST/LING/oracle.udl Normal file
View File

Binary file not shown.

4
CUST/MARX/mcust.css Normal file
View File

@@ -0,0 +1,4 @@
#fbanner {
background-image: url(../../cust/marx/tmpl_logo.gif);
height: 80px;
}

59
CUST/MARX/xsl/F_PutFactuurETIMSIDB.xsl Normal file
View File

@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:etim="http://etim.nl/xmlschemas/messageservice/2.40" version="1.0">
<xsl:output method="text" encoding="UTF-8"/>
<xsl:template match="Invoice">
<xsl:comment>woconr;leveranciernr;factuurnr;factuurdatum;onderwerp;opdrachtnr;omschrijving;bedrag;btwperc;btwbedrag;btw_verlegd;document;iban;G_iban;G_bedrag</xsl:comment>
<xsl:for-each select="InvoiceLine">
<xsl:value-of select="../Invoicee/GLN"/>;<xsl:value-of select="../Invoicer/GLN"/>;<xsl:value-of select="../InvoiceNumber"/>;<xsl:value-of select="../InvoiceDate"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="../FreeText"/></xsl:call-template>;<xsl:value-of select="../BuyersOrderNumber"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="FreeText"/></xsl:call-template>;<xsl:value-of select="NetLineAmount"/>;<xsl:apply-templates select="VATInformation"/>;<xsl:value-of select="../Attachment/FileName"/>;<xsl:value-of select="../Supplier/AccountInformation/IBAN"/>;<xsl:value-of select="../PaymentOnBlockedAccount/IBAN"/>;<xsl:value-of select="../PaymentOnBlockedAccount/Amount"/>;&#10;</xsl:for-each>
</xsl:template>
<xsl:template match="VATInformation">
<!-- Deze template levert het gedeelte [btwperc;btwbedrag;btw_verlegd] op -->
<!-- Let even op: geen voorgaande ; en zeker ook geen ; op einde, dat gebeurt in de aanroepende regel (hierboven dus) -->
<!-- Let op: btw bedrag wordt niet uit SidB uit de node InvoiceLine aangeboden, dus deze is hier altijd leeg. -->
<xsl:choose>
<xsl:when test="VATRate = 'E'">
<!-- BTW verlegd = Ja, en neem BTW-percentage over uit XML, indien deze NIET(!) staat ingevuld (hoeft kennelijk niet in SidB/volgens wet, zet dan hard 21% hier in -->
<xsl:choose>
<xsl:when test="VATPercentage != ''"><xsl:value-of select="VATPercentage"/>;;Ja</xsl:when>
<xsl:otherwise>21;;Ja</xsl:otherwise>
</xsl:choose>
</xsl:when>
<!-- BTW verlegd = Nee (Vatrate is dan S), veld btw_verlegd in CSV gewoon leeg laten, en neem BTW-percentage over uit XML -->
<xsl:otherwise><xsl:value-of select="VATPercentage"/>;;</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="vrije_tekst">
<xsl:param name="p_string"/>
<xsl:variable name="l_string_esc_quotes"><xsl:call-template name="escape_quote"><xsl:with-param name="string" select="$p_string"/></xsl:call-template></xsl:variable>
<xsl:variable name="l_string_esc_linebreaks"><xsl:call-template name="escape_linebreaks"><xsl:with-param name="string" select="$l_string_esc_quotes"/></xsl:call-template></xsl:variable>"<xsl:value-of select="$l_string_esc_linebreaks"/>"</xsl:template>
<xsl:template name="escape_quote">
<xsl:param name="string"/>
<xsl:choose>
<xsl:when test="contains($string, '&quot;')"><xsl:value-of select="substring-before($string, '&quot;')"/>&quot;&quot;<xsl:call-template name="escape_quote">
<xsl:with-param name="string" select="substring-after($string, '&quot;')"/></xsl:call-template></xsl:when>
<xsl:otherwise><xsl:value-of select="$string"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="escape_linebreaks">
<xsl:param name="string"/>
<xsl:choose>
<xsl:when test="contains($string, '&#xA;')"><xsl:value-of select="substring-before($string, '&#xA;')"/>@@<xsl:call-template name="escape_linebreaks">
<xsl:with-param name="string" select="substring-after($string, '&#xA;')"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise><xsl:value-of select="$string"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="/">
<xsl:apply-templates select="//etim:MsgContent"/>
</xsl:template>
</xsl:stylesheet>

BIN
CUST/PHBF/oracle.udl Normal file
View File

Binary file not shown.

7
CUST/PNBR/cust.css
View File

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

BIN
CUST/WIBC/oracle.udl Normal file
View File

Binary file not shown.

4
UTILS/PutOrders/puo_allorders.js
View File

@@ -203,7 +203,7 @@ function send1Order(Bedrijf_key, XMLnode, OpdrKey, ordernr, Sender, cust)
if (AttachPath)
Log2File(1, "Searching attachments under: " + AttachPath);
Log2File(3, "In SendAllOrders sender=" + Sender);
Log2File(4, "xml_content=" + xml_content);
LogString2File(4, "xml_content", xml_content, "xml")
Log2File(4, "xsl=" + bedrijfadres.XSLbedr + "==>" + XSLfile);
Log2File(4, "ordernr=" + ordernr);
Log2File(4, "key=" + OpdrKey);
@@ -218,7 +218,7 @@ function send1Order(Bedrijf_key, XMLnode, OpdrKey, ordernr, Sender, cust)
Log2File(4, "username=" + bedrijfadres.username);
Log2File(4, "authmethod=" + bedrijfadres.authmethod);
Log2File(4, "soapversion=" + bedrijfadres.soapversion);
Log2File(4, "authmethod=" + bedrijfadres.soapaction);
Log2File(4, "soapaction=" + bedrijfadres.soapaction);
var SendOrderResult = SendOrder( connect
, xml_content