Changeset 6102

Timestamp:

05/02/11 21:40:26 (14 years ago)

Author:

dhohl

Message:

#1499 query filter
recursive layout of the filters

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin

Files:

• Controllers/FilterController.cs (modified) (3 diffs)
• HLWebOKBQueryPlugin.csproj (modified) (2 diffs)
• Models/QueryModel.cs (modified) (1 diff)
• Views/AlgorithmClass (added)
• Views/Filter/Filters.ascx (modified) (2 diffs)
• Views/Query/Controls (added)
• Views/Query/Menu.ascx (modified) (1 diff)
• Views/ServiceTest (added)

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

@@ -18 +18 @@
         // GET: /Filter/
 
-
         [ChildActionOnly]
         public ActionResult Filters()
         {
+            // Model     
+            FilterModel qm = new FilterModel();
+
+
+            //TODO nicht immer laden
+            QueryServiceClient client = Query.GetClientFactory("okbtester", "okbtester");
+            List<Filter> filterList = client.GetFilters().ToList();
+            qm.Filters = filterList;
+            qm.SelectedFilters = new List<Filter>();
+
+
             // For ModelViewuUserControl
-            return PartialView("Filters"); // name of usercontrol
+            return PartialView("Filters", qm); // name of usercontrol
         }
+
+        //List<Filter> currentFilters
+
+        [ChildActionOnly]
+        public ActionResult Filters(FilterModel qms)
+        {
+            // Model     
+            FilterModel qm = new FilterModel();
+
+
+            //TODO nicht immer laden
+            QueryServiceClient client = Query.GetClientFactory("okbtester", "okbtester");
+            List<Filter> filterList = client.GetFilters().ToList();
+            qm.Filters = filterList;
+            qm.SelectedFilters =qms.SelectedFilters;
+            if (qm.SelectedFilters == null)
+            {
+
+                qm.SelectedFilters = new List<Filter>();
+            }
+
+
+
+            // For ModelViewuUserControl
+            return PartialView("Filters", qm); // name of usercontrol
+        }
+
+
+      
 
 
@@ -35 +74 @@
         public ActionResult AddFilter(FormCollection collection)
         {
+            
+
             // Model     
             FilterModel qm = new FilterModel();
@@ -46 +87 @@
             // Selected filter (from combobox)
             string filterType = collection.Get("filtersCombobox");
-            Filter filter = filterList.Where(x => x.FilterTypeName.Equals(filterType)).First();
+
+            if (filterType != null)
+            {
+
+                Filter filter = filterList.Where(x => x.FilterTypeName.CompareTo(filterType) == 0).First();
 
 
-            // Get selected filters form session
-            qm.SelectedFilters = (List<Filter>)Session["selectedFilters"];
+                 if (filter != null)
+                {
+                    // Get selected filters form session
+                    qm.SelectedFilters = (List<Filter>)Session["selectedFilters"];
+                    if (qm.SelectedFilters == null)
+                    {
 
-            // Add Filter only if not exists
-            if (qm.SelectedFilters.Where(x => x.FilterTypeName.Equals(filter.FilterTypeName)).Count() == 0)
-            {
+                        qm.SelectedFilters = new List<Filter>();
+                    }
 
-                qm.SelectedFilters.Add(filter);
-            }
 
-            // Set values for the selected filters
-            foreach (string s in collection.AllKeys)
-            {
-                if (s.StartsWith("valueTextbox"))
-                {
-                    // Get the type of the textbox
-                    string type = s.Substring(s.IndexOf(".") + 1);
+                    // Add Filter only if not exists
+                    if (qm.SelectedFilters.Where(x => x.FilterTypeName.Equals(filter.FilterTypeName)).Count() == 0)
+                    {
 
-                    // Get the filter from the selected filters to set the value(s)
-                    Filter f = qm.SelectedFilters.Where(x => x.GetType().Name.Equals(type)).First();
-                    if ("StringComparisonFilter".Equals(type))
+                        qm.SelectedFilters.Add(filter);
+                    }
+
+                    // Set values for the selected filters
+                    foreach (string s in collection.AllKeys)
                     {
-                        ((StringComparisonFilter)f).Value = collection.Get(s);
+                        if (s.StartsWith("valueTextbox"))
+                        {
+                            // Get the type of the textbox
+                            string type = s.Substring(s.IndexOf(".") + 1);
+
+                            // Get the filter from the selected filters to set the value(s)
+                            Filter f = qm.SelectedFilters.Where(x => x.GetType().Name.Equals(type)).First();
+                            if ("StringComparisonFilter".Equals(type))
+                            {
+                                ((StringComparisonFilter)f).Value = collection.Get(s);
+                            }
+                            else if ("NameStringComparisonFilter".Equals(type))
+                            {
+                                ((NameStringComparisonFilter)f).Value = collection.Get(s);
+                            }
+                            else if ("CombinedFilter".Equals(type))
+                            {
+                                //((CombinedFilter)f).Filters
+                            }
+                            // TODO: add for all filter types and will the values (etc.)
+                        }
                     }
-                    else if ("NameStringComparisonFilter".Equals(type))
-                    {
-                        ((NameStringComparisonFilter)f).Value = collection.Get(s);
-                    }
-                    // TODO: add for all filter types and will the values (etc.)
                 }
             }
-
 
 

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/HLWebOKBQueryPlugin.csproj

@@ -146 +146 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
-    <Content Include="Views\AlgorithmClass\Index.aspx" />
     <EmbeddedResource Include="Views\Filter\Filters.ascx" />
     <Content Include="Views\Filter\Index.aspx" />
     <Content Include="Views\Home\About.aspx" />
     <Content Include="Views\Home\Index.aspx" />
-    <EmbeddedResource Include="Views\Shared\FilterControl.ascx" />
     <Content Include="Views\Query\Index.aspx" />
     <EmbeddedResource Include="Views\Query\Menu.ascx" />
@@ -197 +195 @@
     <Folder Include="App_Data\" />
     <Folder Include="App_LocalResources\" />
+    <Folder Include="Views\AlgorithmClass\" />
     <Folder Include="Views\Query\Controls\" />
   </ItemGroup>

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

@@ -29 +29 @@
         }
 
-        // just 4 testing
-        public IList<RunCollectionData> getTestRuns() {
+        //// just 4 testing
+        //public IList<RunCollectionData> getTestRuns() {
 
-            QueryServiceClient client = Query.GetClientFactory();
+        //    QueryServiceClient client = Query.GetClientFactory();
 
-            if (client != null) {
-                IList<RunCollectionData> runs = new List<RunCollectionData>();
+        //    if (client != null) {
+        //        IList<RunCollectionData> runs = new List<RunCollectionData>();
 
-                //long[] runIds = client.GetRunIds(new Filter());
-                //if (runIds.Length < cnt) cnt = runIds.Length;
+        //        //long[] runIds = client.GetRunIds(new Filter());
+        //        //if (runIds.Length < cnt) cnt = runIds.Length;
 
-                long[] getRuns = new long[2]{1,2};
+        //        long[] getRuns = new long[2]{1,2};
 
-                IList<Run> runList = client.GetRuns(getRuns, false).ToList<Run>();
+        //        IList<Run> runList = client.GetRuns(getRuns, false).ToList<Run>();
 
-                foreach (Run r in runList) 
-                    runs.Add(new RunCollectionData(r));
+        //        foreach (Run r in runList) 
+        //            runs.Add(new RunCollectionData(r));
 
-                return runs;
-            }
-            return new List<RunCollectionData>();
-        }
+        //        return runs;
+        //    }
+        //    return new List<RunCollectionData>();
+        //}
     }
 }

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx

@@ -3 +3 @@
 <%@ Import Namespace="HLWebOKBQueryPlugin.OKBQueryService" %>
 <!-- Put all into a form that calls the "AddFilter" Action-->
-<% using (Html.BeginForm("AddFilter", "Filter")) %>
+<% using (Html.BeginForm ("AddFilter", "Filter")) %>
 <% { %>
 <p>
@@ -21 +21 @@
     <li>
         <%
-// If type is StringComparisonFilter build thes controls
-if ("StringComparisonFilter".Equals(f.GetType().Name))
-{  %>
-        <%: Html.TextBox("valueTextbox." + f.GetType().Name, ((StringComparisonFilter)f).Value)%>
-        <%: Html.LabelFor(x => f.Label)%>
-        <% }
+                // If type is StringComparisonFilter build thes controls
+                if ("StringComparisonFilter".Equals(f.GetType().Name))
+                {  %>
+                    <%: Html.TextBox("valueTextbox." + f.GetType().Name, ((StringComparisonFilter)f).Value)%>
+                    <%: Html.LabelFor(x => f.Label)%>
+                   
+             <% }
                // If type is NameStringComparisonFilter build thes controls
                else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
                { %>
-        <%: Html.TextBox("valueTextbox." + f.GetType().Name, ((NameStringComparisonFilter)f).Value)%>
-        <!-- other filter >
-          <% } // If type is StringComparisonFilter build thes controls
-       else 
-       { %>
-       <!-- type not supported ... -->
-        FilerTypeName =
-        <%: Html.Label(f.GetType().Name)%>
-        <% }
-        %>
+                    <%: Html.TextBox("valueTextbox." + f.GetType().Name, ((NameStringComparisonFilter)f).Value) %>
+                   
+             <% } 
+               else if ("CombinedFilter".Equals(f.GetType().Name))
+               { %>
+                <% CombinedFilter combiFilter = ((CombinedFilter)f);  %>
+                 <% List<Filter> comtbiFtilterLis = combiFilter.Filters.ToList<Filter>();
+                    FilterModel m = new FilterModel();
+                    m.Filters = ((FilterModel)Model).Filters;
+                    m.SelectedFilters = comtbiFtilterLis;
+                    %>
+                    <%   Html.RenderPartial("Filters", m); %>
+                   
+             <% } 
+
+
+              else 
+                { %>
+                     <!-- type not supported ... -->
+                     FilerTypeName =
+                    <%: Html.Label(f.GetType().Name)%>
+               <% }
+               %>
     </li>
     <% }

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/Menu.ascx

@@ -3 +3 @@
 <ul>
 <li <% if(Session["SelectedSubMenu"] == "Filter") {%> class="selected" <%}%>>
-    <%: Html.ActionLink("Filter", "Index", "Filter") %>
+    <%: Html.ActionLink( "Filter", "Index", "Filter") %>
 </li>
 <li <% if(Session["SelectedSubMenu"] == "Results") {%> class="selected" <%}%>>