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

FSN#36259: Als ik een inspectie doe via mobile dan kom ik na het afmelden in leeg scherm.

Browse Source 
svn path=/Website/trunk/; revision=29298
This commit is contained in:
Maykel Geerdink
2016-05-04 11:48:32 +00:00
parent 9bffb5f590
commit c4512fa07f
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
APPL/PDA/ins_inspect.asp
View File

@@ -23,6 +23,8 @@
// Get parameters
var ins_key = getQParamInt("ins_key", -1);
var today = getQParamInt("today", -1);
var nested = getQParamInt("nested", 0);
nested++;
var alg_ruimte_key = getQParamInt("alg_ruimte_key", -1);
var srtcontrole_key = getQParamInt("srtcontrole_key", -1);
var deelsrtcont_key = getQParamInt("deelsrtcont_key", -1); // Bestaande inspectie
@@ -71,6 +73,7 @@ if (srtcontrole_key < 0)
var sql = "SELECT COUNT (isc.ins_srtcontrole_key) aantal_srtcontoles"
+ " , MIN(isc.ins_srtcontrole_key) min_srtcontrole_key"
+ " , id.ins_deel_omschrijving"
+ " , fac.nextcyclusdatedeel (id.ins_deel_key, isc.ins_srtcontrole_key, 1)"
+ " FROM ins_deel id"
+ " , ins_srtdeel s"
+ " , ins_srtcontrole isc"
@@ -82,8 +85,19 @@ if (srtcontrole_key < 0)
+ " OR isc.ins_srtcontrole_niveau = 'D'"
+ " AND isc.ins_srtinstallatie_key = id.ins_discipline_key)"
+ " AND id.ins_deel_key = " + ins_key
+ (today != -1 ? " AND TRUNC(FAC.nextcyclusdatedeel (id.ins_deel_key, isc.ins_srtcontrole_key, 1)) <= TRUNC(sysdate) " : "")
+ " GROUP BY id.ins_deel_omschrijving";
+ (today != -1
? " AND (TRUNC(FAC.nextcyclusdatedeel (id.ins_deel_key, isc.ins_srtcontrole_key, 1)) <= TRUNC(sysdate) "
+ " OR (SELECT idsc1.ins_deelsrtcontrole_status"
+ " FROM ins_deelsrtcontrole idsc1"
+ " WHERE idsc1.ins_deelsrtcontrole_key = (SELECT MAX(idsc2.ins_deelsrtcontrole_key)"
+ " FROM ins_deelsrtcontrole idsc2"
+ " WHERE idsc2.ins_deel_key = id.ins_deel_key"
+ " AND idsc2.ins_srtcontrole_key = isc.ins_srtcontrole_key)) < 6"
+ " )"
: "")
+ " GROUP BY id.ins_deel_omschrijving"
+ " , id.ins_deel_key"
+ " , isc.ins_srtcontrole_key";
var oRs = Oracle.Execute(sql);
if (oRs.Eof) // er is niets over
{
@@ -95,7 +109,8 @@ if (srtcontrole_key < 0)
</head>
<body>
<script>
FcltMgr.closeDetail(window);
// Terug naar de lijst
window.history.go(-<%=nested%>); // Aantal schermen terug.
</script>
</body>
<%
@@ -310,7 +325,7 @@ else
jqToast(L("lcl_mobile_data_saved"));
if (json.start || json.finish || json.savemode != "E")
FcltMgr.reload();
FcltMgr.reload({appendurl: "nested=<%=nested%>"});
}
}