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

FCLT#56179 Conditionele kenmerken werken niet bij velden van kenmerksoort bestand

Browse Source 
svn path=/Website/branches/v2018.2/; revision=40625
This commit is contained in:
Alex Tiehuis
2019-01-22 10:49:19 +00:00
parent 8464693cf3
commit 746fd22712
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
APPL/Shared/kenmerk_common.inc
View File

@@ -216,7 +216,7 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
// var res = L("lcl_flex_autocopy");
// else // pf: op 1 regel tbv mijn syntaxhiliting
// {
var res ="<input type='button' isBijlage='1' nBijlagen='" + lijst.length + "'" + identify + " class='bijlage button " + pRequired + "' value='" + label.format(lijst.length) + "'";
var res ="<input type='button' isBijlage='1' nBijlagen='" + lijst.length + "'" + identify + " class='bijlage button " + (params.isExpression? " expression " + params.expressionClass : "") + pRequired + "' value='" + label.format(lijst.length) + "'";
var url = rooturl + "/appl/shared/BijlagenForm.asp?module=" + pModule
+ "&key=" + pKey
+ (pNiveau != ""? "&niveau=" + pNiveau : "")
@@ -424,7 +424,7 @@ function kenmerk_regel(kv_params)
kvhtml += "\n <input type=hidden id='" + kv_params.nameprefix + kv_params.idCounter + "val' name='" + kv_params.nameprefix + kv_params.idCounter + "val' value='" + safe.htmlattr(kv_params.flexkenmerkwaarde) + "'>";
}
if ((!kv_params.maskeren && (kv_params.kenmerk_search || !kv_params.readonlyfield || (kv_params.flexkenmerkwaarde && kv_params.forceReadonly)) && kv_params.ktype != "M" && kv_params.ktype != "L" && kv_params.ktype != "l") ||
if ((!kv_params.maskeren && (kv_params.kenmerk_search || !kv_params.readonlyfield || (kv_params.flexkenmerkwaarde && kv_params.forceReadonly)) && kv_params.ktype != "L" && kv_params.ktype != "l") ||
(!kv_params.ishidden && kv_params.maskeren && kv_params.flexkenmerkwaarde && (kv_params.ktype == "F" || kv_params.ktype == "E")))
{
// Alleen dan hidden name-velden er bij
@@ -1367,6 +1367,7 @@ function listKenmerk(sql, module, key, props)
? "fldSflex" + ktype + " "
: "fldflex" + ktype + " ")
+ (missing ? " missing " : " details ")
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (required > 1
@@ -1416,7 +1417,9 @@ function listKenmerk(sql, module, key, props)
if (!readonlyfield && !otherPath) // Altijd aanwezig
{
kv += "<input type='button' "
+ "class='bijlage1 button " + (required? required_class : "") + "' "
+ "class='bijlage1 button "
+ (isExpression? " expression " + expressionClass : "")
+ (required? required_class : "") + "' "
+ "isBijlage='1' nBijlagen='"+(flexkenmerkwaarde?1:0)+"' "
+ "value='" + L("lcl_add") + "'"
+ (flexkenmerkwaarde?" style='display:none' ": " ")
@@ -1444,6 +1447,8 @@ function listKenmerk(sql, module, key, props)
props.nameprefix = nameprefix;
props.idCounter = idCounter;
props.ktype = ktype;
props.isExpression = isExpression;
props.expressionClass = expressionClass;
var res = BijlagenButton(module, niveau, key, tmpfolder, kkey, readonlyfield,
requiredfield, kdim, kregexp, otherPath, identify, L("lcl_appendixes_teller"), props);
@@ -1656,6 +1661,17 @@ function listKenmerk(sql, module, key, props)
// ==========================================================================================
if (ktype == 'D')
{
if (flexExprIncluded && !isExpression)
{
onchangeExp = ";if (fvalid) calculateFlexExpressions(this"
+ ", \"" + module + "\""
+ ", " + key
+ ", \"" + (props.kenmerk_module || "") + "\""
+ ", \"" + nameprefix + "\""
+ ", \"" + extraserie + "\""
+ ");";
initTriggerChange = true;
}
kv += " class='"
+ (initTriggerChange ? "initTriggerChange " : "")
+ (kenmerk_search ? "fldSflexD " : "fldflexD ")
@@ -1667,7 +1683,7 @@ function listKenmerk(sql, module, key, props)
+ " value='" + safe.htmlattr(flexkenmerkwaarde) + "'"
+ ">";
if (!readonlyfield && !isExpression && !maskeren)
if (!readonlyfield && (!isExpression || isShowExpr) && !maskeren)
kv += "<i class=\"fa fa-calendar fa-fw dateklikker\" onclick=\"$('#" + nameprefix + idCounter + "val').datepicker('show')\"></i>";
// Als er voor een datumveld geen kmin en kmax is ingevuld dan is de yearRange default -10 tot +10 jaar vanaf geselecteerd jaar.

2
APPL/Shared/kenmerk_js.asp
View File

@@ -327,7 +327,7 @@ function callback_flex_expr_info(json)
if ($("#" + json[kenmerk].kfieldid + "val").hasClass("flexshow"))
{
var $td = $("#" + json[kenmerk].kfieldid + "val").parent("td");
$td.add($td.prev(".label")).toggle(json[kenmerk].waarde == 1);
$td.add($td.prev(".label")).toggle(json[kenmerk].waarde != 0 && json[kenmerk].waarde != null);
}
else
{