diff --git a/APPL/INS/ins.inc b/APPL/INS/ins.inc index da96a7b244..cbefc0095e 100644 --- a/APPL/INS/ins.inc +++ b/APPL/INS/ins.inc @@ -2290,7 +2290,7 @@ ins = {checkAutLevel: + " FROM ins_srtcontroledl_xcp xcp1" + " WHERE xcp1.ins_deel_key = d.ins_deel_key" + " AND xcp1.ins_srtcontrole_key = isc.ins_srtcontrole_key" - + " AND xcp1.ins_scenario_key = isc.ins_srtcontrole_key) ins_srtcontroledl_xcp_key" + + " AND xcp1.ins_scenario_key = isc.ins_scenario_key) ins_srtcontroledl_xcp_key" + " FROM ins_srtcontrole isc" + " , ins_deel d" + " , ins_srtdeel sd" @@ -2391,6 +2391,9 @@ ins = {checkAutLevel: fields.push({ dbs: "ins_srtcontroledl_xcp_materia", typ: "float", val: (materiaal == null || materiaal == materiaal_std? null : materiaal), track: (ins_key > 0? L("ins_srtcontrole_materiaal") + " (" + S("currency_pref").replace(/^\s+|\s+$/gm,'') + ")" : null) }); +__DoLog(commit) +__DoLog(xcp_key_std) +__DoLog(xcp_key) if (!isScenario && (commit? xcp_key_std : xcp_key) < 0) // Nieuwe inspectie. { fields.push({ dbs: "ins_srtcontroledl_xcp_key", typ: "key", seq: "ins_s_srtcontroledl_xcp_key" }); diff --git a/APPL/Shared/resultset_filter_table.inc b/APPL/Shared/resultset_filter_table.inc index a11c3647c8..738fbf77d5 100644 --- a/APPL/Shared/resultset_filter_table.inc +++ b/APPL/Shared/resultset_filter_table.inc @@ -426,7 +426,7 @@ function getSQLByKey (pTable, pKeys) + " WHERE bez_actie_key IN (" + lKeys + ")" + " ORDER BY 1"; break; - } + } // default: { sql = "SELECT '?' FROM prs_perslid WHERE prs_perslid_key = -1"; @@ -1492,7 +1492,7 @@ function getRSFilterColumns(lparams) } case "action_key": { lfilterValue = getRSFilterValueByKey("BEZ_ACTIE", lparams[lparam], L("lcl_action")); break; - } + } // CNT gegevens case "cnt_key": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("lcl_cnt_intern_nr")); break; @@ -1703,10 +1703,8 @@ function getRSFilterColumns(lparams) case "mjbsrtcontr": { lfilterValue = getRSFilterValueByKey("INS_SRTCONTROLE", lparams[lparam], L("lcl_ins_controle_srt")); break; } - case "mjbinfl_pct": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("lcl_mjb_inflation")); - break; - } - case "mjbfreq": { lfilterValue = getRSFilterValueByValue(lparams[lparam] + " " + L("lcl_ins_controle_period_rearyear"), L("lcl_mjb_frequency")); + case "mjbfreq": { if (lparams[lparam]) + lfilterValue = getRSFilterValueByValue(lparams[lparam] + " " + L("lcl_ins_controle_period_rearyear"), L("lcl_mjb_frequency")); break; } case "mjbincbtw": { if (lparams.mjbincbtw)