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

Timestamp:

04/24/13 13:40:43 (11 years ago)

Author:

fschoepp

Message:

#1888:

• Added visual extensions (dynamic JavaScript) which will be used to render additional result parameters specific to scenarios (e. g. create a graphical representation of a TSP).
• Added relationship between jobs and experiments (otherwise, it's not possible to get the job's experiment).
• Updated Admin page to allow removal/addition of visual extensions.
• Added back-end logic to store/retrieve/delete visual extensions.
• Added visual extension functionality to the JavaScript views/controllers (job.*.js).
• Added tsp.js which is a visual extension for the "Genetic Algorithm - TSP" scenario. It adds a graphical representation of the TSP (just like the C# version does) to the results.

Location:

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

Files:

• AdminController.cs (modified) (2 diffs)
• JobController.cs (modified) (1 diff)

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

@@ -34 +34 @@
         public ActionResult Index()
         {
-          var names = ControllerService.withControllerService<IEnumerable<string>>((service) => {            
+          var names = ControllerService.withControllerService<IEnumerable<ScenarioModel>>((service) => {            
             User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
-            return service.GetOptimizationScenarioNames();
+            var scenModel = new List<ScenarioModel>();
+            var scenarios = service.GetOptimizationScenarioNames();
+            foreach (var scenario in scenarios) {
+              scenModel.Add(new ScenarioModel() { Exists = service.ExistsVisualExtension(scenario), Scenario = scenario });              
+            }
+            return scenModel;
           });
           return View(names);
@@ -65 +70 @@
         }
 
+        [HttpPost]
+        public ActionResult AddVisualExtension(UploadVisualExtension extension) {          
+          StreamReader reader = new StreamReader(extension.ScenarioJs.InputStream);
+          string scenarioJs = reader.ReadToEnd();
+
+          var ok = ControllerService.withControllerService<bool>((service) => {
+            OptimizationModel model = new OptimizationModel();
+            User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+            return service.AddVisualExtension(extension.ScenarioId, scenarioJs);
+          });
+          return RedirectToAction("Index");
+        }
+
+        [HttpPost]
+        public ActionResult DeleteVisualExtension(UploadVisualExtension extension) {
+          var ok = ControllerService.withControllerService<bool>((service) => {
+            OptimizationModel model = new OptimizationModel();
+            User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+            return service.DeleteVisualExtension(extension.ScenarioId);
+          });
+          return RedirectToAction("Index");
+        }
+
         public ActionResult DeleteScenario(string id) {
           ControllerService.withControllerService<bool>((service) => {            

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

@@ -59 +59 @@
 
       [HttpGet]
-      public ActionResult VisualExtension(string algorithmId) {
-        var script = ControllerService.withControllerService<string>((service) => {
+      public JsonResult VisualExtension(string scenarioId) {
+        var extension = ControllerService.withControllerService<VisualExtension>((service) => {
           User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
-          return service.GetVisualExtension(algorithmId);
+          return service.GetVisualExtension(scenarioId);
         });
-        return Content(script, "text/javascript", System.Text.Encoding.UTF8);
+        return Json(extension, JsonRequestBehavior.AllowGet);
       }
     }