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

FSN#37681 Terminologie voor CTR-disciplines

Browse Source 
svn path=/Website/trunk/; revision=30692
This commit is contained in:
Jos Groot Lipman
2016-09-13 14:08:13 +00:00
parent a4bf2e2975
commit 179afaca2a
16 changed files with 90 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
APPL/FAC/fac_locale_dialect.asp
View File

@@ -49,11 +49,11 @@ switch (dialect_id)
+ " WHERE res_srtactiviteit_key = " + dialect_key;
term_label = L("lcl_srtactivity");
break;
case "CAD_LEGENDA_KEY":
sql = "SELECT "+lcl.xsql('cad_legenda_omschrijving','cad_legenda_key')+" descr"
+ " FROM cad_legenda"
+ " WHERE cad_legenda_key = " + dialect_key;
term_label = L("lcl_fg_legenda");
case "INS_TAB_DISCIPLINE_KEY":
sql = "SELECT "+lcl.xsql('ins_discipline_omschrijving','ins_discipline_key')+" descr"
+ " FROM ins_tab_discipline"
+ " WHERE ins_discipline_key = " + dialect_key;
term_label = L("ctr_discipline");
break;
default: INTERNAL_ERROR;
}

5
APPL/INS/ins_edit_inspect.asp
View File

@@ -47,6 +47,7 @@ var ingeslotendsc = [];
var canMsuEdit = false; // Alleen voor het wijzigen van inspectie (insEdit). Er geldt dan altijd !multi.
// Bepaal de objecten/delen in de selectie die
// ook echt ingepland kunnen of mogen worden.
var ctrdisc_key = -1;
for (var i = 0; i < ins_key_arr.length; i++)
{
var this_ins = ins.func_enabled_deel(ins_key_arr[i],
@@ -58,6 +59,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
var sql = "SELECT idsc.ins_deelsrtcontrole_key"
+ " , idsc.ins_deelsrtcontrole_status"
+ " , xcp.ins_srtcontroledl_xcp_eind vervaldatum"
+ " , isc.ctr_discipline_key"
+ " FROM ins_srtcontrole isc"
+ " , ins_deelsrtcontrole idsc"
+ " , ins_srtcontroledl_xcp xcp"
@@ -71,6 +73,8 @@ for (var i = 0; i < ins_key_arr.length; i++)
: " AND idsc.ins_deelsrtcontrole_status(+) != 6")
+ " ORDER BY ins_deelsrtcontrole_datum DESC";
var oRs = Oracle.Execute(sql);
ctrdisc_key = oRs("ctr_discipline_key").Value
// Waarden moeten aanwezig zijn. Mocht dat niet zo zijn dan is er iets fout.
// Als de laatste inspectie is afgerond is, wordt er null opgeleverd voor de ins_deelsrtcontrole_key en ins_deelsrtcontrole_status.
// Er moet dan een nieuwe inspectie worden ingeland/gestart/afgemeld of afgerond.
@@ -105,6 +109,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
ingeslotendsc.push(ins_deelsrtcontrole_key);
tobehandled++;
}
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
user.anything_todo_or_abort(tobehandled > 0); // We klagen niet over enkele wel en enkele niet
%>

2
APPL/INS/ins_inspect.asp
View File

@@ -81,7 +81,7 @@ var insEdit = !insPlan && !insClose; // Wijzigen inspectie.
var page = "ins_show_inspect.asp?ins_key=" + ins_keys + "&srtcont_key=" + srtcont_keys + "&deelsrtcont_key=" + deelsrtcont_key;
}
// 1. Het hoofdframe
IFRAMER("inspectFrame", page, { title: L("lcl_bes_frame_algemeen"),
IFRAMER("inspectFrame", page, {
initHeight: "450px",
FcltClose: "inspectClose" } );

10
APPL/INS/ins_inspect_finish.asp
View File

@@ -35,6 +35,7 @@ var mobile = Request.Form("opmerk").count == 1; // Bij mobile is een geldige opm
var tobefinished = 0;
var ingeslotendsc = [];
// Bepaal de objecten/delen in de selectie die ook echt gestart kunnen of mogen worden.
var ctrdisc_key = -1;
for (var i = 0; i < ins_key_arr.length; i++)
{
// Als er nog geen inspectierecord aangemaakt is, dan deze overslaan. Dan had je Afmelden/Afronden moeten kiezen.
@@ -42,9 +43,13 @@ for (var i = 0; i < ins_key_arr.length; i++)
continue;
var sql = "SELECT idsc.ins_srtcontrole_key"
+ " FROM ins_deelsrtcontrole idsc"
+ " WHERE idsc.ins_deelsrtcontrole_key = " + dlsrtcont_key_arr[i];
+ " , isc.ctr_discipline_key"
+ " FROM ins_srtcontrole isc"
+ " , ins_deelsrtcontrole idsc"
+ " WHERE isc.ins_srtcontrole_key = idsc.ins_srtcontrole_key"
+ " AND idsc.ins_deelsrtcontrole_key = " + dlsrtcont_key_arr[i];
var oRs = Oracle.Execute(sql);
ctrdisc_key = oRs("ctr_discipline_key").Value
var this_ins = ins.func_enabled_deel(ins_key_arr[i],
{srtcont_key: oRs("ins_srtcontrole_key").Value,
@@ -59,6 +64,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
tobefinished++;
}
}
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
user.anything_todo_or_abort(tobefinished > 0); // We klagen niet over enkele wel en enkele niet.
var result = { success: true, multi: multi, finish: true };

3
APPL/INS/ins_inspect_save.asp
View File

@@ -81,6 +81,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
+ " , di.ins_srtcontrole_mode"
+ " , idsc.ins_deelsrtcontrole_status"
+ " , di.ins_deel_aanmaak"
+ " , di.ctr_discipline_key"
+ " FROM ins_v_defined_inspect di"
+ " , ins_srtcontroledl_xcp xcp"
+ " , ins_deelsrtcontrole idsc"
@@ -98,6 +99,8 @@ for (var i = 0; i < ins_key_arr.length; i++)
+ " )"
+ " ORDER BY ins_deelsrtcontrole_key DESC";
var oRs = Oracle.Execute(sql);
lcl.set_dialect(oRs("ctr_discipline_key").Value, "INS_TAB_DISCIPLINE_KEY");
// Waarden moeten aanwezig zijn. Mocht dat niet zo zijn dan is er iets fout.
var ins_srtcontrole_mode = oRs("ins_srtcontrole_mode").Value;
var ins_deelsrtcontrole_status = oRs("ins_deelsrtcontrole_status").Value != null? oRs("ins_deelsrtcontrole_status").Value : -1; // Als er nog geen inspectie is geweest is de status -1.

4
APPL/INS/ins_inspect_start.asp
View File

@@ -35,11 +35,13 @@ var ingesloten = [];
var dlsrtcont_key = -1;
// Bepaal de objecten/delen in de selectie die
// ook echt gestart kunnen of mogen worden.
var ctrdisc_key = -1;
for (var i = 0; i < ins_key_arr.length; i++)
{
var sql = "SELECT idsc.ins_deelsrtcontrole_key"
+ " , idsc.ins_deelsrtcontrole_status"
+ " , xcp.ins_srtcontroledl_xcp_eind vervaldatum"
+ " , isc.ctr_discipline_key"
+ " FROM ins_srtcontrole isc"
+ " , ins_deelsrtcontrole idsc"
+ " , ins_srtcontroledl_xcp xcp"
@@ -51,6 +53,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
//+ " AND idsc.ins_deelsrtcontrole_status(+) != 6"
+ " ORDER BY ins_deelsrtcontrole_datum DESC";
var oRs = Oracle.Execute(sql);
ctrdisc_key = oRs("ctr_discipline_key").Value
// Waarden moeten aanwezig zijn. Mocht dat niet zo zijn dan is er iets fout.
var ins_deelsrtcontrole_status = oRs("ins_deelsrtcontrole_status").Value != null? oRs("ins_deelsrtcontrole_status").Value : -1; // Als er nog geen inspectie is geweest is de status -1.
var ins_deelsrtcontrole_key = oRs("ins_deelsrtcontrole_key").Value;
@@ -72,6 +75,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
tobestart++;
}
}
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
user.anything_todo_or_abort(tobestart > 0); // We klagen niet over enkele wel en enkele niet
var result = {success: true, multi: multi, start: true };

3
APPL/INS/ins_search.asp
View File

@@ -76,6 +76,9 @@ var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
/***** End get webform parameters *****/
if (ctrdisc_key > 0)
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
var autfunction = "";
switch(urole)
{

2
APPL/INS/ins_search_list.asp
View File

@@ -87,6 +87,8 @@ var comp_key = getQParamInt("company", -1);
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
/***** End get webform parameters *****/
if (ctrdisc_key > 0)
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
if (!fgraph && bttype == "T")
{ // bld_key is een terrein key

2
APPL/INS/ins_show_inspect.asp
View File

@@ -72,6 +72,7 @@ user.auth_required_or_abort(this_ins.canInspShow);
+ " , di.ins_srtcontrole_mode scmode"
+ " , di.ins_srtcontrole_type sctype"
+ " , xcp.ins_srtcontroledl_xcp_eind vervaldatum"
+ " , di.ctr_discipline_key"
+ " FROM ins_v_defined_inspect di"
+ " , ins_srtcontroledl_xcp xcp"
+ " , ins_deelsrtcontrole idsc"
@@ -84,6 +85,7 @@ user.auth_required_or_abort(this_ins.canInspShow);
+ " AND idsc.ins_deelsrtcontrole_key = " + deelsrtcont_key
+ " )";
var oRs = Oracle.Execute(sql);
lcl.set_dialect(oRs("ctr_discipline_key").Value, "INS_TAB_DISCIPLINE_KEY");
eenheid = oRs("eenheid").Value;
info = oRs("info").Value;
scmode = oRs("scmode").Value;

6
APPL/INS/ins_xcp.asp
View File

@@ -68,7 +68,8 @@ var vervaldatum = null;
var opmerk;
if (srtcont_key > 0)
{
var sql = "SELECT dix.ctr_ismjob"
var sql = "SELECT dix.ctr_discipline_key"
+ " , dix.ctr_ismjob"
+ " , dix.ins_srtcontrole_eenheid"
+ " , dix.ins_deel_aantal"
+ " FROM ins_v_defined_inspect_xcp dix"
@@ -77,7 +78,10 @@ if (srtcont_key > 0)
var oRs = Oracle.Execute(sql);
isMJOB = oRs("ctr_ismjob").Value == 1;
xcp_eenheid = oRs("ins_srtcontrole_eenheid").Value;
lcl.set_dialect(oRs("ctr_discipline_key").Value, "INS_TAB_DISCIPLINE_KEY");
var aantal = oRs("ins_deel_aantal").Value;
oRs.Close();
switch (xcp_eenheid)
{

3
APPL/INS/ins_xcp_save.asp
View File

@@ -95,6 +95,7 @@ var sql = "SELECT isc.ins_srtcontrole_eenheid"
+ " , 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"
@@ -108,6 +109,8 @@ var sql = "SELECT isc.ins_srtcontrole_eenheid"
+ " 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;

12
APPL/MGT/ctr_discipline.asp
View File

@@ -31,6 +31,18 @@ scaffolding(this_model,
"ismjob"
]
},
"show": {
"requires": {
"js": ["./mgt_tools.js"]
},
"buttons": [
{
"title": L("lcl_lcl_terminologie"),
"action": "edit_terminologie",
"icon": "doc_text_image.png"
}
]
},
"wrap": {
"frames": [{ url: "fac_functie.asp?mode=list&ins_discipline={0}",
autfunction: "WEB_PRSSYS"

3
APPL/MJB/mjb_dragdropyear.asp
View File

@@ -14,6 +14,9 @@
<!-- #include file="../Shared/json2.js" -->
<!-- #include file="../Shared/selector.inc" -->
<%
var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline
if (ctrdisc_key > 0)
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
%>
<html>

24
APPL/MJB/mjb_search.asp
View File

@@ -47,12 +47,35 @@ var inflatie = getQParamFloat("inflatie", S("mjb_inflation")); // Setting ins_in
var frequentie = getQParamInt("frequentie", -1);
var toyear = getQParamInt("toyear", new Date().getFullYear() + S("mjb_show_years"));
var incbtw = getQParamInt("incbtw", 0) == 1;
var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline
if (ctrdisc_key <= 0) // Als er maar eentje is selecteer die automatisch
{
var sql = "SELECT ins_discipline_key"
+ " FROM ctr_disc_params cdp, ctr_discipline cd"
+ " WHERE cdp.ctr_ins_discipline_key = cd.ins_discipline_key"
+ " AND cd.ins_discipline_verwijder IS NULL"
+ " AND cdp.ctr_disc_params_ismjob = 1";
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{
var key = oRs("ins_discipline_key").Value;
oRs.MoveNext();
if (oRs.Eof)
ctrdisc_key = key;
}
oRs.Close();
}
if (ctrdisc_key > 0)
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
// Er zijn INSUSE en CTRUSE rechten nodig.
var autfunctionINSUSE = "WEB_INSUSE";
var authparamsINSUSE = user.checkAutorisation("WEB_INSUSE");
var autfunctionCTRUSE = "WEB_CTRUSE";
var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
%>
<html>
@@ -80,6 +103,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
<input type=hidden name="autfunctionCTRUSE" id="autfunctionCTRUSE" value="<%=autfunctionCTRUSE%>">
<input type=hidden name="alg_startlevel" value="<%=alg_startlevel%>">
<input type=hidden name="alg_endlevel" value="<%=alg_endlevel%>">
<input type=hidden name="ctrdisc_key" value="<%=ctrdisc_key%>">
<% BLOCK_START("searchtable", L("lcl_filterblok"));%>
<tr>

15
APPL/MJB/mjb_search_list.asp
View File

@@ -80,6 +80,10 @@ var inflatiefactor = 1 + (inflatiepct / 100);
var frequentie = getQParamIntArray("frequentie", []); // Array met frequenties.
var incbtw = getQParamInt("incbtw", 0) == 1; // Lijst inclusief BTW weergeven
var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline
if (ctrdisc_key > 0)
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
var params = { deel: (deel != ""? deel : null),
groep: (groep != ""? groep : null),
dist_key: dist_key,
@@ -96,8 +100,6 @@ var params = { deel: (deel != ""? deel : null),
mjbincbtw: incbtw
};
var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrole", "inflatie", "frequentie", "incbtw", "toyear", "alg_startlevel", "alg_endlevel", "deel", "groep"]);
// lcl.set_dialect(1 /* ctr_discipline */, "CTR_DISCIPLINE_KEY");
%>
<html>
<head>
@@ -150,6 +152,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
{ drop: function(event, ui)
{
$td = $(this);
$td.css('border', '3px solid grey');
// Zoek de TH erbij. Daarin staat het drop-jaartal
var $th = $td.closest('table').find('th').eq($td.index()); // werkt omdat we geen colspan's hebben
var row = $td.closest('tr')[0];
@@ -165,8 +168,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
element.draggable(
{
scroll: false,
axis: "x",
revert: true
axis: "x"
});
});
})
@@ -192,7 +194,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
mjbSrtContrKeyArray.push(rowdata.insSrtControleKey);
}
url = "../mjb/mjb_dragdropyear.asp";
url = "../mjb/mjb_dragdropyear.asp?ctrdisc_key=" + ctrdisc_key;
FcltMgr.openModalDetail(url, L("lcl_mjb_dragdrop_years"), {callback: dragDropCallback});
}
</script>
@@ -278,7 +280,8 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
+ " 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 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(",") + ")"
: "")

2
APPL/Shared/default.csx
View File

@@ -2761,7 +2761,7 @@ body.likemodal {
#mod_rejectoffertebody {width:600px;}
#mod_acceptofferte {width:600px;}
#besrejectbody {width:500px;}
#localebody {width:550px;}
#localebody {width:800px;}
#mod_mldcontinue {width:600px;}
#mod_mlddouble {width:950px;}
#mod_mldclose {width:600px;}