diff --git a/APPL/API2/model_ins_srtcontrole.inc b/APPL/API2/model_ins_srtcontrole.inc
index 37dfe9281d..72c7d3ed36 100644
--- a/APPL/API2/model_ins_srtcontrole.inc
+++ b/APPL/API2/model_ins_srtcontrole.inc
@@ -228,22 +228,26 @@ function model_ins_srtcontrole()
{
"name": "inplan",
"label": L("ins_srtcontrole_plan"),
- "mask": 1
+ "mask": 1,
+ "defaultvalue": 1
},
{
"name": "start",
"label": L("ins_srtcontrole_start"),
- "mask": 2
+ "mask": 2,
+ "defaultvalue": 1
},
{
"name": "afmeld",
"label": L("ins_srtcontrole_afmeld"),
- "mask": 4
+ "mask": 4,
+ "defaultvalue": 1
},
{
"name": "afrond",
"label": L("ins_srtcontrole_afrond"),
- "mask": 8
+ "mask": 8,
+ "defaultvalue": 1
}
]
}
diff --git a/APPL/INS/ins_edit_inspect.asp b/APPL/INS/ins_edit_inspect.asp
index 0ae5f01854..4bb6e9adcb 100644
--- a/APPL/INS/ins_edit_inspect.asp
+++ b/APPL/INS/ins_edit_inspect.asp
@@ -49,8 +49,6 @@ var canMsuEdit = false; // Alleen voor het wijzigen van inspectie (insEdit). Er
// Bepaal de objecten/delen in de selectie die
// ook echt ingepland kunnen of mogen worden.
var ctrdisc_key = -1;
-var canClose = false;
-var canFinish = false;
// Alle objecten moeten Gereed gemeld(5) of Afgerond(6) kunnen worden voordat de button zichtbaar mag worden.
var canClose = true;
var canFinish = true;
@@ -127,7 +125,7 @@ for (var i = 0; i < ins_key_arr.length; i++)
canFinish = canFinish && this_ins.canInspFinish;
tobehandled++;
}
-if (!canClose && !canFinish)
+if (insClose && !canClose && !canFinish)
// Als de buttons niet zichtbaar zijn heb ik niets te doen.
tobehandled = 0;
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
@@ -807,11 +805,6 @@ if (ins_key_arr.length == 1)
<%
}
-%>
-
-<%
FCLTcalendar("deelsrtcontrole_datum",
{ label: L("lcl_ins_controle_datum"),
datum: inspect_data.deelsrtcontrole_datum? inspect_data.deelsrtcontrole_datum : new Date(),
@@ -848,6 +841,11 @@ if (ins_key_arr.length == 1)
readonly: (insEdit && !canMsuEdit) // Er geldt al (insEdit && insstatus >= 5). In status 5 en 6 met INSMSU rechten mag ik de methode aanpassen (canMsuEdit).
});
}
+%>
+
+<%
RWTEXTAREATR("opmerk",
"fldremark",
diff --git a/APPL/SCF/scaffolding.inc b/APPL/SCF/scaffolding.inc
index fcbedaf61a..f62fab72eb 100644
--- a/APPL/SCF/scaffolding.inc
+++ b/APPL/SCF/scaffolding.inc
@@ -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");
Response.Write("