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

AAIT#36710: Berekende waarde van velden in Facilitor.

Browse Source 
svn path=/Website/trunk/; revision=31945
This commit is contained in:
Maykel Geerdink
2016-12-13 09:01:17 +00:00
parent 067226f024
commit bb67cd547e
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
APPL/Shared/kenmerk_common.inc
View File

@@ -1090,6 +1090,7 @@ function listKenmerk(sql, module, key, props)
: "fldflexN ")
+ (required ? required_class : "")
+ (kdec > 0 ? " float " : " number ")
+ (isExpression? " expression " : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression? " readonly " : "")
@@ -1107,6 +1108,7 @@ function listKenmerk(sql, module, key, props)
? "fldSflexD "
: "fldflexD ")
+ (required ? required_class : "")
+ (isExpression? " expression " : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression? " readonly " : "")
@@ -1889,16 +1891,18 @@ function savekenmerkwaarden(module, refkey, niveau, flexdata)
+ " , fac_kenmwaarden_waarde"
+ " , fac_kenmwaarden_kenmerktype"
+ " , fac_kenmwaarden_isexpr"
+ " , prs_perslid_key"
+ " )"
+ " VALUES (" + safe.quoted_sql(module)
+ " , " + refkey
+ (niveau
? " , " + niveau
? " , " + safe.quoted_sql(niveau)
: "")
+ " , " + flexdata[kenmerk].id
+ " , " + safe.quoted_sql(flexdata[kenmerk].value)
+ " , " + safe.quoted_sql(flexdata[kenmerk].type)
+ " , " + flexdata[kenmerk].expr
+ " , " + user_key
+ " )";
Oracle.Execute(sql);
}
@@ -1906,8 +1910,17 @@ function savekenmerkwaarden(module, refkey, niveau, flexdata)
function evaluateflexexpresions(module, refkey)
{ // Berekening van de expressie kenmerken.
var sql = "BEGIN flx.evaluateflexexpresions(" + safe.quoted_sql(module) + ", " + refkey + "); END;";
Oracle.Execute(sql);
var sql = "BEGIN flx.evaluateflexexpresions(" + safe.quoted_sql(module) + ", " + refkey + ", " + user_key + "); END;";
try
{
Oracle.Execute(sql);
}
catch(e)
{
var message = "kenmerk_common.inc (evaluateflexexpresions): Error writing flex expression\n" + e.description;
__DoLog(message);
abort_with_warning(message);
}
}
function removekenmerkwaarden(module, refkey)