FSN#36795: Planning, start en afronden niet altijd wenselijk bij terugkerende taken.

svn path=/Website/trunk/; revision=31952
This commit is contained in:
Maykel Geerdink
2016-12-13 13:11:16 +00:00
parent b8498fc623
commit 8fa9700722
3 changed files with 19 additions and 16 deletions

View File

@@ -222,7 +222,7 @@ function scf_ROFIELDTR(model, fld, val, key, params)
if (bit.typ == "check")
{
params_bits.readonly = true;
scf_GROUP_CHECK(bit, "bit_group", val, params_bits);
scf_GROUP_CHECK(bit, "bit_group", val, params_bits, key);
}
if (bit.typ == "radio")
{
@@ -426,7 +426,7 @@ function scf_RWFIELDTR(model, fld, val, key, params)
var bit = field.bits[i];
if (bit.typ == "check")
{
scf_GROUP_CHECK(bit, "bit_group", val, params_bits);
scf_GROUP_CHECK(bit, "bit_group", val, params_bits, key);
}
else if (bit.typ == "radio")
{
@@ -599,7 +599,7 @@ function scf_GROUP_START(model, fld, val, params)
function scf_GROUP_END()
{
}
function scf_GROUP_CHECK(pgroup, pclass, pvalue, params)
function scf_GROUP_CHECK(pgroup, pclass, pvalue, params, pkey)
{
var params = params||{};
var group_val = pvalue & pgroup.mask;
@@ -614,6 +614,7 @@ function scf_GROUP_CHECK(pgroup, pclass, pvalue, params)
for (var i=0; i<pgroup.radios.length; i++)
{
var bit = pgroup.radios[i];
var defaultchecked = pkey < 0 && bit.defaultvalue == 1;
var ischecked = (bit.mask == 0
? (group_val == bit.mask)
: ((group_val & bit.mask) == bit.mask)
@@ -625,7 +626,7 @@ function scf_GROUP_CHECK(pgroup, pclass, pvalue, params)
+">");
Response.Write("<input type=\"checkbox\" id=\"" + bit.name + "\" name=\"" + bit.name + "\""
+" class=\"fldcheck\""
+ (ischecked ? " CHECKED" : "")
+ (ischecked || defaultchecked ? " CHECKED" : "")
+ (params.hidden ? " style=\"visibility:hidden\"" : "")
+ (isreadonly? " disabled" : "")
+ (params.html ? params.html : "")