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

FCLT#54239 ins_deelsrtcontrole_plan_opmerking is te lang

Browse Source 
svn path=/Website/trunk/; revision=39657
This commit is contained in:
Jos Groot Lipman
2018-11-05 17:03:05 +00:00
parent 524d8acb4d
commit d480945d5d
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/FAC/fac_verify_data.asp
View File

@@ -217,6 +217,9 @@ checker("Meta consistentie van de database, belangrijk om te controleren voor op
+ " AND attr_name = 'TIJDSDUUR'"
+ " AND precision < 12"
},
{ msg: "Kolomnamen te lang (meer dan 30 karakters)",
sql: "SELECT * from USER_TAB_COLUMNS WHERE LENGTH(column_name) > 30"
},
{ msg: "Vreemde tabelnamen die waarschijnlijk gedropped moeten worden",
sql: "SELECT table_name, num_rows," +
" (SELECT SUM(bytes)/1024" +

4
APPL/INS/ins.inc
View File

@@ -3911,7 +3911,7 @@ ins = {checkAutLevel:
+ " AND idsc2.ins_srtcontrole_key = cv.ins_srtcontrole_key"
+ " AND (idsc2.ins_scenario_key = cv.ins_scenario_key))"
+ " , -1) ins_deelsrtcontrole_key"
+ " , (SELECT MAX(ins_deelsrtcontrole_plan_opmerking)"
+ " , (SELECT MAX(ins_deelsrtcontrole_plan_opm)"
+ " FROM ins_deelsrtcontrole idpo"
+ " WHERE idpo.INS_DEELSRTCONTROLE_KEY = COALESCE((SELECT MAX(idsc3.ins_deelsrtcontrole_key)"
+ " FROM ins_deelsrtcontrole idsc3"
@@ -3919,7 +3919,7 @@ ins = {checkAutLevel:
+ " AND idsc3.ins_srtcontrole_key = cv.ins_srtcontrole_key"
+ " AND (idsc3.ins_scenario_key = cv.ins_scenario_key))"
+ " , -1)"
+ " ) ins_deelsrtcontrole_plan_opmerking"
+ " ) ins_deelsrtcontrole_plan_opm"
+ " , cv.bedrag AS orgbedrag"
// Als er een andere inspectie is met een lagere ins_srtcontrole_level in hetzelfde jaar dan springt ons bedrag op 0
// Dit gebeurt o.a. ook als: 1) het object vervallen is of

10
APPL/INS/ins_inspect_save.asp
View File

@@ -612,7 +612,7 @@ else
{dbs: "ins_deelsrtcontrole_opmerking", typ: "varchar", frm: "opmerk", track: L("lcl_remark"), len: 4000 },
{dbs: "ins_deelsrtcontrole_status", typ: "key", val: 0},
{dbs: "prs_perslid_key", typ: "key", val: user_key},
{dbs: "ins_deelsrtcontrole_plan_opmerking", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 },
{dbs: "ins_deelsrtcontrole_plan_opm", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 },
{dbs: "ins_deelsrtcontrole_plandatum", typ: "datetime", val: plandatum},
{dbs: "ins_deelsrtcontrole_datum_org", typ: "datetime", val: nextdate}
];
@@ -778,7 +778,7 @@ else
{
var fields = [ { dbs: "prs_perslid_key", typ: "key", val: user_key, track: L("lcl_name"), foreign: "prs_perslid" },
{ dbs: "ins_deelsrtcontrole_datum", typ: "datetime", val: deelsrtcontrole_datum, track: L("lcl_ins_controle_datum") }, // De controledatum met tijd opslaan.
{ dbs: "ins_deelsrtcontrole_plan_opmerking", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 },
{ dbs: "ins_deelsrtcontrole_plan_opm", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 },
{ dbs: "ins_deelsrtcontrole_datum_org", typ: "datetime", val: nextdate } // De orginele controledatum met tijd opslaan. Kan al gevuld zijn met dezelfde waarde.
];
@@ -847,7 +847,7 @@ else
{ // De controlemode en de opmerking van de laatste inspectie nog even op de aangegeven waarde zetten (i.p.v. niet succes waarde (controlemode) en lege waarde (opmerking)).
var fields = [ { dbs: "ins_controlemode_key", typ: "key", frm: "sel_controlemode", track: L("lcl_ins_controle_mode"), foreign: "ins_controlemode" },
{ dbs: "ins_deelsrtcontrole_opmerking", typ: "varchar", frm: "opmerk", track: L("lcl_remark"), len: 4000 } ];
fields.push({ dbs: "ins_deelsrtcontrole_plan_opmerking", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 });
fields.push({ dbs: "ins_deelsrtcontrole_plan_opm", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 });
var insUpd = buildTrackingUpdate("ins_deelsrtcontrole", " ins_deelsrtcontrole_key = " + result.deelsrtcontrole_key, fields);
var err = Oracle.Execute(insUpd.sql, true);
}
@@ -856,7 +856,7 @@ else
{ // Interval modus
var fields = [ { dbs: "ins_deelsrtcontrole_opmerking", typ: "varchar", frm: "opmerk", track: L("lcl_remark"), len: 4000 },
{ dbs: "prs_perslid_key", typ: "key", val: user_key, track: L("lcl_name"), foreign: "prs_perslid" },
{ dbs: "ins_deelsrtcontrole_plan_opmerking", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 },
{ dbs: "ins_deelsrtcontrole_plan_opm", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 },
{ dbs: "ins_deelsrtcontrole_datum", typ: "datetime", val: deelsrtcontrole_datum, track: L("lcl_ins_controle_datum") }, // De controledatum met tijd opslaan.
{ dbs: "ins_controlemode_key", typ: "key", frm: "sel_controlemode", track: L("lcl_ins_controle_mode"), foreign: "ins_controlemode" },
{ dbs: "ins_deelsrtcontrole_datum_org", typ: "datetime", val: nextdate } // De orginele controledatum met tijd opslaan. Kan al gevuld zijn met dezelfde waarde.
@@ -1127,7 +1127,7 @@ else
{
var fields = [ { dbs: "ins_deelsrtcontrole_opmerking", typ: "varchar", frm: "opmerk", track: L("lcl_remark"), len: 4000 }
];
fields.push({ dbs: "ins_deelsrtcontrole_plan_opmerking", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 });
fields.push({ dbs: "ins_deelsrtcontrole_plan_opm", typ: "varchar", val: plan_opm, track: L("lcl_mjb_plan_opmerking"), len: 4000 });
if (isScenario && mjobdelete)
fields.push( { dbs: "ins_deelsrtcontrole_plandatum", typ: "datetime", val: "", track: L("lcl_opdr_plandate") } );

2
APPL/MJB/mjb_search_list.asp
View File

@@ -570,7 +570,7 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
data.insSrtControleKey = oRs("ins_srtcontrole_key").Value;
data.insDeelSrtContrKey = oRs("ins_deelsrtcontrole_key").Value? oRs("ins_deelsrtcontrole_key").Value : -1;
data.insDeelSrtContrKeyFreezed = oRs("idsc_freezed").Value? oRs("idsc_freezed").Value : -1;
data.insDeelSrtContrPlanOpm = safe.htmlattr(oRs("ins_deelsrtcontrole_plan_opmerking").Value);
data.insDeelSrtContrPlanOpm = safe.htmlattr(oRs("ins_deelsrtcontrole_plan_opm").Value);
data.insXcpKey = oRs("ins_srtcontroledl_xcp_key").Value || -1;
data.insDeelSrtContrStatus = oRs("ins_deelsrtcontrole_status").Value == null? -1 : oRs("ins_deelsrtcontrole_status").Value;
data.org_nextdate = oRs("org_nextdate").Value; // Eerstaankomende inspectie vandaag of in de toekomst.