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

UWVA#50168 (Bugfix) Tracking voor het wijzigen van een ruimte-afdeling toegevoegd.

Browse Source 
svn path=/Website/trunk/; revision=36460
This commit is contained in:
Koen Reefman
2017-12-29 14:41:50 +00:00
parent cdf4f507a1
commit 75587b96be
1 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
APPL/ALG/alg_ruimteafdeling.asp
View File

@@ -62,15 +62,18 @@ if (submitting)
}
}
var sql = "SELECT prs_afdeling_key, prs_afdeling_omschrijving"
+ " FROM prs_afdeling a"
+ " WHERE prs_afdeling_key IN (" + afdeling_keys.join(",") + ")"
+ " AND prs_afdeling_verwijder IS NULL";
var oRs = Oracle.Execute(sql);
while (!oRs.Eof)
if (afdeling_keys.length)
{
afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
oRs.MoveNext();
var sql = "SELECT prs_afdeling_key, prs_afdeling_omschrijving"
+ " FROM prs_afdeling a"
+ " WHERE prs_afdeling_key IN (" + afdeling_keys.join(",") + ")"
+ " AND prs_afdeling_verwijder IS NULL";
var oRs = Oracle.Execute(sql);
while (!oRs.Eof)
{
afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
oRs.MoveNext();
}
}
var oldvals = [];
@@ -142,36 +145,38 @@ if (submitting)
for (var i = 0; i < ruimte_key_arr.length; i++)
{
for (var x = 0; x < oldvals[ruimte_key_arr[i]].length; x++)
{
fromLbl = shorttxt(afdeling_names[oldvals[ruimte_key_arr[i]][x].afd_key]) + " (" + oldvals[ruimte_key_arr[i]][x].bez + "%) ";
rowNr = sharedIndexOf(oldvals[ruimte_key_arr[i]][x].afd_key, afdeling_keys);
if (rowNr > -1) // Update
if (typeof oldvals[ruimte_key_arr[i]] !== 'undefined')
for (var x = 0; x < oldvals[ruimte_key_arr[i]].length; x++)
{
doneAfdeling[rowNr] = true;
if (oldvals[ruimte_key_arr[i]][x].bez == bezettingen[rowNr]) // No change
continue;
toLbl = " " + shorttxt(afdeling_names[afdeling_keys[rowNr]]) + " (" + bezettingen[rowNr] + "%)";
}
else // Delete
toLbl = " " + L("lcl_tracktoempty");
fromLbl = shorttxt(afdeling_names[oldvals[ruimte_key_arr[i]][x].afd_key]) + " (" + oldvals[ruimte_key_arr[i]][x].bez + "%) ";
if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
trackingArr[ruimte_key_arr[i]] = new Array();
trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
}
for (var y = 0; y < afdeling_keys.length; y++)
{
if (doneAfdeling[y])
continue;
else if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
trackingArr[ruimte_key_arr[i]] = new Array();
// Insert
fromLbl = L("lcl_trackfromempty") + " ";
toLbl = " " + shorttxt(afdeling_names[afdeling_keys[y]]) + " (" + bezettingen[y] + "%)";
trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
}
rowNr = sharedIndexOf(oldvals[ruimte_key_arr[i]][x].afd_key, afdeling_keys);
if (rowNr > -1) // Update
{
doneAfdeling[rowNr] = true;
if (oldvals[ruimte_key_arr[i]][x].bez == bezettingen[rowNr]) // No change
continue;
toLbl = " " + shorttxt(afdeling_names[afdeling_keys[rowNr]]) + " (" + bezettingen[rowNr] + "%)";
}
else // Delete
toLbl = " " + L("lcl_tracktoempty");
if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
trackingArr[ruimte_key_arr[i]] = new Array();
trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
}
for (var y = 0; y < afdeling_keys.length; y++)
{
if (doneAfdeling[y])
continue;
else if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
trackingArr[ruimte_key_arr[i]] = new Array();
// Insert
fromLbl = L("lcl_trackfromempty") + " ";
toLbl = " " + shorttxt(afdeling_names[afdeling_keys[y]]) + " (" + bezettingen[y] + "%)";
trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
}
}
for (var i = 0; i < ruimte_key_arr.length; i++)