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

FCLT#66478 tracking in eigen subtab

Browse Source 
svn path=/Website/trunk/; revision=50626
This commit is contained in:
Peter Feij
2021-04-02 10:16:33 +00:00
parent 21c58d82ea
commit c1d6f04fa4
7 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/INS/ins_deel.asp
View File

@@ -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(); %>

18
APPL/INS/ins_edit_inspect.asp
View File

@@ -628,11 +628,11 @@ if (!catclose && 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_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
%><div id='insFlexList'><% // Wrapper div voor dynamisch herladen
%><div id='insFlex2'><% // Wrapper div voor dynamisch herladen
generateFlexKenmerkBlock({deelsrtcontrole_key: (!multi && ingeslotendsc[0] > 0? ingeslotendsc[0] : -1),
srtcontrole_key: ingeslotensc[0],

7
APPL/INS/ins_inspect.asp
View File

@@ -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(); %>
</body>

6
APPL/INS/ins_show_deel.asp
View File

@@ -384,11 +384,7 @@ oRs.Close();
Response.write("<td class='ins_deel'><span class='wrapper-span'><img id='photo' style='cursor: pointer;' class='ins_deel' src='" + safe.htmlattr(this_photoinfo.photopath) + "'>" + (true ? "<span id='editAnim' class='pencilEdit pencilEditAlignBottom' title='" + L("lcl_change") + "' onclick='edit_photo(this)'>" + I("fa-pencil-alt") + "</span>" : "") + "</span></td>");
}
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 + ")");

12
APPL/INS/ins_show_inspect.asp
View File

@@ -238,7 +238,7 @@ user.auth_required_or_abort(this_ins.canInspShow);
IFRAMER_HEADER(titletext + " " + desc, buttons);
%>
<form name="u2" onSubmit="return false;">
<% 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)

6
APPL/INS/ins_show_srtdeel.asp
View File

@@ -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 }});

10
APPL/INS/ins_srtdeel.asp
View File

@@ -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%>";
<% } %>
}
</script>
@@ -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(); %>
</body>