Render filter settings for filter form items

Render optgroups for SelectListItemGroup in filter form lists
Bool filter values should match stuff that will work in js

Author: programcsharp

Build/CommonAssemblyInfo.cs

@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.6.5")]
-[assembly: AssemblyFileVersion("1.6.5")]
+[assembly: AssemblyVersion("1.6.6")]
+[assembly: AssemblyFileVersion("1.6.6")]
 //[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]

Griddly.Mvc/GriddlyFilterExtensions.cs

@@ -149,8 +149,8 @@ static List<SelectListItem> BuildBoolItems(string trueLabel, string falseLabel)
         {
             return new List<SelectListItem>()
             {
-                new SelectListItem() { Value = "True", Text = trueLabel },
-                new SelectListItem() { Value = "False", Text = falseLabel },
+                new SelectListItem() { Value = "true", Text = trueLabel },
+                new SelectListItem() { Value = "false", Text = falseLabel },
             };
         }
     }

Griddly/Scripts/griddly.js

@@ -988,6 +988,9 @@
 
             this.setFilterValues(this.options.filterDefaults);
 
+            // clear any none's that were inadvertently reset
+            this.$element.find(".griddly-filters-form [data-griddly-filter-isnoneall=true] [multiple] option[value=]").prop("selected", false);
+
             this.triggerOrQueue(this.$element, "resetfilters.griddly");
 
             this.refresh(true);

Griddly/Views/Shared/Griddly/GriddlyFilterForm.cshtml

@@ -21,7 +21,13 @@
     object defaultValue = this.GetGriddlyDefault(filter.Field);
     object defaultValueEnd = filterRange != null ? this.GetGriddlyDefault(filterRange.FieldEnd) : null;
 
-    <div class="griddly-filter-form-group form-group form-group-sm">
+    <div class="griddly-filter-form-group form-group form-group-sm"
+                    data-filter-name="@filter.Caption" data-filter-name-plural="@filter.CaptionPlural"
+                    data-filter-datatype="@filter.DataType.ToString()"
+                    @Html.AttributeIf("data-griddly-filter-ismultiple", filterList != null, x => filterList.IsMultiple.ToString().ToLower())
+                    @Html.AttributeIf("data-griddly-filter-isnoneall", filterList != null, x => filterList.IsNoneAll.ToString().ToLower())
+                    @Html.AttributeIf("data-griddly-filter-isnullable", filterList != null, x => filterList.IsNullable.ToString().ToLower())
+                    @Html.AttributeIf("data-griddly-filter-displayitemcount", filterList != null, x => filterList.DisplayItemCount)>
         <label for="[email protected]" class="col-sm-2 control-label">@filter.Caption</label>
         @if (filterBox != null)
         {
@@ -107,11 +113,24 @@
             filterList.SetSelectedItems(defaultValue);
 
             <div class="col-sm-3">
-                <select class="form-control col-sm-3" id="[email protected]" name="@filter.Field" @(filterList.IsMultiple ? "multiple" : null)
-                        data-griddly-filter-data-type="@filter.DataType">
+                <select class="form-control col-sm-3" id="[email protected]" name="@filter.Field" @(filterList.IsMultiple ? "multiple" : null)>
                     @foreach (SelectListItem item in filterList.Items)
                     {
-                        <option value="@item.Value" @(item.Selected ? "selected" : null)>@item.Text</option>
+                        SelectListItemGroup group = item as SelectListItemGroup;
+
+                        if (group != null)
+                        {
+                            <optgroup label="@group.Text">
+                                @foreach (SelectListItem childItem in group.Items)
+                                {
+                                    @RenderListItem(childItem)
+                                }
+                            </optgroup>
+                        }
+                        else
+                        {
+                            @RenderListItem(item)
+                        }
                     }
                 </select>
             </div>
@@ -123,4 +142,9 @@
             </div>
         }
     </div>
+}
+
+@helper RenderListItem(SelectListItem item)
+{
+    <option value="@item.Value" @(item.Selected ? "selected" : null)>@item.Text</option>
 }