Changeset 9362 for branches/OaaS/HeuristicLab.Services.Optimization.Web

Timestamp:

04/16/13 08:57:22 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added IVisualExtensionDao to the backend representing js extension that create new viewable elements of an algorithm.
• Started to upgrade the frontend to render those new javascript UI extensions.

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Web

Files:

• Content/job.model.js (modified) (1 diff)
• Controllers/JobController.cs (modified) (1 diff)
• Models/AdminModels.cs (modified) (1 diff)
• Views/Admin/Index.cshtml (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Content/job.model.js

@@ -61 +61 @@
             id: null,
             name: null,
-            results: null
+            results: null,
+            inputs: null,
+            algorithmName: null
         }
     });

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

@@ -57 +57 @@
         return Content(AlgorithmConverter.ConvertRunsToJson(runs).ToString(), "application/json", System.Text.Encoding.UTF8);
       }
+
+      [HttpGet]
+      public ActionResult VisualExtension(string algorithmId) {
+        var script = ControllerService.withControllerService<string>((service) => {
+          User u = new User() { Username = Membership.GetUser().UserName, Password = Session["pw"] as string };
+          return service.GetVisualExtension(algorithmId);
+        });
+        return Content(script, "text/javascript", System.Text.Encoding.UTF8);
+      }
     }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Web/Models/AdminModels.cs

@@ -23 +23 @@
     }
 
+    private HttpPostedFileBase scenarioJs;
+
+    public HttpPostedFileBase ScenarioJs {
+      get { return scenarioJs; }
+      set { scenarioJs = value; }
+    }
+
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Admin/Index.cshtml

@@ -13 +13 @@
     <label for="scenarioMapper">Scenario XML</label>
     <input type="file" name="scenarioXml" id="scenarioXml" />
-    <input type="submit" value="Upload scenario" />
+    <label for="scenarioMapper">Visual extension (JavaScript) for Scenario</label>
+    <input type="file" name="scenarioJs" id="scenarioJs" />
+    <input type="submit" value="Upload scenario" />    
   </fieldset>
 }