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

FSN#42689: 42689: INS: Wijziging inspect opslaan geeft aiai foutmelding.

Browse Source 
svn path=/Website/trunk/; revision=35416
This commit is contained in:
Maykel Geerdink
2017-09-25 08:46:29 +00:00
parent 5a31c2fa94
commit 864561923f
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
APPL/INS/ins_inspect_save.asp
View File

@@ -53,7 +53,9 @@ else if (savemode == "C") // Afmelden/Afronden (Close).
deelsrtcontrole_datum = getFParamDate("deelsrtcontrole_datum", new Date);
else if (savemode == "E")
{ // Wijzigen (Edit).
plandatum = getFParamDate("plandatum");
if (mjob)
plandatum = getFParamDate("plandatum");
//else (Periodieke taken): Plandatum wordt bij opmaak velden (fields) wel uit frm gehaald i.p.v. val.
if (multi)
abort_with_warning(L("lcl_ins_allow_multi_edit"));
@@ -155,38 +157,38 @@ for (var i = 0; i < ins_key_arr.length; i++)
var minyear = S("mjb_freeze_year") || (new Date()).getFullYear();
if (ins_deelsrtcontrole_status == 0) // Er is nog geen inspectie geweest.
{
if (deelsrtcontrole_plandatum != -1)
plandatum = new Date(deelsrtcontrole_plandatum);
else
continue;
savemode = "E"; // bestaat al dus 'edit'
if (deelsrtcontrole_plandatum != -1)
plandatum = new Date(deelsrtcontrole_plandatum);
else
continue;
savemode = "E"; // bestaat al dus 'edit'
}
else
{
sql = "SELECT ins.nextcyclusdate ("+ins_key_arr[i]+", "+srtcont_key_arr[i]+", 1) nextdate FROM DUAL";
oRs_nextdate = Oracle.Execute(sql);
plandatum = new Date(oRs_nextdate("nextdate").Value);
oRs_nextdate.Close();
sql = "SELECT ins.nextcyclusdate (" + ins_key_arr[i] + ", " + srtcont_key_arr[i] + ", 1) nextdate FROM DUAL";
oRs_nextdate = Oracle.Execute(sql);
plandatum = new Date(oRs_nextdate("nextdate").Value);
oRs_nextdate.Close();
if (ins_deelsrtcontrole_status == -1)
{
var aanmaakyear = ins_deel_aanmaak.getFullYear();
minyear = Math.max(minyear, aanmaakyear);
}
else if (ins_deelsrtcontrole_status == 5 || ins_deelsrtcontrole_status == 6)
{
var lastinsdate = new Date(ins_deelsrtcontrole_datum_max);
var lastinsyear = lastinsdate.getFullYear();
minyear = Math.max(minyear, lastinsyear);
}
else // ins_deelsrtcontrole_status == 2
continue;
if (ins_deelsrtcontrole_status == -1)
{
var aanmaakyear = ins_deel_aanmaak.getFullYear();
minyear = Math.max(minyear, aanmaakyear);
}
else if (ins_deelsrtcontrole_status == 5 || ins_deelsrtcontrole_status == 6)
{
var lastinsdate = new Date(ins_deelsrtcontrole_datum_max);
var lastinsyear = lastinsdate.getFullYear();
minyear = Math.max(minyear, lastinsyear);
}
else // ins_deelsrtcontrole_status == 2
continue;
savemode = "P"; // moet nog ingepland worden
savemode = "P"; // moet nog ingepland worden
}
var newyear = plandatum.getFullYear() + moveyears;
if (moveyears === 0 || newyear < minyear)
continue;
continue;
plandatum = new Date(newyear, 11, 31);
}
@@ -196,9 +198,9 @@ for (var i = 0; i < ins_key_arr.length; i++)
if (savemode == "P" && !this_ins.canInspPlan) // Inplannen.
{ // Ik heb geen Plan (inplannen) rechten of er was al een planrecord.
if (ins_deelsrtcontrole_status == 0 && !multi)
savemode = "E"
savemode = "E"
else
continue;
continue;
}
if (savemode == "C") // Afmelden/Afronden.
@@ -858,8 +860,10 @@ else if (savemode == "E")
if (isScenario && mjobdelete)
fields.push( { dbs: "ins_deelsrtcontrole_plandatum", typ: "datetime", val: "", track: L("lcl_opdr_plandate") } );
else
else if (mjob)
fields.push( { dbs: "ins_deelsrtcontrole_plandatum", typ: "datetime", val: plandatum, track: L("lcl_opdr_plandate") } );
else // Periodieke taken.
fields.push( { dbs: "ins_deelsrtcontrole_plandatum", typ: "datetime", frm: "plandatum", track: L("lcl_opdr_plandate") } );
if (getDeelsrtcontroleDate)
fields.push( { dbs: "ins_deelsrtcontrole_datum", typ: "datetime", val: deelsrtcontrole_datum, track: L("lcl_ins_controle_datum") } );