diff --git a/APPL/Localscripts/FcltJquery.js b/APPL/Localscripts/FcltJquery.js index db644ee786..2d7b00437e 100644 --- a/APPL/Localscripts/FcltJquery.js +++ b/APPL/Localscripts/FcltJquery.js @@ -362,38 +362,44 @@ function fcltPrompt(title, defval, fnSuccess, params) }); } -$(function () - { // Filters van opgeslagen tabjes verwerken - if (window.fcltfilters && window.iface && window.fcltfilters != "null") - { - iface.stringToForm(window.fcltfilters, $('form[name=u2]')); - var formObject = JSON.parse(window.fcltfilters); - if ("columns" in formObject) // Dit is het hidden veld wat normaal meegesubmit wordt - { // Werk de interface checkboxjes ook bij - var colarr = formObject.columns.split(","); - var grparr = formObject.groupby.split(","); - $("#scfcolpicker tr").each(function() - { - if (!this.id) - return; - var pos = $.inArray(this.id, colarr); - if (pos > -1) - { - $(this).find("input[type=checkbox]").prop("checked", true); - var selectgroup = $(this).find("select"); - selectgroup.val(grparr[pos]); - } - else - { - $(this).find("input[type=checkbox]").prop("checked", false); - } - - }); - } - if ("scf_pivot" in formObject) // Dit is het hidden veld wat normaal meegesubmit wordt +function do_fcltfilters() +{ // Filters van opgeslagen tabjes verwerken + if (window.fcltfilters && window.iface && window.fcltfilters != "null") + { + iface.stringToForm(window.fcltfilters, $('form[name=u2]')); + var formObject = JSON.parse(window.fcltfilters); + if ("columns" in formObject) // Dit is het hidden veld wat normaal meegesubmit wordt + { // Werk de interface checkboxjes ook bij + var colarr = formObject.columns.split(","); + var grparr = formObject.groupby.split(","); + $("#scfcolpicker tr").each(function() { - $("#chk_pivot").prop("checked", formObject.scf_pivot == 1) - } - } - }); + if (!this.id) + return; + var pos = $.inArray(this.id, colarr); + if (pos > -1) + { + $(this).find("input[type=checkbox]").prop("checked", true); + var selectgroup = $(this).find("select"); + selectgroup.val(grparr[pos]); + } + else + { + $(this).find("input[type=checkbox]").prop("checked", false); + } + + }); + } + if ("scf_pivot" in formObject) // Dit is het hidden veld wat normaal meegesubmit wordt + { + $("#chk_pivot").prop("checked", formObject.scf_pivot == 1) + } + } +} +$(function () + { + setTimeout( do_fcltfilters, 250); // Heel klein beetje uitstellen zodat eventuele + // suggests geinitialiseerd zijn + } + ); diff --git a/APPL/Localscripts/iface.js b/APPL/Localscripts/iface.js index d0cb6b1e76..19c0faf6d0 100644 --- a/APPL/Localscripts/iface.js +++ b/APPL/Localscripts/iface.js @@ -120,6 +120,17 @@ var iface = //if (val === $(this).prop( 'defaultValue' )) // return; formObject[nm] = val; + if ($(this).hasClass("suggest")) + { + if (!("suggestattr" in formObject)) + formObject.suggestattr = {}; + formObject.suggestattr[nm] = + { // Ook deze 'hidden' suggest attributen meenemen + sgKey: $(this).attr("sgKey"), + sgCurrentValue: $(this).attr("sgCurrentValue"), + sgExtraParam: $(this).attr("sgExtraParam") + } + } } }) return JSON.stringify(formObject); @@ -160,7 +171,13 @@ var iface = } else { - input.val(formObject[nm]) + input.val(formObject[nm]); + input.prop('defaultValue', formObject[nm]); + if (0&&"suggestattr" in formObject && nm in formObject.suggestattr) + { + for (var sg in formObject.suggestattr[nm]) + input.attr(sg, formObject.suggestattr[nm][sg]) + } } }) },