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

PLAT#51637: Testbevinding scenario's.

Browse Source 
svn path=/Website/branches/v2017.2/; revision=36491
This commit is contained in:
Maykel Geerdink
2018-01-04 14:38:59 +00:00
parent 5f9d7dcf43
commit 42edee0bf2
2 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/INS/ins_inspect_list.asp
View File

@@ -312,7 +312,7 @@ var authparams = user.checkAutorisation("WEB_INSUSE");
var aantal = oRs("ins_deel_aantal").Value || 0;
var totaal = aantal * kosten;
return totaal > 0? totaal : null;
return totaal > 0? safe.curr(totaal) : null;
}
var buttons = [];

72
APPL/INS/ins_inspect_start.asp
View File

@@ -94,7 +94,7 @@ if (freeze && groupby < 7)
var oRs = Oracle.Execute(mjblist_sql);
user.anything_todo_or_abort(!oRs.eof); // We klagen niet over enkele wel en enkele niet
var insert_sql = "BEGIN ";
var freeze_sql = "BEGIN ";
while (!oRs.eof)
{
var ins_key = oRs("ins_deel_key").Value;
@@ -104,37 +104,53 @@ if (freeze && groupby < 7)
var kosten = oRs("freeze_bedrag").Value;
var opm_has_higherprio = oRs("opm_has_higherprio").Value;
ingesloten.push({ins_key: ins_key, srtcont_key: srtcont_key, dlsrtcont_key: -1,
inspectiestatus: inspstatus, kosten: kosten, ismjob: true});
kosten: kosten, ismjob: true});
insert_sql += "INSERT INTO ins_deelsrtcontrole(ins_deel_key"
+ " , ins_srtcontrole_key"
+ " , ins_deelsrtcontrole_status"
+ " , prs_perslid_key"
+ (nextdate
? " , ins_deelsrtcontrole_datum_org"
: "")
+ " , ins_deelsrtcontrole_freezecost"
+ " , ins_deelsrtcontrole_freezedate"
+ " , ins_deelsrtcontrole_opmerking"
+ " )"
+ " VALUES (" + ins_key
+ " , " + srtcont_key
+ " , 2"
+ " , " + user_key
+ (nextdate
? " , " + nextdate.toSQL(true)
: "")
+ " , " + kosten
+ " , TRUNC(TO_DATE(TO_CHAR(SYSDATE, 'DD-MON') || '-" + mjb_freeze_year + "', 'DD-MON-YYYY'), 'YEAR')"
+ " , " + safe.quoted_sql(opm_has_higherprio)
+ " )"
+ ";";
if (inspstatus == 0)
// Er is al een ingeplande inspectie. Deze kan nu gestart worden.
// Status staat al op Gepland(0) en zal later op In behandeling(2) worden gezet zodat de wijziging ook getrackt gaat worden.
// De prs_perslid_key pas ik niet aan. Aan de tracking, die verderop wordt aangemaakt, kan ik wel zien wie deaccordeerd/gefreezed heeft.
freeze_sql += "UPDATE ins_deelsrtcontrole"
+ " SET ins_deelsrtcontrole_freezecost = " + kosten
+ " , ins_deelsrtcontrole_freezedate = TRUNC(TO_DATE(TO_CHAR(SYSDATE, 'DD-MON') || '-" + mjb_freeze_year + "', 'DD-MON-YYYY'), 'YEAR')"
+ " , ins_deelsrtcontrole_opmerking = " + safe.quoted_sql(opm_has_higherprio)
+ (nextdate
? " , ins_deelsrtcontrole_datum_org = " + nextdate.toSQL(true)
: "")
+ " WHERE ins_deel_key = " + ins_key
+ " AND ins_srtcontrole_key = " + srtcont_key
+ " AND ins_deelsrtcontrole_status = 0"
+ ";";
else
freeze_sql += "INSERT INTO ins_deelsrtcontrole(ins_deel_key"
+ " , ins_srtcontrole_key"
+ " , ins_deelsrtcontrole_status"
+ " , prs_perslid_key"
+ " , ins_deelsrtcontrole_freezecost"
+ " , ins_deelsrtcontrole_freezedate"
+ " , ins_deelsrtcontrole_opmerking"
+ (nextdate
? " , ins_deelsrtcontrole_datum_org"
: "")
+ " )"
+ " VALUES (" + ins_key
+ " , " + srtcont_key
+ " , 2"
+ " , " + user_key
+ " , " + kosten
+ " , TRUNC(TO_DATE(TO_CHAR(SYSDATE, 'DD-MON') || '-" + mjb_freeze_year + "', 'DD-MON-YYYY'), 'YEAR')"
+ " , " + safe.quoted_sql(opm_has_higherprio)
+ (nextdate
? " , " + nextdate.toSQL(true)
: "")
+ " )"
+ ";";
oRs.MoveNext();
}
oRs.Close();
insert_sql += " END;"
freeze_sql += " END;"
var err = Oracle.Execute(insert_sql, true);
var err = Oracle.Execute(freeze_sql, true);
if (err.friendlyMsg)
result.message = err.friendlyMsg;
@@ -370,7 +386,7 @@ else
result.success = false;
}
}
// else de melding is wellicht ingepland. Dan zet we later wel de status op 2.
// else de melding is wellicht ingepland. Dan zetten we later wel de status op 2.
}
}