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

FCLT#55353: INS/CTR: Taakafhandeling onterecht in beeld bij inplannen taak.

Browse Source 
svn path=/Website/trunk/; revision=39812
This commit is contained in:
Maykel Geerdink
2018-11-15 13:02:44 +00:00
parent b65ef5bb23
commit 24b27633e4
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
APPL/INS/ins_edit_inspect.asp
View File

@@ -933,6 +933,21 @@ if (!catclose && ins_key_arr.length == 1)
)
});
}
sql = "SELECT ins_controlemode_key"
+ " , " + lcl.xsqla('ins_controlemode_oms', 'ins_controlemode_key')
+ " FROM ins_controlemode"
+ " WHERE ins_srtcontrole_type = " + sctype
+ " ORDER BY 2";
// Methode is voor de status Afgemeld(5) en Historie/Verwerkt(6) altijd ingevuld.
FCLTselector("sel_controlemode",
sql,
{ label: L("lcl_ins_controle_mode"),
initKey: inspect_data.controlemode_key, // Als de controle mode bij multi verschillend is, dan is deze waarde -1.
emptyOption: L("lcl_select_controlemode"),
required: true,
readonly: (insEdit && !canMsuEdit) // Er geldt al (insEdit && insstatus >= 5). In status 5 en 6 met INSMSU rechten mag ik de methode aanpassen (canMsuEdit).
});
}
else if (catclose)
{
@@ -952,29 +967,6 @@ if (!catclose && ins_key_arr.length == 1)
readonly: true
});
%> <input type="hidden" id="deelsrtcontrole_datum" name="deelsrtcontrole_datum" value="<%=new Date().getTime()%>">
<% }
if (!catclose)
{
sql = "SELECT ins_controlemode_key"
+ " , " + lcl.xsqla('ins_controlemode_oms', 'ins_controlemode_key')
+ " FROM ins_controlemode"
+ " WHERE ins_srtcontrole_type = " + sctype
+ " ORDER BY 2";
// Methode is voor de status Afgemeld(5) en Historie/Verwerkt(6) altijd ingevuld.
FCLTselector("sel_controlemode",
sql,
{ label: L("lcl_ins_controle_mode"),
initKey: inspect_data.controlemode_key, // Als de controle mode bij multi verschillend is, dan is deze waarde -1.
emptyOption: L("lcl_select_controlemode"),
required: true,
readonly: (insEdit && !canMsuEdit) // Er geldt al (insEdit && insstatus >= 5). In status 5 en 6 met INSMSU rechten mag ik de methode aanpassen (canMsuEdit).
});
}
else
{
%>
<tr><td><%=L("lcl_ins_controle_mode")%>:</td></tr>
<%
for (var i = 1; i <= 3; i++)
@@ -1015,6 +1007,7 @@ if (!catclose && ins_key_arr.length == 1)
}
}
}
%>
<script type="text/javascript">
var dsc_is_afgemeld = <%=dsc_is_afgemeld? 1 : 0%> == 1;