Changeset 9362

Timestamp:

04/16/13 08:57:22 (11 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

Files:

• HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs (modified) (4 diffs)
• HeuristicLab.Services.Optimization.Controller/HL/HiveScenarioManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Optimization.Controller/Interfaces/DAL.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Controller/Interfaces/IControllerService.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Controller/Interfaces/IScenarioManager.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Controller/Interfaces/Model/ControllerModel.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Controller/Mockup/MockupDAL.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Controller/Mockup/MockupScenarioManager.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Controller/Parsers/AlgorithmConverter.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Controller/PlaceholderControllerService.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Web/Content/job.model.js (modified) (1 diff)
• HeuristicLab.Services.Optimization.Web/Controllers/JobController.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Web/Models/AdminModels.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Web/Views/Admin/Index.cshtml (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Azure/DAL.cs

@@ -17 +17 @@
     public static readonly string EXPERIMENT_TABLE = "Experiment";
     public static readonly string EXPERIMENT_BLOB_CONTAINER = "experiment";
+    public static readonly string VISUAL_BLOB_CONTAINER = "visualextensions";
     public static readonly string CLOUD_SETTINGS_KEY = "Cloudia.WindowsAzure.Storage";
 
@@ -289 +290 @@
       return AlgorithmConverter.ConvertJsonToExperiment(blob.DownloadText());
     }
-
+  }
+
+  public class VisualExtensionDao : IVisualExtensionDao {
+    public CloudBlobClient BlobClient { get; set; }
+
+    public bool Add(string algorithmId, string script) {
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.VISUAL_BLOB_CONTAINER);
+      container.CreateIfNotExist();
+      var blob = container.GetBlobReference(algorithmId);
+      blob.UploadText(script);
+      return true;
+    }
+
+    public bool DeleteById(string algorithmId) {
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.VISUAL_BLOB_CONTAINER);
+      container.CreateIfNotExist();
+      var blob = container.GetBlobReference(algorithmId);
+      return blob.DeleteIfExists();
+    }
+
+    public string FindById(string algorithmId) {
+      CloudBlobContainer container = BlobClient.GetContainerReference(AzureConstants.VISUAL_BLOB_CONTAINER);
+      container.CreateIfNotExist();
+      var blob = container.GetBlobReference(algorithmId);
+      return blob.DownloadText();
+    }
   }
 
@@ -296 +322 @@
     private IBlobDao blobDao;
     private IExperimentDao expDao;
+    private IVisualExtensionDao visualDao;
 
     private CloudStorageAccount storageAccount;
@@ -340 +367 @@
       }
     }
+
+
+    public IVisualExtensionDao VisualExtensionDao {
+      get {
+        if (visualDao == null) {
+          visualDao = new VisualExtensionDao() { BlobClient = StorageAccount.CreateCloudBlobClient() };
+        }
+        return visualDao;
+      }
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HL/HiveScenarioManager.cs

@@ -294 +294 @@
             Model.Run taskRun = new Model.Run();
             taskRun.Id = taskRun.Name = run.Name;
+            taskRun.AlgorithmName = run.Algorithm.Name;
             IList<Parameter> resultValues = new List<Model.Parameter>();
             foreach (var key in run.Results.Keys) {
@@ -611 +612 @@
       return dal.ExperimentDao.GetExperimentById(user, nodeId);
     }
+
+
+    public string GetVisualExtension(string algorithmId) {
+      return dal.VisualExtensionDao.FindById(algorithmId);
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/DAL.cs

@@ -36 +36 @@
   }
 
+
+  public interface IVisualExtensionDao {
+    bool Add(string algorithmId, string script);
+    bool DeleteById(string algorithmId);
+    string FindById(string algorithmId);
+  }
+
   public interface IDataAccessLayer {
     IScenarioDao ScenarioDao { get; }
     IBlobDao BlobDao { get; }
     IExperimentDao ExperimentDao { get; }
+    IVisualExtensionDao VisualExtensionDao { get; }
   }
+
 
   public static class DataAccessLayerProvider {    

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/IControllerService.cs

@@ -66 +66 @@
     [OperationContract]
     Experiment GetExperimentById(User u, string nodeId);
+
+    [OperationContract]
+    string GetVisualExtension(string algorithmId);
+
+    [OperationContract]
+    bool AddVisualExtension(string algorithmId, string script);
+
+    [OperationContract]
+    bool DeleteVisualExtension(string algorithmId);
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/IScenarioManager.cs

@@ -28 +28 @@
     
     bool DispatchExperiment(User user, Experiment exp, JobExecutionDetails details);
+
+    string GetVisualExtension(string algorithmId);
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/Model/ControllerModel.cs

@@ -483 +483 @@
     [DataMember]
     public IList<Parameter> InputParameters { get; set; }
+
+    public string AlgorithmName { get; set; }
   }
 

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Mockup/MockupDAL.cs

@@ -253 +253 @@
       }      
     }
+
+
+    public IVisualExtensionDao VisualExtensionDao {
+      get { throw new NotImplementedException(); }
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Mockup/MockupScenarioManager.cs

@@ -286 +286 @@
       throw new NotImplementedException();
     }
+
+
+    public string GetVisualExtension(string algorithmId) {
+      throw new NotImplementedException();
+    }
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Parsers/AlgorithmConverter.cs

@@ -190 +190 @@
       jrun["results"] = ConvertParametersToJson(run.Results);
       jrun["params"] = ConvertParametersToJson(run.InputParameters);
+      jrun["algorithmName"] = run.AlgorithmName;
       return jrun;
     }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/PlaceholderControllerService.cs

@@ -192 +192 @@
       return hiveManager.GetExperimentById(u, nodeId);
     }
+
+
+    public string GetVisualExtension(string algorithmId) {
+      return hiveManager.GetVisualExtension(algorithmId); 
+    }
+
+
+    public bool AddVisualExtension(string algorithmId, string script) {
+      return hiveManager.AddVisualExtension(algorithmId, script);
+    }
+
+    public bool DeleteVisualExtension(string algorithmId) {
+      return hiveManager.DeleteVisualExtension(algorithmId);
+    }
   }
 }

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>
 }