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

HSLE#44387 Uitvraagscripts: ##SHOW## toegevoegd die een element laat zien als de expressie [waar] is

Browse Source 
svn path=/Website/trunk/; revision=38596
This commit is contained in:
Alex Tiehuis
2018-07-20 15:28:27 +00:00
parent 629d3ea6fa
commit 7d78d799cd
2 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
APPL/Shared/kenmerk_common.inc
View File

@@ -475,7 +475,7 @@ function listKenmerk(sql, module, key, props)
while (!oRs.eof)
{
var kdefault = oRs("kenmerk_default").Value;
if (kdefault && kdefault.match('##EXPR##') != null)
if (kdefault && (kdefault.match('##EXPR##') != null || kdefault.match('##SHOW##') != null))
{
flexExprIncluded = true;
break;
@@ -498,7 +498,7 @@ function listKenmerk(sql, module, key, props)
var flexkenmerkwaarde = null;
val_seperator = ':';
var def_val = oRs("kenmerk_default").Value;
var isExpression = false;
var isExpression = false, expressionClass = "";
addPreview = false;
if (!kenmerk_search && !multiMode)
@@ -506,9 +506,28 @@ function listKenmerk(sql, module, key, props)
// In multiMode no filling of default values
flexkenmerkwaarde = oRs("kenmerk_waarde").value;
if (def_val && def_val.match('##EXPR##') != null)
if (def_val && (def_val.match('##EXPR##') != null || def_val.match('##SHOW##') != null))
{
__DoLog(def_val.match('##EXPR##'));
__DoLog(def_val.match('##SHOW##'));
if (def_val.match('##SHOW##'))
expressionClass = " flexshow ";
switch(true) {
case def_val.match('##EXPR##'):
expressionClass = " flexexpr ";
break;
case def_val.match('##SHOW##'):
expressionClass = " flexshow ";
break;
}
isExpression = true;
__DoLog(expressionClass);
}
// For a new value, this default is used. It could be a primitive value (string, number or key) or
// it is suggested to support (later)
// a more sophisticated value, using ##asp-variable## and/or SQL:SELECT in the string.
@@ -767,7 +786,7 @@ function listKenmerk(sql, module, key, props)
+ " onBlur='checkKenmerk(this, true,\"" + ktype + "\"," + klen + "," + kdec + "," + kmin + "," + kmax + ")'"
+ " class='fldflexC50 "
+ (required ? required_class : "")
+ (isExpression? " expression " : "")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression ? " readonly " : "")
@@ -806,7 +825,7 @@ function listKenmerk(sql, module, key, props)
+ " class='"
+ (kenmerk_search ? "fldSflexC " : "fldflexC ")
+ (required ? required_class : "")
+ (isExpression? " expression " : "")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression ? " readonly " : "")
@@ -1393,7 +1412,7 @@ function listKenmerk(sql, module, key, props)
+ " class='"
+ (kenmerk_search ? "fldSflexT " : "fldflexT ")
+ (required ? required_class : "")
+ (isExpression? " expression " : "")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression? " readonly " : "")
@@ -1488,7 +1507,7 @@ function listKenmerk(sql, module, key, props)
+ (kenmerk_search ? "fldSflexN " : "fldflexN ")
+ (required ? required_class : "")
+ (kdec > 0 ? " float " : " number ")
+ (isExpression? " expression " : "")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression ? " readonly " : "")
@@ -1508,7 +1527,7 @@ function listKenmerk(sql, module, key, props)
kv += " class='"
+ (kenmerk_search ? "fldSflexD " : "fldflexD ")
+ (required ? required_class : "")
+ (isExpression? " expression " : "")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression? " readonly " : "")

13
APPL/Shared/kenmerk_js.asp
View File

@@ -318,7 +318,18 @@ function callback_flex_expr_info(json)
{
for (var kenmerk=0; kenmerk < json.length; kenmerk++)
{
$("#" + json[kenmerk].kfieldid + "val").val(json[kenmerk].waarde);
if ($("#" + json[kenmerk].kfieldid + "val").hasClass("flexshow"))
{
var $td = $("#" + json[kenmerk].kfieldid + "val").parent("td");
if (json[kenmerk].waarde == 1)
$td.add($td.prev(".label")).show();
else
$td.add($td.prev(".label")).hide();
}
else
{
$("#" + json[kenmerk].kfieldid + "val").val(json[kenmerk].waarde);
}
}
}