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

STAM#40885 mld_stdmelding_search -> van melding suggest een search veld gemaakt

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34226
This commit is contained in:
Koen Reefman
2017-06-12 14:30:27 +00:00
parent c7ada83e5f
commit 8c202b7a67
2 changed files with 14 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
APPL/MLD/mld_stdmelding_search.asp
View File

@@ -52,24 +52,16 @@ if (disc_key > -1 && srtdisc_key < 0)
function onChangeVakgroep(vakgroep_key)
{
sgStdm.setValue(-1, "", true, false, null, true);
sgStdm.CheckJustOne();
// Zet de srtdiscipline indien niet ingevuld.
if (vakgroep_key > 0)
{
$.getJSON("./get_mld_info_ajax.asp",
{ req_info: "mld_discipline",
mld_ins_discipline_key: vakgroep_key },
callback_disc_info);
callback_disc_info);
}
}
function onChangeShowExpired()
{ // Is de juiste waarde nog geldig i.v.m. wijzigen van de checkbox "Toon vervallen".
sgStdm.setValue($("#stdm").val(), $("#show_stdm").val(), true, true);
}
function callback_disc_info(disc_info, textStatus, jqXHR)
{
if ($("#srtdisc_key").val() <= 0)
@@ -146,7 +138,7 @@ if (disc_key > -1 && srtdisc_key < 0)
trclass: "primsearch",
emptyOption: "",
selectjustone: true,
onChange: "sgDisc.setValue(-1, '');sgStdm.setValue(-1, '')",
onChange: "sgDisc.setValue(-1, '')",
readonly: srtdisc_key > -1 || disc_key > -1
});
@@ -164,22 +156,13 @@ if (disc_key > -1 && srtdisc_key < 0)
onChange: "onChangeVakgroep",
readonly: disc_key > -1
});
// Melding / Stdmelding
FCLTstdmeldingselector("stdm",
"sgStdm",
{ stdmelding_key: stdm_key,
label: L("lcl_complain"),
trclass: "primsearch",
perslidKey: user_key,
autfunctionKey: -1, // alles is toegestaan! authparams.autfunctionkey,
urlAdd: [{urlParam: "disc_key", field: "disc_key"},
{urlParam: "srtdisc_key", field: "srtdisc_key"},
{urlParam: "show_expired", field: "show_expired"}],
onChange: "onChangeStdMelding",
whenEmpty: L("lcl_search_generic") // blijkt niet supported
});
%>
// Melding / Stdmelding %>
<tr class="primsearch">
<td class="label"><label for="stdm"><%=L("lcl_complain")%>:</label></td>
<td>
<input type="text" class="fldsrch wildcard" name="stdm" value="">
</td>
</tr>
</table>
</td><!-- end column 1 -->

23
APPL/MLD/mld_stdmelding_search_list.asp
View File

@@ -18,7 +18,7 @@
var searchtext = getQParam("searchtext", null);
var srtdisc_key = getQParamInt("srtdisc_key", -1);
var disc_key = getQParamInt("disc_key", -1);
var stdm_key = getQParamInt("stdm", -1);
var stdm = getQParam("stdm", "");
var mldgrp_key = getQParamInt("mldgrp_key", -1);
var kenmerktype = getQParam("kenmerktype", null);
var kenmerk_niveau = getQParam("niveau", null);
@@ -68,22 +68,11 @@ oRs.Close();
FcltMgr.openModalDetail(url, scfKeyString.split(",").length + " "+ L("lcl_mld_stdmeldingen"), { callback: scf_reload });
}
*/
</script>
</script>
</head>
<body>
<%
if (stdm_key > 0)
{
var sql = "SELECT ins_discipline_key,"
+ " m2.ins_srtdiscipline_key"
+ " FROM mld_stdmelding md, mld_discipline m2"
+ " WHERE md.mld_ins_discipline_key = m2.ins_discipline_key"
+ " AND mld_stdmelding_key = " + stdm_key;
var oRs = Oracle.Execute(sql);
var dkey = oRs("ins_discipline_key").Value;
var skey = oRs("ins_srtdiscipline_key").Value;
}
if (disc_key > 0)
{
var sql = "SELECT m2.ins_srtdiscipline_key"
@@ -141,13 +130,11 @@ oRs.Close();
: " AND (sm.mld_stdmelding_vervaldatum IS NULL OR"
+ " sm.mld_stdmelding_vervaldatum > SYSDATE)");
if (stdm_key > 0)
if (stdm != "")
{
sql += " AND sm.mld_stdmelding_key = " + stdm_key
+ " AND md.ins_discipline_key = " + dkey
+ " AND isd.ins_srtdiscipline_key = " + skey;
sql += " AND sm.mld_stdmelding_upper LIKE " + safe.quoted_sql_wild("%" + stdm + "%");
}
else if (disc_key > 0)
if (disc_key > 0)
{
sql += " AND md.ins_discipline_key = " + disc_key
+ " AND isd.ins_srtdiscipline_key = " + skey;