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

Timestamp:

05/22/11 21:01:58 (14 years ago)

Author:

dhohl

Message:

#1499 The filter form does not lost any inputs after reloading the page; date filter is possible

File:

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

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

@@ -20 +20 @@
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetRuns()
+        public void GetRuns()
         {
             FilterModel qm = new FilterModel();
@@ -32 +32 @@
             Response.Write("Found <" + ids.Count() + "> Runs.");
 
-            return View("Index", qm); // name of usercontrol
+          //  return View("Index", qm); // name of usercontrol
         }
 
@@ -51 +51 @@
         /// <param name="collection"></param>
         /// <returns></returns>
-        public ActionResult AddFilterAnd(FormCollection collection)
+        public ActionResult AddFilterAnd(string submitButton, FormCollection collection)
         {
             FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);
 
-
-            // Add Filter
-            String idKey = null;
-            String parentIdKey = null;
-
-            foreach (string key in collection.AllKeys)
-            {
-                if (key.StartsWith(FilterModel.ComboboxName))
-                {
-                    idKey = key;
-                }
-                if (key.StartsWith(FilterModel.ParentIdName))
-                {
-                    parentIdKey = key;
-                }
-            }
-
-            Guid parentId = new Guid(collection.Get(parentIdKey));
-            string filterTypeName = collection.Get(idKey);
-            fm.AddFilter(filterTypeName, parentId);
-
+            Response.Write("Submit:" + submitButton);
+            
+            //update model with form data
             UpdateModel(collection, fm);
 
+            if (submitButton.StartsWith("+"))
+            {
+                string stringid = submitButton.Substring(2);
+                AddNewFilter(collection, fm, stringid);
+            }
+            else if (submitButton.StartsWith("-"))
+            {
+                string stringid = submitButton.Substring(2);
+                DeleteFilter(new Guid(stringid));
+            }
+            else if (submitButton.Equals("runs"))
+            {
+                GetRuns();
+            }
+            else if (submitButton.Equals("or"))
+            {
+                AddFilterOr( fm);
+            }
+            
             // 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);
         }
 
@@ -111 +143 @@
                 {
                     int idx = key.IndexOf(".");
-                    string id = key.Substring(0, idx);
-                    string type = key.Substring(idx + 1);
-
-                    Guid fid = new Guid(id);
-
-                    if (postValues.ContainsKey(fid))
+                    if (idx != -1)
                     {
-                        Dictionary<string, string> d = postValues[fid];
-                        d.Add(type, collection.Get(key));
-                    }
-                    else
-                    {
-                        Dictionary<string, string> d = new Dictionary<string, string>();
-                        d.Add(type, collection.Get(key));
-                        postValues.Add(fid, d);
+                        string id = key.Substring(0, idx);
+                        string type = key.Substring(idx + 1);
+
+                        Guid fid = new Guid(id);
+
+                        if (postValues.ContainsKey(fid))
+                        {
+                            Dictionary<string, string> d = postValues[fid];
+                            d.Add(type, collection.Get(key));
+                        }
+                        else
+                        {
+                            Dictionary<string, string> d = new Dictionary<string, string>();
+                            d.Add(type, collection.Get(key));
+                            postValues.Add(fid, d);
+                        }
                     }
                 }
@@ -140 +175 @@
         /// <param name="id"></param>
         /// <returns></returns>
-        public ActionResult DeleteFilter(Guid id)
+        public void DeleteFilter(Guid id) 
         {
             // Get Content from Session
             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);
+            //Session["Content"] = fm.Content;
+
+            //return View("Index", fm);
         }
 
@@ -163 +202 @@
         /// </summary>
         /// <returns></returns>
-        public ActionResult AddFilterOr()
-        {
-            FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);
-
+        public void AddFilterOr(FilterModel fm)
+        {
+           
             List<Filter> orFilters = fm.Content.Filters.ToList<Filter>(); ;
 
@@ -177 +215 @@
             Session["Content"] = fm.Content;
 
-            return View("Index", fm);
+            //return View("Index", fm);
         }