Grids

GraphLabs.Site.Core/Filters/AbstractFilterableModel.cs

@@ -5,7 +5,7 @@ namespace GraphLabs.Site.Core.Filters
 {
     public abstract class AbstractFilterableModel<T>
     {
-        public static Expression<Func<T, bool>> CreateFilter(FilterParams filterParams)
+        public static Expression<Func<T, bool>> CreateFilter(FilterParams<T> filterParams)
         {
             return t => true;
         }

GraphLabs.Site.Core/Filters/BoundedFilterAttribute.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+
+namespace GraphLabs.Site.Core.Filters
+{
+    [System.AttributeUsage(System.AttributeTargets.Property)]  
+    public class BoundedFilterAttribute : Attribute, IFilterAttribute
+    {
+        private String _name;
+        private Object[] _limiters;
+
+        public BoundedFilterAttribute(string name, Object[] limiters)
+        {
+            _name = name;
+            _limiters = limiters; 
+        }
+    }
+}

GraphLabs.Site.Core/Filters/FilterParams.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Reflection;
 
 namespace GraphLabs.Site.Core.Filters
 {
-    public class FilterParams
+    public class FilterParams<T>
     {
         private readonly NameValueCollection _filterParams;
 
@@ -23,7 +25,43 @@ public string GetStringParam(string name)
         {
             return GetParam(name);
         }
-
+
+        public object GetBoundedParam(string name)
+        {
+            var index = GetIntParam(name);
+            if (index == null)
+            {
+                return null;
+            }
+
+            var propertyInfo = typeof(T).GetProperty(name);
+            if (propertyInfo == null) return null;
+            foreach (var customAttributeData in propertyInfo.CustomAttributes)
+            {
+                if (customAttributeData.AttributeType == typeof(BoundedFilterAttribute))
+                {
+                    return ((ReadOnlyCollection<CustomAttributeTypedArgument>) customAttributeData
+                        .ConstructorArguments[1].Value)[index.Value].Value;
+                }
+            }
+
+            return null;
+        }
+
+        public int? GetIntParam(string name)
+        {
+            try
+            {
+                string s = GetParam(name);
+                return s == null ? (int?) null : Int32.Parse(s);
+            }
+            catch (FormatException)
+            {
+                return null;
+            }
+        }
+
+
         public bool? GetBoolParam(string name)
         {
             string s = GetParam(name);

GraphLabs.Site.Core/GraphLabs.Site.Core.csproj

@@ -125,6 +125,9 @@
     <Reference Include="GraphLabs.Site.Models, Version=0.1.0.461, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\GraphLabs.WcfServices\Bin\GraphLabs.Site.Models.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
+      <HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -141,6 +144,7 @@
     <Compile Include="..\AssemblyVersion.cs">
       <Link>Properties\AssemblyVersion.cs</Link>
     </Compile>
+    <Compile Include="Filters\BoundedFilterAttribute.cs" />
     <Compile Include="Filters\FilterParams.cs" />
     <Compile Include="Filters\AbstractFilterableModel.cs" />
     <Compile Include="Filters\IFilterAttribute.cs" />

GraphLabs.Site.Models/Groups/GroupModel.cs

@@ -11,7 +11,8 @@ public class GroupModel : AbstractFilterableModel<Group>, IEntityBasedModel<Grou
     {
         public long Id { get; set; }
 
-        [StringFilter("Номер группы")]
+//        [StringFilter("Номер группы")]
+        [BoundedFilter("Выбери номер", new Object[]{"Б14-505", "К08-221"})]
         public string Name { get; set; }
 
         [StringFilter("Доступность для регистрации")]
@@ -23,10 +24,10 @@ public class GroupModel : AbstractFilterableModel<Group>, IEntityBasedModel<Grou
 
         public int Number { get; set; }
 
-        public static Expression<Func<Group, bool>> CreateFilter(FilterParams filterParams)
+        public static Expression<Func<Group, bool>> CreateFilter(FilterParams<GroupModel> filterParams)
         {
-            string name = filterParams.GetStringParam("Name");
-            bool? isOpen = filterParams.GetBoolParam("IsOpen");
+            string name = (string) filterParams.GetBoundedParam(nameof(Name));
+            bool? isOpen = filterParams.GetBoolParam(nameof(IsOpen));
 
             return g => (name == null || name.ToLower().Equals(g.Name.ToLower()))
                          && (isOpen == null || g.IsOpen == isOpen);

GraphLabs.Site/Controllers/GraphLabsFilteringController.cs

@@ -23,7 +23,7 @@ protected override void OnActionExecuting(ActionExecutingContext filterContext)
         {
             if (filterContext.ActionDescriptor.ActionName.Equals(nameof(Index)))//может быть это ограничение лишнее
             {
-                FilterParams filterParams = new FilterParams(Request.QueryString);
+                FilterParams<TModel> filterParams = new FilterParams<TModel>(Request.QueryString);
                 Type type = typeof(TModel);
                 if (!_methodInfos.ContainsKey(type))
                 {

GraphLabs.Site/Views/Helpers/GraphLabsUIFactory.cs

@@ -1,4 +1,5 @@
-using System.Web.UI;
+using System.Collections.Generic;
+using System.Web.UI;
 using System.Web.UI.HtmlControls;
 
 
@@ -28,10 +29,11 @@ public static HtmlInputCheckBox CreateHtmlInputCheckBox()
             return checkBox;
         }
 
-        public static HtmlGenericControl CreateHtmlLabel()
+        public static HtmlGenericControl CreateHtmlLabel(string labelText)
         {
             var label = new HtmlGenericControl("label");
             label.Attributes.Add("class", "graphlabs-label");
+            label.InnerText = labelText;
             return label;
         }
 
@@ -53,22 +55,21 @@ public static HtmlInputButton CreateHtmlResetButton()
 
         public static Control CreateInputField(string name, string labelText)
         {
-            var input = GraphLabsUIFactory.CreateHtmlInputText();
+            var input = CreateHtmlInputText();
             input.Name = name;
             input.ID = name;
 
-            var label = GraphLabsUIFactory.CreateHtmlLabel();
-            label.InnerText = labelText;
+            var label = CreateHtmlLabel(labelText);
 
-            var div = new HtmlGenericControl("div");
+            var div = CreateDiv();
             div.Controls.Add(label);
             label.Controls.Add(input);
             return div;
         }
 
         public static Control CreateInputCheckBox(string name, string labelText)
         {
-            var input = GraphLabsUIFactory.CreateHtmlInputCheckBox();
+            var input = CreateHtmlInputCheckBox();
             input.Name = name;
             input.ID = name;
             input.Value = "true";
@@ -77,15 +78,44 @@ public static Control CreateInputCheckBox(string name, string labelText)
             HtmlGenericControl script = new HtmlGenericControl("script");
             script.InnerHtml = "function checkboxChange(chkBox) {  if (chkBox.value==\"true\") {chkBox.value= \"false\"; chkBox.indeterminate = true;} else { chkBox.value= \"true\"; chkBox.checked=true; } }";
 
-            var label = GraphLabsUIFactory.CreateHtmlLabel();
-            label.InnerText = labelText;
+            var label = CreateHtmlLabel(labelText);
 
-            var div = new HtmlGenericControl("div");
+            var div = CreateDiv();
             div.Controls.Add(label);
 
             label.Controls.Add(input);
             label.Controls.Add(script);
             return div;
         }
+
+        public static Control CreateDiv()
+        {
+            return new HtmlGenericControl("div");
+        }
+
+        public static Control CreateSelectField(string name, string desc, Dictionary<string, string> options)
+        {
+            var div = CreateDiv();
+            var label = CreateHtmlLabel(desc);
+
+            var select = new HtmlGenericControl("select");
+            select.Attributes.Add("name", name);
+            foreach (var option in options)
+            {
+                select.Controls.Add(CreateHtmlOption(option.Key, option.Value));
+            }
+
+            div.Controls.Add(label);
+            div.Controls.Add(select);
+            return div;
+        }
+
+        private static Control CreateHtmlOption(string value, string desc)
+        {
+            var option = new HtmlGenericControl("option");
+            option.Attributes.Add("value", value);
+            option.InnerText = desc;
+            return option;
+        }
     }
 }

GraphLabs.Site/Views/Helpers/GraphLabsWebGrid.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Web;
 using System.Web.Helpers;
@@ -38,7 +40,7 @@ public IHtmlString GetHtml(string tableStyle = "webGrid", string headerStyle = "
                 selectedRowStyle, caption, displayHeader, fillEmptyRows, emptyRowCellValue, columns, exclusions, mode,
                 firstText, previousText, nextText, lastText, numericLinksCount, htmlAttributes
             ).ToString());
-            
+
             return new HtmlString(buildHtml.ToString());
         }
 
@@ -47,39 +49,57 @@ private void AddHtmlFilters(StringBuilder stringBuilder)
             var mainDiv = new HtmlGenericControl("div");
             var form = GraphLabsUIFactory.CreateHtmlForm();
             mainDiv.Controls.Add(form);
-            
+
             if (IsA(_source, typeof(IFilterable<,>)))
             {
                 var e = GetType(_source, typeof(IFilterable<,>));
-               
+
                 var genericArgument = e.GetGenericArguments()[1];
                 foreach (var propertyInfo in genericArgument.GetProperties())
                 {
                     foreach (var customAttributeData in propertyInfo.CustomAttributes)
                     {
                         if (customAttributeData.AttributeType.GetInterfaces().Contains(typeof(IFilterAttribute)))
                         {
-                            if (propertyInfo.PropertyType == typeof(bool))
+                            if (customAttributeData.AttributeType == typeof(StringFilterAttribute))
                             {
-                                form.Controls.Add(GraphLabsUIFactory.CreateInputCheckBox(propertyInfo.Name,
-                                    (string) customAttributeData.ConstructorArguments[0].Value));
-                            } else {
-                                form.Controls.Add(GraphLabsUIFactory.CreateInputField(propertyInfo.Name, 
-                                    (string) customAttributeData.ConstructorArguments[0].Value));
+                                //фильтрация по одному полю с подписью
+                                if (propertyInfo.PropertyType == typeof(bool))
+                                {
+                                    form.Controls.Add(GraphLabsUIFactory.CreateInputCheckBox(propertyInfo.Name,
+                                        (string) customAttributeData.ConstructorArguments[0].Value));
+                                }
+                                else
+                                {
+                                    form.Controls.Add(GraphLabsUIFactory.CreateInputField(propertyInfo.Name,
+                                        (string) customAttributeData.ConstructorArguments[0].Value));
+                                }
+                            }
+                            else if (customAttributeData.AttributeType == typeof(BoundedFilterAttribute))
+                            {
+                                //фильтрация с подписанным фильтруемым полем с ограниченным набором значений
+                                var options =
+                                    ((ReadOnlyCollection<CustomAttributeTypedArgument>) customAttributeData
+                                        .ConstructorArguments[1].Value)
+                                    .Select(a => a.Value)
+                                    .Select((v, i) => new {Key = i, Value = v})
+                                    .ToDictionary(o => o.Key.ToString(), o => o.Value.ToString());
+                                form.Controls.Add(GraphLabsUIFactory.CreateSelectField(propertyInfo.Name,
+                                    (string) customAttributeData.ConstructorArguments[0].Value, options));
                             }
                         }
                     }
                 }
-            }
 
-            if (form.Controls.Count == 0)
-            {
-                return;
-            }
+                if (form.Controls.Count == 0)
+                {
+                    return;
+                }
 
-            form.Controls.Add(GraphLabsUIFactory.CreateHtmlResetButton());
-            form.Controls.Add(GraphLabsUIFactory.CreateHtmlSubmitButton());
-            mainDiv.RenderControl(new HtmlTextWriter(new StringWriter(stringBuilder)));
+                form.Controls.Add(GraphLabsUIFactory.CreateHtmlResetButton());
+                form.Controls.Add(GraphLabsUIFactory.CreateHtmlSubmitButton());
+                mainDiv.RenderControl(new HtmlTextWriter(new StringWriter(stringBuilder)));
+            }
         }
 
         private static Type GetType(object o, Type t)