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

FSN#33999: Realisatie TMJ module voor TobiasAX obv Inspectiemodule.

Browse Source 
svn path=/Website/trunk/; revision=34995
This commit is contained in:
Jos Groot Lipman
2017-08-17 13:01:48 +00:00
parent 08b6350129
commit f375d466f5
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/INS/ins.inc
View File

@@ -2290,7 +2290,7 @@ ins = {checkAutLevel:
+ " FROM ins_srtcontroledl_xcp xcp1" + " FROM ins_srtcontroledl_xcp xcp1"
+ " WHERE xcp1.ins_deel_key = d.ins_deel_key" + " WHERE xcp1.ins_deel_key = d.ins_deel_key"
+ " AND xcp1.ins_srtcontrole_key = isc.ins_srtcontrole_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" + " FROM ins_srtcontrole isc"
+ " , ins_deel d" + " , ins_deel d"
+ " , ins_srtdeel sd" + " , 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), 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) }); 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. 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" }); fields.push({ dbs: "ins_srtcontroledl_xcp_key", typ: "key", seq: "ins_s_srtcontroledl_xcp_key" });

10
APPL/Shared/resultset_filter_table.inc
View File

@@ -426,7 +426,7 @@ function getSQLByKey (pTable, pKeys)
+ " WHERE bez_actie_key IN (" + lKeys + ")" + " WHERE bez_actie_key IN (" + lKeys + ")"
+ " ORDER BY 1"; + " ORDER BY 1";
break; break;
} }
// //
default: { default: {
sql = "SELECT '?' FROM prs_perslid WHERE prs_perslid_key = -1"; 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")); case "action_key": { lfilterValue = getRSFilterValueByKey("BEZ_ACTIE", lparams[lparam], L("lcl_action"));
break; break;
} }
// CNT gegevens // CNT gegevens
case "cnt_key": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("lcl_cnt_intern_nr")); case "cnt_key": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("lcl_cnt_intern_nr"));
break; break;
@@ -1703,10 +1703,8 @@ function getRSFilterColumns(lparams)
case "mjbsrtcontr": { lfilterValue = getRSFilterValueByKey("INS_SRTCONTROLE", lparams[lparam], L("lcl_ins_controle_srt")); case "mjbsrtcontr": { lfilterValue = getRSFilterValueByKey("INS_SRTCONTROLE", lparams[lparam], L("lcl_ins_controle_srt"));
break; break;
} }
case "mjbinfl_pct": { lfilterValue = getRSFilterValueByValue(lparams[lparam], L("lcl_mjb_inflation")); case "mjbfreq": { if (lparams[lparam])
break; lfilterValue = getRSFilterValueByValue(lparams[lparam] + " " + L("lcl_ins_controle_period_rearyear"), L("lcl_mjb_frequency"));
}
case "mjbfreq": { lfilterValue = getRSFilterValueByValue(lparams[lparam] + " " + L("lcl_ins_controle_period_rearyear"), L("lcl_mjb_frequency"));
break; break;
} }
case "mjbincbtw": { if (lparams.mjbincbtw) case "mjbincbtw": { if (lparams.mjbincbtw)