Changeset 6170 for branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Controllers

Timestamp:

05/09/11 22:13:01 (13 years ago)

Author:

mjesner

Message:

#1499 design, cleanup, remove button

File:

• branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Controllers/FilterController.cs (modified) (10 diffs)

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Controllers/FilterController.cs

@@ -35 +35 @@
         }
 
+
+
         public ActionResult Filters(CombinedFilter f)
         {
@@ -50 +52 @@
         /// <returns></returns>
         public ActionResult AddFilterAnd(FormCollection collection)
-        {
-            Response.Write("AddFilterAnd");
-
-            CombinedFilter content = (CombinedFilter)Session["Content"];
-            FilterModel fm = new FilterModel(content);
-
-            
-
+        {       
+            FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);
+
+
+            // Add Filter
+            
             String idKey = null;
             String parentIdKey = null;
@@ -63 +63 @@
             foreach (string key in collection.AllKeys)
             {
-                if (key.StartsWith("filtersCombobox"))
+                if (key.StartsWith(FilterModel.ComboboxName))
                 {
                     idKey = key;
                 }
-                if (key.StartsWith("parentId"))
+                if (key.StartsWith(FilterModel.ParentIdName))
                 {
                     parentIdKey = key;
@@ -75 +75 @@
             Guid parentId = new Guid(collection.Get(parentIdKey));
             string filterTypeName = collection.Get(idKey);
-
-            // get selected filter (combobox)
-            Filter filter = fm.Filters.Where(x => x.FilterTypeName.Equals(filterTypeName)).FirstOrDefault();
-
-
-
-            // find the partent filterr
-            List<Filter> orFilters = content.Filters.ToList<Filter>(); ;
-            CombinedFilter parent = (CombinedFilter)orFilters.Where(e => e.Id.Equals(parentId)).FirstOrDefault();
-
-            // remove
-            orFilters.Remove(parent);
-
-            List<Filter> filterList = parent.Filters.ToList<Filter>();
+            fm.AddFilter(filterTypeName, parentId);
+
 
 
@@ -102 +90 @@
             {
 
-                if (!key.StartsWith("filtersCombobox") && !key.StartsWith("parentId"))
+                if (!key.StartsWith(FilterModel.ComboboxName) && !key.StartsWith(FilterModel.ParentIdName))
                 {
                     int idx = key.IndexOf(".");
@@ -124 +112 @@
             }
 
-
-            // Set values for the existing Filters
-            foreach (Filter f in filterList)
-            {
-
-                Dictionary<string, string> dict = postValues.Where(x => x.Key.Equals(f.Id)).FirstOrDefault().Value;
-                if (dict != null)
-                {
-                    foreach (KeyValuePair<string, string> kvp in dict)
-                    {
-                        if ("StringComparisonFilter".Equals(f.GetType().Name))
-                        {
-                            if (kvp.Key.Equals("valueTextbox"))
-                            {
-                                ((StringComparisonFilter)f).Value = kvp.Value;
-                            }
-
-                        }
-                        else
-                        {
-                            // To this for all filters
-                        }
-                    }
-                }
-
-            }
-
-
-            // Add the new filter
-            filterList.Add(filter);
-            Response.Write("addx:" + filter.Id);  
-
-            parent.Filters = filterList.ToArray<Filter>();
-
-            // Add the current filter (AND)
-            orFilters.Add(parent);
-
-            content.Filters = orFilters.ToArray<Filter>();
-
-
-
-            Response.Write("content add:" + content.Filters[0].Id);
+            // Update filters with posted data
+            fm.UpdateWithPostValues(postValues);
 
 
             // Set Content
-            Session["Content"] = content;
+            Session["Content"] = fm.Content;
 
 
@@ -177 +125 @@
 
 
+
+
+        /// <summary>
+        /// Delete a filter with given id.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         public ActionResult DeleteFilter(Guid id)
         {
-            //Response.Write("Delete id:" + id);
-
-            CombinedFilter masterFilter = (CombinedFilter)Session["Content"];
-
-            Response.Write("content del:" + masterFilter.Filters[0].Id);
-
-            FilterModel fm = new FilterModel(masterFilter);  
-            RemoveFilterFromFilterModel(fm, id);
-                 
-            masterFilter.Filters = ((CombinedFilter)fm.Content).Filters.ToArray<Filter>();
-            
+            // Get Content from Session
+            FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);  
+            
+            // Remove Filter
+           bool filterRemoved =  fm.RemoveFilter(id);
+        
             // Set Content
-            Session["Content"] = masterFilter;
-
-         //   Response.Write("Delete id3:" + masterFilter.Filters.Length);
+            Session["Content"] = fm.Content;
            
             return View("Index", fm);
@@ -199 +147 @@
 
 
-        private Filter GetFilterForId(Filter [] activeFilters, Guid id)
-        {
-            foreach (Filter f in activeFilters)
-            {
-                Response.Write(f.Id + " " + id);
-
-                if (f.Id.Equals(id))
-                {
-                    return f;
-                }
-            }
-            return null;
-        }
-
-        private FilterModel RemoveFilterFromFilterModel(FilterModel fm, Guid id)
-        {
-            Response.Write("content :" + fm.Content.Id);
-            Filter filterToRemove = GetFilterForId(fm.Content.Filters, id);
-            if (filterToRemove != null)
-            {
-                Response.Write("rrrrr:" + id);
-                fm.Filters.Remove(filterToRemove);
-            }
-
-            return fm;
-        }
 
 
@@ -233 +155 @@
         public ActionResult AddFilterOr()
         {
-
-
-            CombinedFilter content = (CombinedFilter)Session["Content"];
-            FilterModel fm = new FilterModel(content);
-
-            List<Filter> orFilters = content.Filters.ToList<Filter>(); ;
-
-            CombinedFilter andFilter = fm.Filters.OfType<CombinedFilter>().Where(x => x.Operation == BooleanOperation.And).FirstOrDefault();
+            FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);
+
+            List<Filter> orFilters = fm.Content.Filters.ToList<Filter>(); ;
+
+            CombinedFilter andFilter = fm.AvailableFilters.OfType<CombinedFilter>().Where(x => x.Operation == BooleanOperation.And).FirstOrDefault();
             orFilters.Add(andFilter);
-            content.Filters = orFilters.ToArray<Filter>();
-
-
-            Session["Content"] = content;
+            fm.Content.Filters = orFilters.ToArray<Filter>();
+
+
+            Session["Content"] = fm.Content;
 
             return View("Index", fm);
@@ -272 +191 @@
             {
                 // Add first Filter 
-                CombinedFilter orFilter = fm.Filters.OfType<CombinedFilter>().Where(x => x.Operation == BooleanOperation.Or).FirstOrDefault();
-                CombinedFilter andFilter = fm.Filters.OfType<CombinedFilter>().Where(x => x.Operation == BooleanOperation.And).FirstOrDefault();
+                CombinedFilter orFilter = fm.AvailableFilters.OfType<CombinedFilter>().Where(x => x.Operation == BooleanOperation.Or).FirstOrDefault();
+                CombinedFilter andFilter = fm.AvailableFilters.OfType<CombinedFilter>().Where(x => x.Operation == BooleanOperation.And).FirstOrDefault();
                 orFilter.Filters = new Filter[] { andFilter }; // 1st filter