Changeset 6303 for branches/WebApplication

Timestamp:

05/26/11 23:53:57 (13 years ago)

Author:

mjesner

Message:

#1499 result page, styling, functionality (add/remove) for post actions

Location:

branches/WebApplication/MVC2

Files:

• HLWebOKBQueryPlugin/Controllers/ChartController.cs (modified) (1 diff)
• HLWebOKBQueryPlugin/Controllers/FilterController.cs (modified) (3 diffs)
• HLWebOKBQueryPlugin/Controllers/QueryController.cs (modified) (2 diffs)
• HLWebOKBQueryPlugin/HLWebOKBQueryPlugin.csproj (modified) (3 diffs)
• HLWebOKBQueryPlugin/Models/FilterModel.cs (added)
• HLWebOKBQueryPlugin/Models/QueryModel.cs (modified) (2 diffs)
• HLWebOKBQueryPlugin/Properties/AssemblyInfo.cs (modified) (1 diff)
• HLWebOKBQueryPlugin/Views/Filter/Filters.ascx (modified) (7 diffs)
• HLWebOKBQueryPlugin/Views/Filter/Results.aspx (added)
• HeuristicLabWeb.HLWebOKBAdminPlugin.suo (modified) (previous)
• HeuristicLabWeb.PluginHost/HLWebPluginHost/Web.config (modified) (3 diffs)

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

@@ -31 +31 @@
 
       // Later, we will get the runs from the session ...
-      QueryServiceClient client = Query.GetClientFactory("okbtester", "okbtester");
-
-      long[] runIds = new long[104];
-      for (int i = 0; i < 104; i++) {
-        runIds[i] = i;
-      }
-      Run[] runs = client.GetRuns(runIds, false);
-      //cm.Runs = runs;
+      QueryServiceClient client = Query.GetClientFactory();
+
+      //long[] runIds = new long[104];
+      //for (int i = 0; i < 104; i++) {
+      //  runIds[i] = i;
+      //}
+      long[] runIds = client.GetRunIds((CombinedFilter)Session["Content"]);
+        Run[] runs = client.GetRuns(runIds,false);
+      //  Run[] runs = Session[""];
+      cm.Runs = runs;
       cm.UpdateRunCollection(runs);
       cm.UpdateBubbleChart(selectedAxisY, selectedAxisX, selectedBubbleSize);

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

@@ -8 +8 @@
 using HLWebOKBQueryPlugin.OKBQueryService;
 using System.Web.Routing;
+using HLWebOKBQueryPlugin.Models;
 
 namespace HLWebOKBQueryPlugin.Controllers
@@ -20 +21 @@
         /// </summary>
         /// <returns></returns>
-        public void GetRuns()
-        {
-            FilterModel qm = new FilterModel();
-            qm.Content = (CombinedFilter)Session["Content"];
-
-            QueryServiceClient client = Query.GetClientFactory("okbtester", "okbtester");
-
-
-            long[] ids = client.GetRunIds(qm.Content);
+        public ActionResult GetRuns()
+        {
+            Session["SelectedSubMenu"] = "Filter";
+
+            FilterModel fm = new FilterModel();
+            fm.Content = (CombinedFilter)Session["Content"];
+
+            QueryServiceClient client = Query.GetClientFactory();
+
+
+            long[] ids = client.GetRunIds(fm.Content);
 
             Response.Write("Found <" + ids.Count() + "> Runs.");
-
-          //  return View("Index", qm); // name of usercontrol
+            QueryModel qm = new QueryModel();
+            qm.Runs = ids;
+            return View("Results", qm); // name of usercontrol
         }
 
@@ -51 +55 @@
         /// <param name="collection"></param>
         /// <returns></returns>
-        public ActionResult AddFilterAnd(string submitButton, FormCollection collection)
+        public ActionResult AddFilter(FormCollection collection)
         {
             FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);
-
-            Response.Write("Submit:" + submitButton);
+            string submitAction = collection.Get("action");
+            Response.Write("Submit:" + submitAction);
             
             //update model with form data
             UpdateModel(collection, fm);
 
-            if (submitButton.StartsWith("+"))
-            {
-                string stringid = submitButton.Substring(2);
+            if ("add".Equals(submitAction))
+            {
+               // string stringid = submitButton.Substring(2);
+                string stringid = collection.Get("selectedFilter");
                 AddNewFilter(collection, fm, stringid);
             }
-            else if (submitButton.StartsWith("-"))
-            {
-                string stringid = submitButton.Substring(2);
+            else if ("delete".Equals(submitAction))
+            {
+               string stringid= collection.Get("selectedFilter");
+               // string stringid = submitButton.Substring(2);
                 DeleteFilter(new Guid(stringid));
             }
-            else if (submitButton.Equals("runs"))
-            {
-                GetRuns();
-            }
-            else if (submitButton.Equals("or"))
+            else if ("runs".Equals(submitAction))
+            {
+                return GetRuns();
+            }
+            else if ("or".Equals(submitAction))
             {
                 AddFilterOr( fm);

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

@@ -11 +11 @@
 using System.Reflection;
 using System.Text;
-using HLWebPluginHost.Models;
+using HLWebOKBQueryPlugin.Models;
 using HLWebOKBQueryPlugin.OKBQueryService;
 using HLWebOKBQueryPlugin.Helpers;
@@ -43 +43 @@
 
         public ActionResult RunCollectionTable() {
+
+            // Get runs from filter
+            
+
+            QueryServiceClient client = Query.GetClientFactory();
+
+
+            long[] ids = client.GetRunIds((CombinedFilter)Session["Content"]);
+
             QueryModel qm = new QueryModel();
-            Session["QueryRuns"] = qm.getTestRuns();
+            qm.Runs = ids;
+            Session["QueryRuns"] = qm.RunCollection;
             return View(qm);
         }

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/HLWebOKBQueryPlugin.csproj

@@ -108 +108 @@
     <Compile Include="ViewModels\ComparisonItem.cs" />
     <Compile Include="ViewModels\ComparisonsHelper.cs" />
-    <Compile Include="ViewModels\FilterModel.cs" />
+    <Compile Include="Models\FilterModel.cs" />
     <Compile Include="Models\QueryModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -161 +161 @@
     <Content Include="Views\Chart\Index.aspx" />
     <Content Include="Views\Filter\Index.aspx" />
+    <Content Include="Views\Filter\Results.aspx" />
     <Content Include="Views\Home\About.aspx" />
     <Content Include="Views\Home\Index.aspx" />
@@ -213 +214 @@
     <Folder Include="App_Data\" />
     <Folder Include="App_LocalResources\" />
-    <Folder Include="Views\AlgorithmClass\" />
   </ItemGroup>
   <ItemGroup>

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

@@ -8 +8 @@
 using HLWebOKBQueryPlugin.Helpers;
 
-namespace HLWebPluginHost.Models {
+namespace HLWebOKBQueryPlugin.Models
+{
     public class QueryModel {
 
         public String SelectedSubMenu { get; set; }
+        private long[] runs;
+
+
 
         public IList<Filter> QueryFilterGetAll() {
@@ -41 +45 @@
         }
 
+
+        public long[] Runs
+        {
+            get
+            {
+                return this.runs;
+            }
+            set
+            {
+                this.runs = value;
+            }
+
+        }
+
+
+        public IList<RunCollectionData> RunCollection
+        {
+            get
+            {
+                QueryServiceClient client = Query.GetClientFactory();
+                if (client != null)
+                {
+                    IList<RunCollectionData> runCollection = new List<RunCollectionData>();
+
+                    IList<Run> runList = client.GetRuns(runs, false).ToList<Run>();
+
+                    foreach (Run r in runList)
+                        runCollection.Add(new RunCollectionData(r));
+
+                    return runCollection;
+                }
+                return new List<RunCollectionData>();
+            }
+        }
+
         // just 4 testing
-        public IList<RunCollectionData> getTestRuns() {
+        //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/Properties/AssemblyInfo.cs

@@ -2 +2 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using HLWebPluginHost.PluginLib;
 using System.Web.UI;
 using System.Collections;
+using HLWebPluginHost.PluginLib;
 
 // General Information about an assembly is controlled through the following 

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

@@ -8 +8 @@
 <script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
 
+<script type="text/javascript">
+    function setAction(action, id) {
+        document.getElementById('selectedFilter').value = id;
+        document.getElementById('action').value = action;
+        document.filterForm.submit();
+    }
+</script>
+
+
 <% Html.EnableClientValidation(); %>
+ <% using (Html.BeginForm("AddFilter", "Filter", FormMethod.Post, new { Name = "filterForm" })) %>
+    <% {  %>  
+<!-- Put all into a form that calls the "AddFilter" Action-->
 
-<!-- Put all into a form that calls the "AddFilter" Action-->
-<div><table>
+    <%
+     CombinedFilter topFilter = ((FilterModel)Model).Content;
+    %>
+    <div><table>
 <tr><td>A<br />N<br />D</td><td>
-<p>
-    <%
-        CombinedFilter topFilter = ((FilterModel)Model).Content;
+
+
+   
+           <%
+     foreach (Filter fNode in topFilter.Filters)
+     {
+
+         CombinedFilter currentFilter = (CombinedFilter)fNode;
+         string comboboxName = FilterModel.ComboboxName + "." + currentFilter.Id;
+         string hiddenName = FilterModel.ParentIdName + "." + currentFilter.Id;
     %>
-    <% using (Html.BeginForm("AddFilterAnd", "Filter", FormMethod.Post, new { id = topFilter.Id, name = topFilter.Id })) %>
-    <% {    
-           
-            foreach (Filter fNode in topFilter.Filters)
-            {
-
-                CombinedFilter currentFilter = (CombinedFilter)fNode;
-                string comboboxName = FilterModel.ComboboxName + "." + currentFilter.Id;
-                string hiddenName = FilterModel.ParentIdName + "." + currentFilter.Id;
-    %>
-    <%: Html.Hidden(hiddenName,currentFilter.Id.ToString()) %>
-    <%: Html.DropDownList( comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
-    <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>" />
-</p>
+    <table border="0"><tr><td>
+    <%: Html.Hidden(hiddenName, currentFilter.Id.ToString())%>
+      <%: Html.Hidden("selectedFilter",null, new { Id = "selectedFilter" })%>
+       <%: Html.Hidden("action", null, new { Id = "action" })%>
+    <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
+   
+   
+    <input type="button" name="submitButton" value="+" class="hl-button-text-plus"   onClick="setAction('add','<%: currentFilter.Id%>');" />
+   <!-- <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>"  />-->
+</td></tr><tr><td>
 <!-- Build the selected filters. The filtesr will be stored in the session and the
 Controller puts the current filters from the session into the model. Selected Filters
@@ -42 +59 @@
            {  %>
 
-           <table border="0"><tr><td>
+           <tr><td>
     <%
            
 
-if ("StringComparisonFilter".Equals(f.GetType().Name))
-{  %>
+     if ("StringComparisonFilter".Equals(f.GetType().Name))
+     {  %>
     <% StringComparisonFilter filter = ((StringComparisonFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, (filter.Value))%>
-    <%: Html.TextBoxFor(model => ((FilterModel)Model).IntValue, (filter.Value)) %>
-    <%: Html.ValidationMessageFor(model => ((FilterModel)Model).IntValue) %>
+    <%: Html.TextBoxFor(model => ((FilterModel)Model).IntValue, (filter.Value))%>
+    <%: Html.ValidationMessageFor(model => ((FilterModel)Model).IntValue)%>
     <% }
-else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
+     { %>
     <% NameStringComparisonFilter filter = ((NameStringComparisonFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("StringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("StringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
+     { %>
     <% StringComparisonAvailableValuesFilter filter = ((StringComparisonAvailableValuesFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueTextbox, new SelectList(filter.AvailableValues, filter.Value))%>
     <% }
-else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
+     { %>
     <% NameEqualityComparisonByteArrayFilter filter = ((NameEqualityComparisonByteArrayFilter)f); %>
     <%: Html.Label(filter.Label)%>
     <%: Html.Label("not supported")%>
     <% }
-else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
+     { %>
     <% NameEqualityComparisonBoolFilter filter = ((NameEqualityComparisonBoolFilter)f);   %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.BoolComparisons, "Value", "Text",(int)filter.Comparison))%>      
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.BoolComparisons, "Value", "Text", (int)filter.Comparison))%>      
     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(((FilterModel)Model).BoolStates, filter.Value))%>
     <% }
-else if ("NameOrdinalComparisonIntFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameOrdinalComparisonIntFilter".Equals(f.GetType().Name))
+     { %>
     <% NameOrdinalComparisonIntFilter filter = ((NameOrdinalComparisonIntFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -89 +106 @@
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
+     { %>
     <% NameStringComparisonAvailableValuesFilter filter = ((NameStringComparisonAvailableValuesFilter)f);   %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text",(int)filter.Comparison))%>   
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons, "Value", "Text", (int)filter.Comparison))%>   
     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(filter.AvailableValues, filter.Value))%>
     <% }
-else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name))
+     { %>
     <% NameOrdinalComparisonDoubleFilter filter = ((NameOrdinalComparisonDoubleFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -103 +120 @@
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
+     { %>
     <% NameOrdinalComparisonFloatFilter filter = ((NameOrdinalComparisonFloatFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -110 +127 @@
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("NameOrdinalComparisonLongFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("NameOrdinalComparisonLongFilter".Equals(f.GetType().Name))
+     { %>
     <% NameOrdinalComparisonLongFilter filter = ((NameOrdinalComparisonLongFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -117 +134 @@
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
-else if ("OrdinalComparisonDateTimeFilter".Equals(f.GetType().Name))
-{ %>
+     else if ("OrdinalComparisonDateTimeFilter".Equals(f.GetType().Name))
+     { %>
     <% OrdinalComparisonDateTimeFilter filter = ((OrdinalComparisonDateTimeFilter)f);   %>
     <%: Html.Label(filter.Label)%>
@@ -126 +143 @@
                   
     %>
-
-    <input type="submit" name="submitButton" value="-.<%:f.Id%>"    />
+       <!-- <input type="submit" name="submitButton" value="-.<%:f.Id%>"  class="hl-icon-delete"  style="text-indent:-999em;"  />
+       -->
+    <input type="button" name="submitButton" value="-"  class="hl-icon-delete"  onClick="setAction('delete','<%: f.Id%>');" />
    
 <% }%>
-    </td></tr></table>
+    </td></tr>
     <% } %>
+     </table></td></tr>
  <%  }%>
    <% }%>
- <input type="submit" name="submitButton"  value="or" />
+
+
+
+ 
+  </table> <input type="button" name="submitButton"  value="or"  onClick="setAction('or','');"  />
  </br>
- <input type="submit" name="submitButton" value="runs" />
-
-  
-
-<% }
-      
-%> </td></tr>
-</table></div>
+ <input type="button" name="submitButton" value="runs"  onClick="setAction('runs','');" />
+ 
+ 
+<% }    
+%>
+ </div>

branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Web.config

@@ -13 +13 @@
   </connectionStrings>
   ImplementedEND-->
+  <appSettings>
+    <add key="ChartImageHandler" value="storage=memory;deleteAfterServicing=true;"/>
+  </appSettings>
+
 
   <system.web>
@@ -103 +107 @@
       <add name="ChartImageHandler"
          preCondition="integratedMode" 
-         verb="GET,HEAD"
+         verb="GET,HEAD,POST"
          path="ChartImg.axd"
-         type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+         type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
 
 
@@ -172 +176 @@
           </security>
         </binding>
-        <binding name="QueryService" closeTimeout="00:01:00" openTimeout="00:01:00"
-          receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false"
+        <binding name="QueryService" closeTimeout="00:03:00" openTimeout="00:03:00"
+          receiveTimeout="00:10:00" sendTimeout="00:03:00" bypassProxyOnLocal="false"
           transactionFlow="false" hostNameComparisonMode="StrongWildcard"
           maxBufferPoolSize="524288" maxReceivedMessageSize="99999999" messageEncoding="Text"