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

FSN#37789 Bewerken van een inspectie meer context tonen

Browse Source 
svn path=/Website/trunk/; revision=30803
This commit is contained in:
Jos Groot Lipman
2016-09-21 15:45:17 +00:00
parent c122640271
commit c78899d055
2 changed files with 71 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
APPL/INS/ins_edit_inspect.asp
View File

@@ -111,6 +111,30 @@ for (var i = 0; i < ins_key_arr.length; i++)
}
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
if (ins_key_arr.length == 1)
{
sql = "SELECT d.ins_deel_omschrijving" // identificatie
+ " , s.ins_srtdeel_code"
+ " , " + lcl.xsqla('s.ins_srtdeel_omschrijving', 's.ins_srtdeel_key')
+ " , " + lcl.xsqla('g.ins_srtgroep_omschrijving', 'g.ins_srtgroep_key')
+ " , " + lcl.xsqla('dis.ins_discipline_omschrijving', 'dis.ins_discipline_key')
+ " FROM ins_deel d"
+ " , ins_srtdeel s"
+ " , ins_srtgroep g"
+ " , ins_tab_discipline dis"
+ " WHERE ins_deel_key = " + ins_key_arr[0]
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND s.ins_srtgroep_key = g.ins_srtgroep_key"
+ " AND g.ins_discipline_key = dis.ins_discipline_key";
oRs = Oracle.Execute(sql);
var desc = oRs("ins_deel_omschrijving").Value;
var srtcode = oRs("ins_srtdeel_code").Value;
var sort = oRs("ins_srtdeel_omschrijving").Value;
var group = oRs("ins_srtgroep_omschrijving").Value;
var disc = oRs("ins_discipline_omschrijving").Value;
oRs.Close();
}
%>
<html>
@@ -441,6 +465,13 @@ user.anything_todo_or_abort(tobehandled > 0); // We klagen niet over enkele wel
<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") : (insEdit? L("lcl_change") : L("lcl_show"))));
BLOCK_START("insMultiEdit", blocktext);
if (ins_key_arr.length == 1)
{
ROFIELDTR("flddeel", L("lcl_obj_identification"), desc, params);
ROFIELDTR("fld", L("lcl_discipline"), disc);
ROFIELDTR("fld", L("lcl_obj_group"), group);
ROFIELDTR("fld", L("lcl_obj_sort"), sort + " (" + srtcode + ")");
}
if (!multi)
{ // Inspecteren van <20><>n object met <20><>n of meerdere soortcontroles
var sql = "SELECT *"

48
APPL/INS/ins_show_inspect.asp
View File

@@ -93,6 +93,36 @@ user.auth_required_or_abort(this_ins.canInspShow);
vervaldatum = oRs("vervaldatum").Value != null? new Date(oRs("vervaldatum").Value) : null;
vervallen = vervaldatum != null && vervaldatum < new Date();
sql = "SELECT d.ins_deel_omschrijving" // identificatie
+ " , s.ins_srtdeel_code"
+ " , " + lcl.xsqla('s.ins_srtdeel_omschrijving', 's.ins_srtdeel_key')
+ " , " + lcl.xsqla('g.ins_srtgroep_omschrijving', 'g.ins_srtgroep_key')
+ " , " + lcl.xsqla('dis.ins_discipline_omschrijving', 'dis.ins_discipline_key')
+ " FROM ins_deel d"
+ " , ins_srtdeel s"
+ " , ins_srtgroep g"
+ " , ins_tab_discipline dis"
+ " WHERE ins_deel_key = " + ins_key
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND s.ins_srtgroep_key = g.ins_srtgroep_key"
+ " AND g.ins_discipline_key = dis.ins_discipline_key";
oRs = Oracle.Execute(sql);
var desc = oRs("ins_deel_omschrijving").Value;
var srtcode = oRs("ins_srtdeel_code").Value;
var sort = oRs("ins_srtdeel_omschrijving").Value;
var group = oRs("ins_srtgroep_omschrijving").Value;
var disc = oRs("ins_discipline_omschrijving").Value;
oRs.Close();
var titletext;
switch(sctype)
{
case 1: titletext = L("lcl_ins_srtcontrole_insp"); break;
case 2: titletext = L("lcl_ins_srtcontrole_repl"); break;
case 3: titletext = L("lcl_ins_srtcontrole_cert"); break;
default: titletext = L("lcl_menu_ins_controle"); break;
}
%>
<script type="text/javascript">
function ins_start()
@@ -147,6 +177,11 @@ user.auth_required_or_abort(this_ins.canInspShow);
{ // Meldbron "Inspection" meegeven (mld_meldbron_key = 10).
FcltMgr.openDetail("appl/mld/mld_melding.asp?urole=fo&meldbronkey=10&ins_key=<%=ins_key%>", "<%=L("lcl_add")%>");
}
//var title = params.srtcontrole_type == 1? L("lcl_ins_srtcontrole_insp") : (params.srtcontrole_type == 2? L("lcl_ins_srtcontrole_repl") : L("lcl_ins_srtcontrole_cert"));
FcltMgr.setTitle("<%=titletext + " " + safe.jsstring(desc)%>", {hot: false});
</script>
</head>
@@ -210,19 +245,16 @@ user.auth_required_or_abort(this_ins.canInspShow);
//buttons.push({title: L("lcl_cancel"), icon: "undo.png", action: "ins_cancel()"});
var titletext;
switch(sctype)
{
case 1: titletext = L("lcl_ins_srtcontrole_insp"); break;
case 2: titletext = L("lcl_ins_srtcontrole_repl"); break;
case 3: titletext = L("lcl_ins_srtcontrole_cert"); break;
default: titletext = L("lcl_menu_ins_controle"); break;
}
IFRAMER_HEADER(titletext, buttons);
%>
<form name="u2" onSubmit="return false;">
<% BLOCK_START("insShow", L("lcl_show"));
ROFIELDTR("flddeel", L("lcl_obj_identification"), desc, params);
ROFIELDTR("fld", L("lcl_discipline"), disc);
ROFIELDTR("fld", L("lcl_obj_group"), group);
ROFIELDTR("fld", L("lcl_obj_sort"), sort + " (" + srtcode + ")");
var sql = " SELECT isc.ins_srtcontrole_key"
+ " , " + lcl.xsqla('isc.ins_srtcontrole_omschrijving', 'isc.ins_srtcontrole_key')
+ " FROM ins_srtcontrole isc"