diff --git a/APPL/MLD/mld.inc b/APPL/MLD/mld.inc index 95c4094d1e..fdf6cfd6cd 100644 --- a/APPL/MLD/mld.inc +++ b/APPL/MLD/mld.inc @@ -2700,7 +2700,7 @@ mld = {setmeldingstatus: return ret; }, faq_info: - function _alg_faq(loc_key, alg_key, ins_disc_key, stdm_key, stdmChanged) { + function _alg_faq(loc_key, alg_key_arr, ins_disc_key, stdm_key) { if ((!loc_key || loc_key == -1) && (!ins_disc_key || ins_disc_key == -1)) // Minimal requirement return; @@ -2746,20 +2746,17 @@ mld = {setmeldingstatus: filtFROM += " , alg_algfaq af"; filtWHERE += " AND ff.fac_faq_key = af.fac_faq_key" + " AND af.alg_locatie_key = " + loc_key; - if (alg_key && alg_key != -1) + if (alg_key_arr == [-1]) // check only loc { - var algSql = "SELECT alg_type FROM alg_v_allonroerendgoed WHERE alg_onroerendgoed_keys = " + alg_key; - var algoRs = Oracle.Execute(algSql); - if (!algoRs.EoF) - faq_type += algoRs("alg_type").Value; - algoRs.Close(); - filtWHERE += " AND af.alg_onroerendgoed_keys = " + alg_key; - } - else - { - faq_type += "L"; filtWHERE += " AND af.alg_onroerendgoed_keys IS NULL"; } + else if (alg_key_arr.length > 0) + { + filtWHERE += " AND (af.alg_onroerendgoed_keys IN (" + alg_key_arr + ")"; + // if (alg_key_arr.indexOf("-1") > 0) + // filtWHERE += " OR af.alg_onroerendgoed_keys IS NULL"; + filtWHERE += " )"; + } } else { @@ -2789,7 +2786,7 @@ mld = {setmeldingstatus: var result = { fixed_faq: [], popup_faq: false, loc_key: loc_key, - alg_key: alg_key, + alg_key_arr: alg_key_arr, stdm_key: stdm_key, ins_disc_key: ins_disc_key, faq_type: faq_type @@ -2803,7 +2800,7 @@ mld = {setmeldingstatus: || ((S("faq_kennisbank_popup") & 2) && canFAQFOFread)) // Voor FO result.popup_faq = true; result.loc_key = loc_key || -1; - result.alg_key = alg_key || -1; + result.alg_key_arr = alg_key_arr || []; result.stdm_key = stdm_key || -1; result.ins_disc_key = ins_disc_key || -1; }