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

Timestamp:

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

Author:

cfleisch

Message:

#1499 styling filter and bubblechart, filter bugfixes

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Controllers

Files:

• ChartController.cs (modified) (2 diffs)
• FilterController.cs (modified) (1 diff)

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

@@ -37 +37 @@
       //  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);
+        long[] runIds = new long[0];
+      CombinedFilter cf = (CombinedFilter)Session["Content"];
+      if (cf != null)
+          runIds = client.GetRunIds(cf);
+
+    Run[] runs = client.GetRuns(runIds, false);
+    //  Run[] runs = Session[""];
+    cm.Runs = runs;
+    cm.UpdateRunCollection(runs);
+    cm.UpdateBubbleChart(selectedAxisY, selectedAxisX, selectedBubbleSize);
 
       return View("Index",cm);
@@ -213 +217 @@
 
       // Later, we will get the runs from the session ...
-      QueryServiceClient client = Query.GetClientFactory("okbtester", "okbtester");
-
-      long[] runIds = new long[5];
-      for (int i = 0; i < 5; i++) {
-        runIds[i] = i;
-      }
+      QueryServiceClient client = Query.GetClientFactory();
+
+      long[] runIds = new long[0];
+      CombinedFilter cf = (CombinedFilter)Session["Content"];
+      if (cf != null)
+          runIds = client.GetRunIds(cf);
+
       Run[] runs = client.GetRuns(runIds, false);
-
-      cm.UpdateRunCollection(runs);
+      cm.Runs = runs;
 
 

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

@@ -33 +33 @@
             {
                 ids = client.GetRunIds(fm.Content);
+
             }
             catch (Exception e)