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

SVRZ#56894 De prerequisite blurt niet meer en de zoekterm wordt in acht genomen

Browse Source 
svn path=/Website/trunk/; revision=41529
This commit is contained in:
Koen Reefman
2019-03-13 14:02:39 +00:00
parent 627b8366e4
commit e6cdf1c644
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/Localscripts/iface.js
View File

@@ -351,7 +351,7 @@ function validateForm(fName, params)
try
{
if (document.activeElement && document.activeElement.tagName != 'BODY')
if (document.activeElement && document.activeElement.tagName != 'BODY' && !params.noBlur)
document.activeElement.blur(); // trigger laatste onChanges
}
catch (e)

2
APPL/MLD/mld_edit_melding.js
View File

@@ -1172,7 +1172,7 @@ function checkPrerequisite()
var checkOnly = ["stdm_show"];
if (alg_onrgoed_obj_niveau != "")
checkOnly.push("locatie"); // Er is een alg niveau gekozen.
return validateForm("u2", { checkOnly: checkOnly });
return validateForm("u2", { checkOnly: checkOnly, noBlur: true });
}
function onChangeBehandelteam(behandelteam_key)

2
APPL/Shared/Suggest/SuggestObject.asp
View File

@@ -55,7 +55,7 @@ var filtClause = getFiltClauseObject(filt_params);
if (module == "MLD")
{
var sql = get_objecten_sql(alg_key, alg_niveau, prs_key, null, stdm_key);
var sql = get_objecten_sql(alg_key, alg_niveau, prs_key, null, stdm_key, { "search": chars });
var resultParams = { bAll: bAll,
fldName: "deel",
fldKey: "ins_deel_key",

23
APPL/Shared/get_objecten_sql.inc
View File

@@ -10,11 +10,12 @@
// Vanuit CNT\loadRuimteObjecten.asp is stdmld_key niet in gebruik
// Uitsluitend vanuit CNT\loadRuimteObjecten.asp is dept_key in gebruik
function get_objecten_sql(alg_key, alg_niveau, prs_key, dept_key, stdmld_key)
function get_objecten_sql(alg_key, alg_niveau, prs_key, dept_key, stdmld_key, params)
{
if (dept_key > 0 && stdmld_key > 0)
UNEXEPECTED_get_objecten_sql;
params = params || {};
var obj_sqls = [];
var org_onrgoed_niveau = "";
@@ -49,7 +50,7 @@ function get_objecten_sql(alg_key, alg_niveau, prs_key, dept_key, stdmld_key)
var oRs = Oracle.Execute(sql);
if (oRs.Eof) // Geen objectsoort beperking
{
obj_sqls = get_stdmelding_sql(alg_niveau_sql, [afdeling_sql, persoon_sql], "");
obj_sqls = get_stdmelding_sql(alg_niveau_sql, [afdeling_sql, persoon_sql], "", params);
}
else
{
@@ -73,17 +74,17 @@ function get_objecten_sql(alg_key, alg_niveau, prs_key, dept_key, stdmld_key)
}
if (disc_keys.length)
{
var sqls = get_stdmelding_sql(alg_niveau_sql, [afdeling_sql, persoon_sql], " AND g.ins_discipline_key IN ({0})".format(disc_keys.join(", ")));
var sqls = get_stdmelding_sql(alg_niveau_sql, [afdeling_sql, persoon_sql], " AND g.ins_discipline_key IN ({0})".format(disc_keys.join(", ")), params);
obj_sqls = obj_sqls.concat(sqls);
}
if (group_keys.length)
{
var sqls = get_stdmelding_sql(alg_niveau_sql, [afdeling_sql, persoon_sql], " AND s.ins_srtgroep_key IN ({0})".format(group_keys.join(", ")));
var sqls = get_stdmelding_sql(alg_niveau_sql, [afdeling_sql, persoon_sql], " AND s.ins_srtgroep_key IN ({0})".format(group_keys.join(", ")), params);
obj_sqls = obj_sqls.concat(sqls);
}
if (srt_keys.length)
{
var sqls = get_stdmelding_sql(alg_niveau_sql, [afdeling_sql, persoon_sql], " AND d.ins_srtdeel_key IN ({0})".format(srt_keys.join(", ")));
var sqls = get_stdmelding_sql(alg_niveau_sql, [afdeling_sql, persoon_sql], " AND d.ins_srtdeel_key IN ({0})".format(srt_keys.join(", ")), params);
obj_sqls = obj_sqls.concat(sqls);
}
}
@@ -93,7 +94,7 @@ function get_objecten_sql(alg_key, alg_niveau, prs_key, dept_key, stdmld_key)
{
var afdeling_sql = (dept_key > 0) ? " ins_alg_ruimte_type = 'A' AND ins_alg_ruimte_key = " + dept_key : "";
var persoon_sql = (prs_key > 0) ? " ins_alg_ruimte_type = 'P' AND ins_alg_ruimte_key = " + prs_key : "";
obj_sqls = get_stdmelding_sql(alg_niveau_sql, [persoon_sql, afdeling_sql], "");
obj_sqls = get_stdmelding_sql(alg_niveau_sql, [persoon_sql, afdeling_sql], "", params);
}
if (obj_sqls.length)
@@ -201,7 +202,7 @@ function get_persoon_sql(p_prs_key, p_is_prsafdobj)
}
// Per installatiesoort uit mld_stdmelding_srtinst
function get_stdmelding_sql(p_alg_niveau_sql, arr_sql, p_installatie_where)
function get_stdmelding_sql(p_alg_niveau_sql, arr_sql, p_installatie_where, params)
{
//var plaatsaanduiding = ( S("prs_wpprefix_objectid") == 1
// ? " CASE"
@@ -213,6 +214,7 @@ function get_stdmelding_sql(p_alg_niveau_sql, arr_sql, p_installatie_where)
// JGL: bovenstaande even uitgeschakeld en ins_v_alg_overzicht niet meer joinen
// !!! Dat joinen nekte de performance namelijk. Bovendien toch overkill voor uitsluitend een prs_werkplek_omschrijving
params = params || {};
var plaatsaanduiding;
if (S("ins_element_description") == "")
{
@@ -226,6 +228,7 @@ function get_stdmelding_sql(p_alg_niveau_sql, arr_sql, p_installatie_where)
}
var sqls = [];
var searchColumn = plaatsaanduiding.substr(2); // Strip leading comma
if (p_alg_niveau_sql)
{
sqls.push("SELECT d.ins_deel_key"
@@ -250,6 +253,9 @@ function get_stdmelding_sql(p_alg_niveau_sql, arr_sql, p_installatie_where)
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND s.ins_srtgroep_key = g.ins_srtgroep_key"
+ " AND g.ins_discipline_key = dis.ins_discipline_key"
+ (params.search
? " AND UPPER(" + searchColumn + ") LIKE " + safe.quoted_sql_wild2(params.search)
: "")
+ p_installatie_where);
}
@@ -277,6 +283,9 @@ function get_stdmelding_sql(p_alg_niveau_sql, arr_sql, p_installatie_where)
+ " AND d.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND s.ins_srtgroep_key = g.ins_srtgroep_key"
+ " AND g.ins_discipline_key = dis.ins_discipline_key"
+ (params.search
? " AND UPPER(" + searchColumn + ") LIKE " + safe.quoted_sql_wild2(params.search)
: "")
+ p_installatie_where);
}