Changeset 6305

Timestamp:

05/27/11 16:58:15 (14 years ago)

Author:

dhohl

Message:

#1499
Remove unused code in the filter classes

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin

Files:

• Controllers/FilterController.cs (modified) (12 diffs)
• Models/FilterModel.cs (modified) (10 diffs)

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

@@ -27 +27 @@
             FilterModel fm = new FilterModel();
             fm.Content = (CombinedFilter)Session["Content"];
-
             QueryServiceClient client = Query.GetClientFactory();
-
-
+            
             long[] ids = client.GetRunIds(fm.Content);
 
@@ -38 +36 @@
             return View("Results", qm); // name of usercontrol
         }
-
-
+        
 
         public ActionResult Filters(CombinedFilter f)
@@ -66 +63 @@
             if ("add".Equals(submitAction))
             {
-               // string stringid = submitButton.Substring(2);
                 string stringid = collection.Get("selectedFilter");
                 AddNewFilter(collection, fm, stringid);
@@ -73 +69 @@
             {
                string stringid= collection.Get("selectedFilter");
-               // string stringid = submitButton.Substring(2);
-                DeleteFilter(new Guid(stringid));
+               DeleteFilter(new Guid(stringid));
             }
             else if ("runs".Equals(submitAction))
@@ -87 +82 @@
             // Set Content
             Session["Content"] = fm.Content;
-
             return View("Index", fm);
                         
         }
 
+
         private void AddNewFilter(FormCollection collection, FilterModel fm, String idKey)
-        {
-            // Add Filter
-            //String idKey = null;
+        {           
             String parentIdKey = idKey;
-
-            //foreach (string key in collection.AllKeys)
-            //{
-            //    //if (key.StartsWith(FilterModel.ComboboxName))
-            //    //{
-            //    //    idKey = key;
-            //    //}
-            //    if (key.StartsWith(FilterModel.ParentIdName))
-            //    {
-            //        parentIdKey = key;
-            //    }
-            //}
 
             Guid parentId = new Guid(parentIdKey);
             string filterTypeName = collection.Get(FilterModel.ComboboxName+ "." + idKey);
-            fm.AddFilter(filterTypeName, parentId);
-
-            //UpdateModel(collection, fm);
-
-            //// Set Content
-            //Session["Content"] = fm.Content;
-
-            //return View("Index", fm);
+            fm.AddFilter(filterTypeName, parentId);           
         }
 
@@ -145 +119 @@
             foreach (string key in collection.AllKeys)
             {
-
                 if (!key.StartsWith(FilterModel.ComboboxName) && !key.StartsWith(FilterModel.ParentIdName))
                 {
@@ -174 +147 @@
 
 
-
-
         /// <summary>
         /// Delete a filter with given id.
@@ -186 +157 @@
             FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);
 
-            //throw new Exception();
-
             // Remove Filter
-            bool filterRemoved = fm.RemoveFilter(id);
-
-
-            //UpdateModel(collection, fm);
-            // TODO Model muss auch beim löschen upgeadatet werden UpdateModel(collection, fm);
-
-            // Set Content
-            //Session["Content"] = fm.Content;
-
-            //return View("Index", fm);
-        }
-
-
-
+            bool filterRemoved = fm.RemoveFilter(id);          
+        }
+        
 
         /// <summary>
@@ -209 +167 @@
         /// <returns></returns>
         public void AddFilterOr(FilterModel fm)
-        {
-           
+        {           
             List<Filter> orFilters = fm.Content.Filters.ToList<Filter>(); ;
 
@@ -216 +173 @@
             orFilters.Add(andFilter);
             fm.Content.Filters = orFilters.ToArray<Filter>();
-
-            // TODO Model muss auch beim löschen upgeadatet werden UpdateModel(collection, fm);
-
-            Session["Content"] = fm.Content;
-
-            //return View("Index", fm);
-        }
-
-
+                      
+            Session["Content"] = fm.Content;           
+        }
 
 
@@ -236 +187 @@
         public ActionResult Index()
         {
-
             // Set submenu
             Session["SelectedSubMenu"] = "Filter";
             FilterModel fm = new FilterModel();
-
 
             // Init session variable for selected filters
@@ -257 +206 @@
             fm.Content = f;
 
-
             return View(fm);
         }
-
-
     }
 }

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Models/FilterModel.cs

@@ -17 +17 @@
     public class FilterModel
     {
-
-
-
         public static string ComboboxName { get { return "filtersCombobox"; } }
         public static string ParentIdName { get { return "parentId"; } }
@@ -35 +32 @@
         public FilterModel()
         {
-
         }
 
@@ -51 +47 @@
             {
                 List<Boolean> boolStates = new List<Boolean>();
-
                 boolStates = new List<Boolean>();
                 boolStates.Add(true);
                 boolStates.Add(false);
-
                 return boolStates;
             }
         }
-
-
+        
         public static List<ComparisonItem> BoolComparisons
         {
@@ -75 +68 @@
             get { return ComparisonsHelper.stringComparisons; }
         }
-
-
-
+        
 
         /// <summary>
@@ -118 +109 @@
         /// </summary>
         public CombinedFilter Content { get; set; }
-
-
+        
 
         /// <summary>
@@ -154 +144 @@
         internal void AddFilter(string filterTypeName, Guid parentId)
         {
-
             // get selected filter (combobox)
             Filter filter = AvailableFilters.Where(x => x.FilterTypeName.Equals(filterTypeName)).FirstOrDefault();
-
 
             // find the partent filterr
@@ -167 +155 @@
 
             List<Filter> filterList = parentFilter.Filters.ToList<Filter>();
-
-
+            
             // Add the new filter
             filterList.Add(filter);
@@ -181 +168 @@
         }
 
+
         /// <summary>
         /// Update existing filters with posted value
@@ -193 +181 @@
                 foreach (Filter f in cf.Filters)
                 {
-
                     Dictionary<string, string> dict = postValues.Where(x => x.Key.Equals(f.Id)).FirstOrDefault().Value;
                     if (dict != null)
                     {
-
                         foreach (KeyValuePair<string, string> kvp in dict)
                         {
@@ -350 +336 @@
                                 }
                             }
-
-
                             else
                             {
                                 // To this for all filters
                             }
-
-
                         }
-
-
                     }
                 }