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

FSN#44509 Buttons moeten luisteren naar de daarvoor gedefinieerde condities. (en Home-knop tbv app)

Browse Source 
svn path=/Website/branches/v2017.2/; revision=35571
This commit is contained in:
Peter Feij
2017-10-05 10:03:50 +00:00
parent f63774bf8a
commit 2ac840d57c
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
APPL/PDA/ins_inspect.asp
View File

@@ -564,7 +564,7 @@ else
// Dan taakafhandeling (controle_mode) tonen als: // Dan taakafhandeling (controle_mode) tonen als:
// a) De status is "In behandeling(2)" of "Gereed gemeld (5)". // a) De status is "In behandeling(2)" of "Gereed gemeld (5)".
// b) De status "In behandeling(2)" is uitgeschakeld. // b) De status "In behandeling(2)" is uitgeschakeld.
if (ins_deelsrtcontrole_status == 2 || ins_deelsrtcontrole_status == 5 || ((isc_options & 2) != 2)) if (ins_deelsrtcontrole_status == 2 || ins_deelsrtcontrole_status == 5 || this_ins.canInspStart)
{ {
ROFIELD("sel_srtcontrole_oms", L("lcl_ins_controle"), srtcontrole_oms, {}); ROFIELD("sel_srtcontrole_oms", L("lcl_ins_controle"), srtcontrole_oms, {});
@@ -606,21 +606,21 @@ else
{ {
case -1: case -1:
case 6: // Geen inplannen van inspecties bij mobiel. case 6: // Geen inplannen van inspecties bij mobiel.
case 0: if ((isc_options & 2) == 2) case 0: if (this_ins.canInspStart)
BUTTON(L("lcl_ins_start"), {click: "ins_start()", dataicon: "clock"}); BUTTON(L("lcl_ins_start"), {click: "ins_start()", dataicon: "clock"});
else else
{ {
if ((isc_options & 4) == 4) if (ins_deelsrtcontrole_status == 2 && this_ins.canInspClose)
BUTTON(L("lcl_ins_close"), {click: "ins_submit('C')", dataicon: "comment"}); BUTTON(L("lcl_ins_close"), {click: "ins_submit('C')", dataicon: "comment"});
if ((isc_options & 8) == 8) if (ins_deelsrtcontrole_status == 2 && this_ins.canInspFinish)
BUTTON(L("lcl_ins_finish"), {click: "ins_submit('F')", dataicon: "check"}); BUTTON(L("lcl_ins_finish"), {click: "ins_submit('F')", dataicon: "check"});
} }
break; break;
case 2: case 2:
case 5: BUTTON(L("lcl_submit"), {click: "ins_submit('E')", dataicon: "refresh"}); case 5: BUTTON(L("lcl_submit"), {click: "ins_submit('E')", dataicon: "refresh"});
if (ins_deelsrtcontrole_status == 2 && ((isc_options & 4) == 4)) if (ins_deelsrtcontrole_status == 2 && this_ins.canInspClose)
BUTTON(L("lcl_ins_close"), {click: "ins_submit('C')", dataicon: "comment"}); BUTTON(L("lcl_ins_close"), {click: "ins_submit('C')", dataicon: "comment"});
if ((isc_options & 8) == 8) if (this_ins.canInspFinish)
BUTTON(L("lcl_ins_finish"), {click: "ins_submit('F')", dataicon: "check"}); BUTTON(L("lcl_ins_finish"), {click: "ins_submit('F')", dataicon: "check"});
break; break;
} }
@@ -659,7 +659,7 @@ else
FOOTER(); FOOTER();
PAGE_END(); PAGE_END();
PAGE_START({id: "ins-2-"+ins_key, dialog: true}) PAGE_START({id: "ins-2-"+ins_key, dialog: true})
HEADER({title: srtcontrole_oms, back: false, nohome: true}) ; HEADER({title: srtcontrole_oms, back: true, nohome: true}) ;
CONTENT_START(); CONTENT_START();
ROFIELD("fclthtml", "", srtcontrole_info, {multi: true}); ROFIELD("fclthtml", "", srtcontrole_info, {multi: true});
CONTENT_END(); CONTENT_END();
@@ -677,7 +677,6 @@ else
function fncolLink_hist(oRs) function fncolLink_hist(oRs)
{ {
qry_params.deelsrtcontrole_key = oRs("ins_deelsrtcontrole_key").Value; qry_params.deelsrtcontrole_key = oRs("ins_deelsrtcontrole_key").Value;
//return "#ins-4-"+ins_key;
return "../pda/ins_inspect_hist.asp?ins_key=" + ins_key + "&deelsrtcontrole_key=" + oRs("ins_deelsrtcontrole_key").Value; return "../pda/ins_inspect_hist.asp?ins_key=" + ins_key + "&deelsrtcontrole_key=" + oRs("ins_deelsrtcontrole_key").Value;
}; };
function fnPrefix_hist(oRs) function fnPrefix_hist(oRs)
@@ -727,15 +726,6 @@ else
CONTENT_END(); CONTENT_END();
PAGE_END(); PAGE_END();
PAGE_START({id: "ins-4-"+ins_key});
HEADER({title: "Vorige inspecties", back: true, nohome: true});
CONTENT_START();
CONTENT_END();
PAGE_END();
%> %>
</body> </body>
</html> </html>