diff --git a/APPL/INS/ins_edit_inspect.asp b/APPL/INS/ins_edit_inspect.asp index fd9504fa79..514efd1cbf 100644 --- a/APPL/INS/ins_edit_inspect.asp +++ b/APPL/INS/ins_edit_inspect.asp @@ -452,7 +452,7 @@ if (ins_key_arr.length == 1) case 3: titletext = L("lcl_ins_srtcontrole_cert"); break; default: titletext = L("lcl_menu_ins_controle"); break; } - IFRAMER_HEADER(titletext, buttons); + IFRAMER_HEADER(titletext + " " + safe.html(desc), buttons); %>
&srtcont_key_arr=<%=ingeslotensc.join(",")%>" method="post"> "> @@ -463,14 +463,14 @@ if (ins_key_arr.length == 1) <% } %> -<% var blocktext = (insPlan? L("lcl_ins_schedule") : (insClose? L("lcl_ins_close") + "/" + L("lcl_ins_finish") : (insEdit? L("lcl_change") : L("lcl_show")))); +<% var blocktext = (insPlan? L("lcl_ins_schedule") : (insClose? L("lcl_ins_close") + "/" + L("lcl_ins_finish") : L("lcl_details") )); 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 + ")"); + //ROFIELDTR("flddeel", L("lcl_obj_identification"), desc); + //ROFIELDTR("fld", L("lcl_discipline"), disc); + //ROFIELDTR("fld", L("lcl_obj_group"), group); + ROFIELDTR("fld", L("lcl_obj_sort"), sort ); } if (!multi) { // Inspecteren van één object met één of meerdere soortcontroles @@ -811,7 +811,7 @@ if (ins_key_arr.length == 1) <% if (!multi) { - BLOCK_START("insFlex2", L("lcl_ins_additional_details")); //block over gehele breedte + BLOCK_START("insFlex2", ""); //block over gehele breedte %>
<% // Wrapper div voor dynamisch herladen generateFlexKenmerkBlock({deelsrtcontrole_key: (!multi && ingeslotendsc[0] > 0? ingeslotendsc[0] : -1), diff --git a/APPL/INS/ins_show_inspect.asp b/APPL/INS/ins_show_inspect.asp index 3477e24dc4..0a4dc8a251 100644 --- a/APPL/INS/ins_show_inspect.asp +++ b/APPL/INS/ins_show_inspect.asp @@ -96,22 +96,14 @@ user.auth_required_or_abort(this_ins.canInspShow); 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"; + + " AND d.ins_srtdeel_key = s.ins_srtdeel_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; @@ -245,15 +237,12 @@ switch(sctype) //buttons.push({title: L("lcl_cancel"), icon: "undo.png", action: "ins_cancel()"}); - IFRAMER_HEADER(titletext, buttons); + IFRAMER_HEADER(titletext + " " + safe.html(desc), buttons); %> -<% BLOCK_START("insShow", L("lcl_show")); +<% BLOCK_START("insShow", L("lcl_details")); - 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 + ")"); + ROFIELDTR("fld", L("lcl_obj_sort"), sort ); var sql = " SELECT isc.ins_srtcontrole_key" + " , " + lcl.xsqla('isc.ins_srtcontrole_omschrijving', 'isc.ins_srtcontrole_key') @@ -357,7 +346,7 @@ switch(sctype) <% - BLOCK_START("insFlex2", L("lcl_ins_additional_details")); //block over gehele breedte + BLOCK_START("insFlex2", ""); //block over gehele breedte, liefst niet indien leeg TODO %>
<% // Wrapper div voor dynamisch herladen generateFlexKenmerkBlock({deelsrtcontrole_key: deelsrtcont_key,