UWVA#34591 Ook filtervelden vastzetten bij pinnen

svn path=/Website/trunk/; revision=29113

APPL/Localscripts/FcltJquery.js

@@ -369,16 +369,25 @@ $(function ()
             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 chackboxjes ook bij
+            {                            // Werk de interface checkboxjes ook bij
                 var colarr = formObject.columns.split(",");
+                var grparr = formObject.groupby.split(",");
                 $("#scfcolpicker tr").each(function()
                 {
                     if (!this.id)
                         return;
-                    if ($.inArray(this.id, colarr) > -1)
+                    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

APPL/Localscripts/FcltMgr.js

@@ -93,10 +93,14 @@ var FcltMgr =
                 // FcltMgr heeft voor ons params al met windowname gevuld.
                 params = params || {};
                 var tab = this._$tabshost.find( ".ui-tabs-nav li[aria-controls='"+params.windowname+"']" );
-                if (title)
-                    tab.find("span:first").text(title);
-                if (orgtitle)
-                    tab.find("span:first").attr('title', orgtitle);
+                var waspinned = $(tab).find("span.tabpinned").length > 0;
+                if (!waspinned)
+                {
+                    if (title)
+                        tab.find("span:first").text(title);
+                    if (orgtitle)
+                        tab.find("span:first").attr('title', orgtitle);
+                }
                 if (params.hot)
                 {
                     tab.find(".tabclose").addClass('hot');

APPL/Localscripts/iface.js

@@ -139,10 +139,24 @@ var iface =
                 var input = stringForm.find("#" + nm)
             else
                 input = stringForm.find("[name=" + nm + "]");
+            if (!input.length)
+                return;
             if (input.attr("type")=="checkbox" || input.attr("type")=="radio" )
             {
                 input.prop("checked", !!formObject[nm])
             }
+            if (input.prop("tagName") == "SELECT")
+            {
+                if (formObject[nm] instanceof Array && formObject[nm].length > 1) // Maak hem multiselect
+                {
+                    input.attr('multiple', 1);
+                    input.attr('size', Math.min(input.find("option").length, 8));
+                    input.val(formObject[nm]); // gewoon
+                    input.prev().html('«')
+                }
+                else
+                    input.val(formObject[nm]); // gewoon
+            }
             else
             {
                 input.val(formObject[nm])