From e3adc76ef2274c127a4301e94ba14badfb14752a Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Thu, 7 Jun 2018 09:37:43 +0000 Subject: [PATCH] FCLT#52905: Voor sommige geplande taken *geen* melding aan willen maken bij freeze. svn path=/Website/trunk/; revision=38104 --- APPL/API2/model_ins_srtcontrole.inc | 7 +- APPL/MGT/ins_srtcontrole.js | 9 +++ APPL/SCF/scaffolding.inc | 3 +- APPL/SCF/scaffolding_edit.inc | 104 ++++++++++++++++++++-------- 4 files changed, 91 insertions(+), 32 deletions(-) diff --git a/APPL/API2/model_ins_srtcontrole.inc b/APPL/API2/model_ins_srtcontrole.inc index 675ba6bea6..062bf2d647 100644 --- a/APPL/API2/model_ins_srtcontrole.inc +++ b/APPL/API2/model_ins_srtcontrole.inc @@ -209,7 +209,8 @@ function model_ins_srtcontrole() "label": L("ins_srtcontrole_eind"), "typ": "date", "multiedit": true, - "track": true + "track": true, + "onchange": "DateChangedEnddate()" }, "phasingouttime": { "dbs": "ins_srtcontrole_afbouwtijd", @@ -248,7 +249,9 @@ function model_ins_srtcontrole() "dbs": "mld_stdmelding_key", "label": L("mld_stdmelding_key"), "typ": "key", - "foreign": "mld_stdmelding" + "foreign": "mld_stdmelding", + "multiedit": true, + "track": true }, "options": { "dbs": "ins_srtcontrole_options", diff --git a/APPL/MGT/ins_srtcontrole.js b/APPL/MGT/ins_srtcontrole.js index 9ddae63dce..928723f8e0 100644 --- a/APPL/MGT/ins_srtcontrole.js +++ b/APPL/MGT/ins_srtcontrole.js @@ -70,6 +70,15 @@ function change_ctr_discipline(init) } } +function DateChangedEnddate() +{ + if ($("#show_enddate").is(":checkbox")) + var isgevuld = $("#show_enddate").is(":checked") + else + var isgevuld = $("#show_enddate").val(); + $("input[type=checkbox][name=scf_multi_enddate]").prop("checked", isgevuld); +} + function SelectBits() { if (!validateForm("u2", { checkOnly: ["unit"] })) diff --git a/APPL/SCF/scaffolding.inc b/APPL/SCF/scaffolding.inc index 8abf5c85f5..112e57f34f 100644 --- a/APPL/SCF/scaffolding.inc +++ b/APPL/SCF/scaffolding.inc @@ -615,7 +615,8 @@ function scf_RWFIELDTR(model, fld, val, key, params) initTimeEmpty: !val, volgnr : 1, required : params.required, - autosize : field.autosize + autosize : field.autosize, + onChange : field.onchange }); else if (field.typ == "datetime") FCLTcalendar(fld, { label : field.label, diff --git a/APPL/SCF/scaffolding_edit.inc b/APPL/SCF/scaffolding_edit.inc index ea27163805..af540db6ba 100644 --- a/APPL/SCF/scaffolding_edit.inc +++ b/APPL/SCF/scaffolding_edit.inc @@ -287,35 +287,6 @@ function scaffolding_edit(model, scf_params) sethint(); }); -<% if (multi) { - // Overal een vinkje voorzetten -%> - $("input[type=text],input[type=checkbox],input[type=number],select").not(".fldtime").not(".processingtime").each(function() { - if ($(this).hasClass('flddate')) - var cb_name = "scf_multi_" + $(this).attr("id").substr("show_".length); - else - var cb_name = "scf_multi_" + $(this).attr("name"); - var cb = $("").attr("name", cb_name); - var td = $("").append(cb); - $(this).closest("tr").find("td.label").before(td); - - // Zetten vinkje als je waarde invult - $(this).change(function () { - if ($(this).is(":checkbox")) - var isgevuld = $(this).is(":checked") - else - isgevuld = $(this).val(); - $("input[type=checkbox][name=" + cb_name + "]").prop("checked", isgevuld); - }); - // Wissen waarde als je vinkje weghaalt - cb.change(function (deze) { - return function () { - if (!$(this).is(":checked")) - $(deze).val(""); - } - }(this)); - }); -<% } %> FcltMgr.resized(); // Indien labels over meer dan 1 regel staan. }); @@ -459,6 +430,81 @@ function scaffolding_edit(model, scf_params) CreateButtons(buttons); IFACE.FORM_END(); %> + +<% if (multi) { + // Overal een vinkje voorzetten +%> + +<% } %> + +