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

AAIT#33956: Tracking uitbreiden op grondbeginselen financiele & rechten inrichting.

Browse Source 
svn path=/Website/trunk/; revision=33192
This commit is contained in:
Maykel Geerdink
2017-03-20 14:29:39 +00:00
parent 0ef5e780a7
commit 755dd14f09
9 changed files with 83 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
APPL/SCF/scaffolding_show.inc
View File

@@ -45,9 +45,10 @@ function scaffolding_show(model, scf_params)
if (key > 0)
{
var tablekey_array = [key];
var parent_key_array = [key];
var sql = "";
//if (model.oms_veldnaam && model.oms)
// Fac_audit_tabelkey's van de verwijderde parents vinden.
if (model.table == "ins_tab_discipline")
{
sql = "SELECT ins_discipline_key"
@@ -55,6 +56,13 @@ function scaffolding_show(model, scf_params)
+ " WHERE ins_discipline_omschrijving = " + safe.quoted_sql(xxx_data.name)
+ " AND ins_discipline_key != " + key;
}
else if (model.softdelete)
{
sql = "SELECT x." + model.table + "_key"
+ " FROM " + model.table + " x"
+ " WHERE x." + model.table + "_verwijder IS NOT NULL"
+ " AND " + (model.fields.name.dbsa? model.fields.name.dbsa : model.fields.name.dbs) + " = " + safe.quoted_sql(xxx_data.name);
}
else if (model.fields.name && model.fields.name.dbs && xxx_data.name)
{
sql = "SELECT fac_audit_tabelkey"
@@ -69,13 +77,16 @@ function scaffolding_show(model, scf_params)
var oRs = Oracle.Execute(sql);
while(!oRs.eof)
{
tablekey_array.push(oRs(0).Value);
parent_key_array.push(oRs(0).Value);
oRs.Movenext();
}
}
// Verwijder audit van de verwijderde parents.
var wheres = ["(fac_audit_tabelnaam = " + safe.quoted_sql(model.table)
+ " AND fac_audit_tabelkey IN (" + tablekey_array.join(",") + "))"];
+ " AND fac_audit_tabelkey IN (" + parent_key_array.join(",") + "))"];
// Fac_audit_tabelkey's van de child audits vinden van de verwijderde en recente parents.
if (model.table == "ins_tab_discipline") // disc_params ook meetellen
{
var sql = "SELECT ins_discipline_module"
@@ -91,7 +102,7 @@ function scaffolding_show(model, scf_params)
key_field = "{0}_ins_discipline_key".format(module);
var sql = "SELECT {0}_disc_params_key disc_params_key".format(module)
+ " FROM {0}_disc_params".format(module)
+ " WHERE {0} IN ({1})".format(key_field, tablekey_array.join(","));
+ " WHERE {0} IN ({1})".format(key_field, parent_key_array.join(","));
var oRs = Oracle.Execute(sql);
var child_key_array = [];
while(!oRs.eof)
@@ -102,25 +113,23 @@ function scaffolding_show(model, scf_params)
oRs.Close;
wheres.push("(fac_audit_tabelnaam = " + safe.quoted_sql("{0}_disc_params".format(module))
+ " AND fac_audit_tabelkey" + " IN (" + child_key_array.join(",") + "))");
+ (child_key_array.length? " AND fac_audit_tabelkey" + " IN (" + child_key_array.join(",") + ")" : " AND 1=0") + ")");
}
}
else if (model.table == "fac_profiel")
else if (model.audit && model.audit.childaudit && model.audit.childaudit.sql)
{
var sql = "SELECT fac_profielwaarde_key"
+ " FROM fac_profielwaarde"
+ " WHERE fac_profiel_key IN (" + tablekey_array.join(",") + ")";
var sql = model.audit.childaudit.sql.format(parent_key_array.join(","));
var oRs = Oracle.Execute(sql);
var child_key_array = [];
while(!oRs.eof)
{
child_key_array.push(oRs("fac_profielwaarde_key").Value);
child_key_array.push(oRs(0).Value);
oRs.Movenext();
}
oRs.Close;
wheres.push("(fac_audit_tabelnaam = 'fac_profielwaarde'"
+ " AND fac_audit_tabelkey" + " IN (" + child_key_array.join(",") + "))");
wheres.push("(fac_audit_tabelnaam = '" + model.audit.childtable + "'"
+ (child_key_array.length? " AND fac_audit_tabelkey IN (" + child_key_array.join(",") + ")" : " AND 1=0") + ")");
}
var sql = "SELECT COUNT(*)"
+ " FROM fac_audit"
@@ -166,9 +175,9 @@ function scaffolding_show(model, scf_params)
function scf_history()
{
<%
var url = "appl/mgt/fac_audit.asp?mode=list&table={0}&record={1}".format(model.table, tablekey_array.join(","))
+ (child_key_array && child_key_array.length > 0
? "&childtable={0}&childrecord={1}".format(model.childtable, child_key_array.join(","))
var url = "appl/mgt/fac_audit.asp?mode=list&table={0}&record={1}".format(model.table, parent_key_array.join(","))
+ (child_key_array && child_key_array.length > 0 && model.audit && model.audit.childtable
? "&childtable={0}&childrecord={1}".format(model.audit.childtable, child_key_array.join(","))
: "");
var proturl = protectQS.create(url);
%>