Changeset 9062 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers

Timestamp:

12/17/12 09:37:16 (12 years ago)

Author:

fschoepp

Message:

#1888:
Backend changes:

• Simplified job state detection (only one hive call will be made to detect all states now, instead of one additional call per job)
• Reorganized classes (moved model classes into Model folder)

Website changes:

• Website now heavily uses JavaScript to achieve better user experience
• JavaScript degrades gracefully, except for plots
• Tables: Added jquery-datatable-plugin to extend tables (pagination + search functionality)
• OaaS-Website now uses the design of the HL websites (found in WebApplication branch)
• Added jqplot to render zoomable line plots for HL-Datatables
• Styling.js: Plots will be generated by using an ajax call; additional jquery-styling occurs within this file.
• Added jquery-ui-1.9.2 which is capable of handling/rendering tabs, accordions and resizers.

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers

Files:

• ChartController.cs (added)
• OptimizationController.cs (modified) (3 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/OptimizationController.cs

@@ -22 +22 @@
 
       public T withControllerService<T>(ControllerServiceDelegate<T> del) {
+        if (Session["pw"] == null)
+          Response.Redirect("/Account/Logon");
+
         using (var cf = new ChannelFactory<IControllerService>(OptimizationController.DEFAULT_CONTROLLER_ENDPOINT)) {
           var credentialBehaviour = cf.Endpoint.Behaviors.Find<ClientCredentials>();
@@ -32 +35 @@
 
       public void withControllerService(ControllerServiceDelegate del) {
-        using (var cf = new ChannelFactory<IControllerService>(OptimizationController.DEFAULT_CONTROLLER_ENDPOINT)) {
+        if (Session["pw"] == null)
+          Response.Redirect("/Account/Logon");
+
+        using (var cf = new ChannelFactory<IControllerService>(OptimizationController.DEFAULT_CONTROLLER_ENDPOINT)) {          
           var credentialBehaviour = cf.Endpoint.Behaviors.Find<ClientCredentials>();
           credentialBehaviour.UserName.UserName = Membership.GetUser().UserName;
-          credentialBehaviour.UserName.Password = Session["pw"] as string;
+          credentialBehaviour.UserName.Password = Session["pw"] as string;          
           var controllerProxy = cf.CreateChannel();
           del(controllerProxy);
@@ -73 +79 @@
           });
           JobDetailsModel jdm = new JobDetailsModel() { Job = job, Runs = runs };
+          Session["jobDetails"] = jdm;
           return View(jdm);
         }