diff --git a/APPL/INS/ins_deel.asp b/APPL/INS/ins_deel.asp index 380b0d7b57..f8a4ed6c36 100644 --- a/APPL/INS/ins_deel.asp +++ b/APPL/INS/ins_deel.asp @@ -250,6 +250,12 @@ if (ins_key > 0) page = "ins_show_note2.asp?ins_key=" + ins_key; IFRAMER("noteframe", page, { refreshOnClose: true, sidebar: true } ); } + // tracking naar subframe :-) + if (true) // iedereen die het object mag zien, mag ook de mutaties zien + { + page = protectQS.create("../shared/status_info.asp?ins_key=" + ins_key + "&urole=" + urole); + IFRAMER("inshistoryframe", page, { icon: "fa-list", title: L("lcl_history")} ); + } %> <% PAGE_END(); %> diff --git a/APPL/INS/ins_edit_inspect.asp b/APPL/INS/ins_edit_inspect.asp index 467a7ad5ee..69b77b29ae 100644 --- a/APPL/INS/ins_edit_inspect.asp +++ b/APPL/INS/ins_edit_inspect.asp @@ -628,11 +628,11 @@ if (!catclose && ins_key_arr.length == 1) <% } %> -<% var blocktext = (insPlan? L("lcl_ins_schedule") : (insClose? L("lcl_ins_stop") : L("lcl_details") )) +<% var blocktext = (insPlan? L("lcl_ins_schedule") : (insClose? L("lcl_ins_stop") : L("lcl_ins_controle_srt") )) + (multi || catclose ? " (" + L("lcl_count") + ":" + tobehandled + ")" : ""); - BLOCK_START("insMultiEdit", blocktext); + BLOCK_START("insMultiEdit", blocktext , {icon: "fa-calendar-check"}); if (!catclose && ins_key_arr.length == 1) { ROFIELDTR("fld", L("lcl_obj_sort"), sort ); @@ -674,17 +674,7 @@ if (!catclose && ins_key_arr.length == 1) ROTEXTAREATR("fldtxt", L("lcl_ins_info"), info, {html: "rows='3'", trclass: "invoerinsp", id: "srtcontrole_info", suppressEmpty: true }); } - // Status tonen. - var params = {}; - if (!catclose && !multi && ingeslotendsc[0] > 0) - { - params = { infoPointer: { Url: "appl/shared/status_info.asp?insc_key=" + ingeslotendsc[0] + "&urole=bo", - Title: L("lcl_status_details") + " " + ingeslotendsc[0] - } - } - } - params.suppressEmpty = true; - ROFIELDTR("fld", L("lcl_ins_status"), status_str, params); + ROFIELDTR("fld", L("lcl_ins_status"), status_str, {suppressEmpty: true }); if (!catclose) @@ -1074,7 +1064,7 @@ if (!catclose && ins_key_arr.length == 1) if (!catclose) { //BLOCK_START("insFlex2", ""); //block over gehele breedte - %>
<% // Wrapper div voor dynamisch herladen + %>
<% // Wrapper div voor dynamisch herladen generateFlexKenmerkBlock({deelsrtcontrole_key: (!multi && ingeslotendsc[0] > 0? ingeslotendsc[0] : -1), srtcontrole_key: ingeslotensc[0], diff --git a/APPL/INS/ins_inspect.asp b/APPL/INS/ins_inspect.asp index 2bfdb74402..3b0f0b64b1 100644 --- a/APPL/INS/ins_inspect.asp +++ b/APPL/INS/ins_inspect.asp @@ -106,6 +106,13 @@ var transitParam = buildTransitParam(["deelsrtcont_keys"]); IFRAMER("inscontmldframe", page, { icon: "fa-list" } ); } } + // tracking naar subframe :-) + if (true) // iedereen die het object mag zien, mag ook de mutaties zien + { + page = protectQS.create("../shared/status_info.asp?insc_key=" + deelsrtcont_key + "&urole=bo"); + IFRAMER("inschistoryframe", page, { icon: "fa-list", title: L("lcl_history")} ); + } + %> <% PAGE_END(); %> diff --git a/APPL/INS/ins_show_deel.asp b/APPL/INS/ins_show_deel.asp index 5e7d88d298..183dc40b88 100644 --- a/APPL/INS/ins_show_deel.asp +++ b/APPL/INS/ins_show_deel.asp @@ -384,11 +384,7 @@ oRs.Close(); Response.write("" + (true ? "" + I("fa-pencil-alt") + "" : "") + ""); } - var params = { infoPointer: { Url: "appl/shared/status_info.asp?ins_key=" + ins_key + "&urole=" + urole, - Title: L("lcl_status_details") + " " + desc - } - } - ROFIELDTR("flddeel", L("lcl_obj_identification"), desc, params); + 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 + " (" + srtcode + ")"); diff --git a/APPL/INS/ins_show_inspect.asp b/APPL/INS/ins_show_inspect.asp index adf0f5156a..8973758ee6 100644 --- a/APPL/INS/ins_show_inspect.asp +++ b/APPL/INS/ins_show_inspect.asp @@ -238,7 +238,7 @@ user.auth_required_or_abort(this_ins.canInspShow); IFRAMER_HEADER(titletext + " " + desc, buttons); %>
-<% BLOCK_START("insShow", L("lcl_details")); +<% BLOCK_START("insShow", L("lcl_ins_controle_srt"), {icon: "fa-calendar-check"}); ROFIELDTR("fld", L("lcl_obj_sort"), sort ); @@ -253,14 +253,8 @@ user.auth_required_or_abort(this_ins.canInspShow); ROTEXTAREATR("fldtxt", L("lcl_ins_info"), info, {html: "rows='3'", trclass: "invoerinsp", id: "srtcontrole_info", suppressEmpty: true }); - // Status tonen. - var params = {}; - params = { infoPointer: { Url: "appl/shared/status_info.asp?insc_key=" + deelsrtcont_key + "&urole=bo", - Title: L("lcl_status_details") + " " + deelsrtcont_key - } - } - params.suppressEmpty = true; - ROFIELDTR("fld", L("lcl_ins_status"), deelsrtcontrole_status_str, params); + + ROFIELDTR("fld", L("lcl_ins_status"), deelsrtcontrole_status_str, {suppressEmpty : true}); if (deelsrtcontrole_status == 0 || deelsrtcontrole_status == 2) if (deelsrtcontrole_plandatum) diff --git a/APPL/INS/ins_show_srtdeel.asp b/APPL/INS/ins_show_srtdeel.asp index a67a8cfb91..476e79c499 100644 --- a/APPL/INS/ins_show_srtdeel.asp +++ b/APPL/INS/ins_show_srtdeel.asp @@ -108,11 +108,7 @@ oRs.close(); BLOCK_START("insIns", L("lcl_inssrt_general_info"), {icon: "fa-tag"}); ROFIELDTR("fld", L("lcl_discipline"), srtdeel.discipline_omschrijving); ROFIELDTR("fld", L("lcl_obj_group"), srtdeel.groep_omschrijving); - var params = { infoPointer: { Url: "appl/shared/status_info.asp?srtdeel_key=" + srtdeel_key + "&urole=" + urole, - Title: L("lcl_status_details") + " " + srtdeel.srtdeel_code - } - } - ROFIELDTR("fld", L("lcl_obj_srtdeel_code"), srtdeel.srtdeel_code, params); + ROFIELDTR("fld", L("lcl_obj_srtdeel_code"), srtdeel.srtdeel_code); ROFIELDTR("fld", L("lcl_descr"), srtdeel.srtdeel_omschrijving, { translate: { fld: "ins_srtdeel_omschrijving", key : srtdeel_key }}); diff --git a/APPL/INS/ins_srtdeel.asp b/APPL/INS/ins_srtdeel.asp index 9e12b2fc72..abeec6b88f 100644 --- a/APPL/INS/ins_srtdeel.asp +++ b/APPL/INS/ins_srtdeel.asp @@ -78,7 +78,7 @@ if (srtdeel_key > 0) FcltMgr.closeDetail(window, { close: true}) } if (!params.keepForm) - $("#ins_Frame")[0].src = "ins_show_srtdeel.asp?srtdeel_key=<%=srtdeel_key%>"; + $("#srtdeelframe")[0].src = "ins_show_srtdeel.asp?srtdeel_key=<%=srtdeel_key%>"; <% } %> } @@ -93,7 +93,13 @@ if (srtdeel_key > 0) var page = "ins_show_srtdeel.asp"; page += "?srtdeel_key=" + srtdeel_key + transitParam; - IFRAMER("ins_Frame", page, { FcltClose: "ins_Close" } ); + IFRAMER("srtdeelframe", page, { FcltClose: "ins_Close" } ); + // tracking naar subframe :-) + if (true) // iedereen die het object mag zien, mag ook de mutaties zien + { + page = protectQS.create("../shared/status_info.asp?srtdeel_key=" + srtdeel_key + "&urole=bo"); + IFRAMER("srtinshistoryframe", page, { icon: "fa-list", title: L("lcl_tracking")} ); + } %> <% PAGE_END(); %>