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

UWVA#34591 filtervelden vastzetten beter bij Suggest

Browse Source 
svn path=/Website/trunk/; revision=29166
This commit is contained in:
Jos Groot Lipman
2016-04-25 13:16:40 +00:00
parent 240fcfe461
commit 2efc568ac2
2 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
APPL/Localscripts/FcltJquery.js
View File

@@ -362,38 +362,44 @@ function fcltPrompt(title, defval, fnSuccess, params)
}); });
} }
$(function () function do_fcltfilters()
{ // Filters van opgeslagen tabjes verwerken { // Filters van opgeslagen tabjes verwerken
if (window.fcltfilters && window.iface && window.fcltfilters != "null") if (window.fcltfilters && window.iface && window.fcltfilters != "null")
{ {
iface.stringToForm(window.fcltfilters, $('form[name=u2]')); iface.stringToForm(window.fcltfilters, $('form[name=u2]'));
var formObject = JSON.parse(window.fcltfilters); var formObject = JSON.parse(window.fcltfilters);
if ("columns" in formObject) // Dit is het hidden veld wat normaal meegesubmit wordt if ("columns" in formObject) // Dit is het hidden veld wat normaal meegesubmit wordt
{ // Werk de interface checkboxjes ook bij { // Werk de interface checkboxjes ook bij
var colarr = formObject.columns.split(","); var colarr = formObject.columns.split(",");
var grparr = formObject.groupby.split(","); var grparr = formObject.groupby.split(",");
$("#scfcolpicker tr").each(function() $("#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
{ {
$("#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
}
);

19
APPL/Localscripts/iface.js
View File

@@ -120,6 +120,17 @@ var iface =
//if (val === $(this).prop( 'defaultValue' )) //if (val === $(this).prop( 'defaultValue' ))
// return; // return;
formObject[nm] = val; 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); return JSON.stringify(formObject);
@@ -160,7 +171,13 @@ var iface =
} }
else 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])
}
} }
}) })
}, },