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

Timestamp:

08/20/12 13:00:30 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Web project now creates custom html for each type we want to enter / display
• Added endpointConfigurationName to HiveServiceLocator (because Web Project contains more than one endpoint configuration)
• Removed logging statement from ConfigurationService to prevent exception during failure of loading ConfigurationSettings
• ApplicationManager: Changed default implementation to WebApplicationManager (instead of LightWeight) for testing purposes within Web Project
• WebApplicationManager: The application manager which returns plugin descriptors from the currently loaded assemblies (instead of LightweightAppManager)
• HiveService: Fixed a transaction bug
• IControllerService: Created a method to dispatch Scenarios to certain IScenarioManager (in this case HiveScenarioManager)
• Added more mappable types to ControllerModel
• PlaceholderControllerService dispatches all Scenarios to the HiveScenarioManager
• Web project now dispatches the scenario to the controller after pressing "Run Job"

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/OptimizationController.cs (modified) (2 diffs)

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

@@ -33 +33 @@
 
         public ActionResult ProblemParameters(string scenario) {
-          OptimizationScenario optScenario;
+          OptimizationScenario optScenario;          
           using (var cf = new ChannelFactory<IControllerService>(OptimizationController.DEFAULT_CONTROLLER_ENDPOINT)) {
             var credentialBehaviour = cf.Endpoint.Behaviors.Find<ClientCredentials>();
@@ -40 +40 @@
             var controllerProxy = cf.CreateChannel();
             optScenario = controllerProxy.GetOptimizationScenarioByName(scenario);
+            Session["scenario"] = optScenario;
           }
-          return View(optScenario);
+          return View(optScenario.InputParameters);
         }
 
         [HttpPost]
-        public ActionResult ProblemParameters(OptimizationScenario scenario) {
+        public ActionResult ProblemParameters(InputParameters parameters) {
           if (ModelState.IsValid) {
-            // store it... maybe
-          }
-          return View(scenario);
+            return RedirectToAction("AlgorithmParameters", parameters);
+          } 
+          return View(parameters);        
         }
 
+        public ActionResult AlgorithmParameters() {
+          return View((Session["scenario"] as OptimizationScenario).AlgorithmParameters);
+        }
+
+        [HttpPost]
+        public ActionResult AlgorithmParameters(AlgorithmParameters parameters) {
+          if (ModelState.IsValid) {
+            return RedirectToAction("ScheduleJob");
+          }
+          return View(parameters);
+        }
+
+        public ActionResult ScheduleJob() {
+          return View(Session["scenario"]);
+        }
+
+        [HttpPost]
+        public ActionResult ScheduleJob(OptimizationScenario scenario) {
+          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;
+            var controllerProxy = cf.CreateChannel();
+            controllerProxy.ScheduleOptimizationScenario(Session["scenario"] as OptimizationScenario);
+          }
+          return RedirectToAction("Index");
+        }
     }
 }