Changeset 13689 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager

Timestamp:

03/11/16 12:56:12 (9 years ago)

Author:

jlodewyc

Message:

#2582 Implemented uploading

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager

Files:

• . (modified) (1 prop)
• Controllers/HomeController.cs (modified) (1 diff)
• Controllers/JobController.cs (modified) (7 diffs)
• Controllers/ResourceController.cs (added)
• Controllers/UserController.cs (added)
• ProgressHub.cs (added)
• Reqbin (added)
• Reqbin/ALGLIB-3.7.0.dll (added)
• Reqbin/AutoDiff-1.0.dll (added)
• Services/FileOpeningService.cs (added)
• Services/HiveClientWeb.cs (added)
• Startup.cs (modified) (6 diffs)
• ViewModels/FileOpeningViewModel.cs (added)
• ViewModels/JobViewModel.cs (modified) (2 diffs)
• ViewModels/UploadedJobViewModel.cs (modified) (2 diffs)
• Views/Job/Index.cshtml (modified) (4 diffs)
• Views/Job/OpenFile.cshtml (added)
• Views/Job/OpenFilePartials (added)
• Views/Job/OpenFilePartials/_Algorithm.cshtml (added)
• Views/Job/OpenFilePartials/_BatchRun.cshtml (added)
• Views/Job/OpenFilePartials/_Experiment.cshtml (added)
• Views/Job/Uploader.cshtml (added)
• Views/Job/Uploads.cshtml (added)
• Views/Resource (added)
• Views/Resource/Index.cshtml (added)
• Views/Shared/_Layout.cshtml (modified) (1 diff)
• Views/User (added)
• Views/User/Index.cshtml (added)
• project.json (modified) (4 diffs)
• project.lock.json (deleted)
• wwwroot/bower.json (added)
• wwwroot/js/Scripts (added)
• wwwroot/js/Scripts/hubber.js (added)
• wwwroot/js/jquery-2.1.1.js (added)
• wwwroot/js/jquery-2.1.1.min.js (added)
• wwwroot/js/jquery.signalR-2.1.2.js (added)
• wwwroot/js/jquery.signalR-2.1.2.min.js (added)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/HomeController.cs

@@ -27 +27 @@
                 var model = loginViewModelService.GetLoginViewModel();
                 HiveServiceLocatorWebManagerService hiveServiceLocator = (HiveServiceLocatorWebManagerService)HiveServiceLocatorWebManagerService.Instance;
-                Settings.Default.UserName = loginName;
-                Settings.Default.Password = Common.CryptoService.EncryptString(password);
-                Settings.Default.Save();
+                HeuristicLab.Clients.Common.Properties.Settings.Default.UserName = loginName;
+                HeuristicLab.Clients.Common.Properties.Settings.Default.Password = Common.CryptoService.EncryptString(password);
+                HeuristicLab.Clients.Common.Properties.Settings.Default.Save();
                 hiveServiceLocator.Username = loginName;
                 hiveServiceLocator.Password = password;

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/JobController.cs

@@ -14 +14 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using System.Threading;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -32 +33 @@
             _environment = env;
         }
+        #region Jobs
         public IActionResult Index()
         {
             try
             {
+
                 vm.userJobs = client.GetJobs();
             }
@@ -56 +59 @@
                 vm.userJobs = client.GetJobs();
                 vm.selectedJob = client.GetJob(id);
-                vm.jobTasks = client.GetLightweightJobTasks(id);
+
+                vm.lightJobTasks = client.GetLightweightJobTasks(id);
+                foreach (var light in vm.lightJobTasks)
+                {
+                    vm.filledJobTasks.Add(client.GetTask(light.Id));
+                }
                 ViewBag.Title = vm.selectedJob.Name + " - Jobs";
                 return View("Index", vm);
@@ -66 +74 @@
             }
         }
-        public IActionResult Delete(Guid id)
+        public IActionResult Delete(Guid id)// delete a job
         {
             if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
@@ -83 +91 @@
             }
         }
-
-        public IActionResult Upload()
+        #endregion
+
+        #region Uploads
+        public IActionResult Uploads()
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, -1);
+
+                ViewBag.Title = "Uploaded files";
+                return View("Uploads", upper);
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        public IActionResult UploadDir(int index)
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+
+                ViewBag.Title = "Uploaded files";
+                return View("Uploads", upper);
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        private void fillUploadsPaths(UploadedJobViewModel vm, int index)
+        {
+            var tempdex = index; //Fix when maps gets deleted
+            var start = Path.Combine(_environment.WebRootPath, "uploads", client.ClientCredentials.UserName.UserName);
+            var dirs = Directory.GetDirectories(start);
+            foreach (string dir in dirs)
+            {
+                if (Directory.GetFiles(dir).Length == 0 && Directory.GetDirectories(dir).Length == 0)
+                {
+                    Directory.Delete(dir, false);
+                    tempdex = -1;
+                }
+                else {
+                    vm.FullDatePaths.Add(dir);
+                    var temp = dir.Split('\\');
+                    vm.DisplayDatePaths.Add(temp[temp.Length - 1]);
+                }
+            }
+            if (tempdex != -1)
+            {
+                vm.SelectedIndex = tempdex;
+                dirs = Directory.GetFiles(vm.FullDatePaths[tempdex]);
+                foreach (string dir in dirs)
+                {
+                    vm.FullFilesPaths.Add(dir);
+                    var temp = dir.Split('\\');
+                    vm.DisplayFilesPaths.Add(temp[temp.Length - 1]);
+                }
+            }
+        }
+        public IActionResult DeleteFile(int index, int filedex)
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+                System.IO.File.Delete(upper.FullFilesPaths[filedex]);
+                var message = upper.DisplayFilesPaths[filedex] + " has been deleted";
+
+                upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+                upper.message = message;
+                ViewBag.Title = "Uploaded files";
+
+                return View("Uploads", upper);
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+
+        public IActionResult OpenFile(int index, int filedex)
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+
+                FileOpeningService serve = FileOpeningService.Instance;
+                serve.NewModel();
+                serve.env = _environment;
+
+                var ioptimizer = ContentManager.Load(upper.FullFilesPaths[filedex]);
+
+                serve.vm.SelectedTask = new OptimizerHiveTask((IOptimizer)ioptimizer);
+                if (serve.vm.SelectedTask.ItemTask.Item is IAlgorithm)
+                {
+                    serve.vm.SelectedAlgorithm = (IAlgorithm)serve.vm.SelectedTask.ItemTask.Item;
+                }
+                else if (serve.vm.SelectedTask.ItemTask.Item is BatchRun)
+                {
+                    serve.vm.SelectedBatchRun = (BatchRun)serve.vm.SelectedTask.ItemTask.Item;
+                }
+                else if (serve.vm.SelectedTask.ItemTask.Item is Experiment)
+                {
+                    serve.vm.SelectedExperiment = (Experiment)serve.vm.SelectedTask.ItemTask.Item;
+                }
+
+                ViewBag.Title = serve.vm.SelectedTask.ItemTask.Name + " - Open file";
+
+                return View("OpenFile", serve.vm);
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+
+        public IActionResult AddToHive()
+        {
+            if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+            {
+                    var job = FileOpeningService.Instance.AddCurrentModelToHive();
+                    while (job.Progress.ProgressValue != 1)
+                    { }
+
+                    Thread.Sleep(1000);
+                    job.Progress.Status = "Upload finished";
+                    Thread.Sleep(2000);
+                    return RedirectToAction("Index", "Job");
+            }
+            else
+            {
+                HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        //TODO Work in progress
+        /* public async Task<IActionResult> DownloadFile(int index, int filedex)
+         {
+             if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
+             {
+                 UploadedJobViewModel upper = new UploadedJobViewModel();
+                 fillUploadsPaths(upper, index);
+
+                HttpContext.Response.ContentType = "APPLICATION/OCTET-STREAM";
+                 String Header = "Attachment; Filename=" + upper.DisplayFilesPaths[filedex];
+                 HttpContext.Response.Headers.Add("Content-Disposition", Header);
+                 System.IO.FileInfo Dfile = new System.IO.FileInfo(upper.FullFilesPaths[filedex]);
+                 await HttpContext.Response.WriteAsync(Dfile.FullName);
+                 //HttpContext.Response.End();
+
+                 var message = upper.DisplayFilesPaths[filedex] + " has been downloaded";
+
+                 upper.message = message;
+                 ViewBag.Title = "Downloaded file";
+
+                 return View("Uploads", upper);
+             }
+             else
+             {
+                 HiveServiceLocatorWebManagerService.SetLoginErrorMessage();
+                 return RedirectToAction("Index", "Home");
+             }
+         }*/
+
+        #endregion
+
+        #region Uploader
+        public IActionResult Uploader()
         {
             if (((HiveServiceLocatorWebManagerService)(HiveServiceLocatorWebManagerService.Instance)).CheckLogin())
             {
                 ViewBag.Title = "Upload Jobs";
-                return View("Upload");
+                ViewBag.Name = client.ClientCredentials.UserName.UserName;
+                return View("Uploader");
             }
             else
@@ -98 +283 @@
         }
         [HttpPost]
-        public async Task<IActionResult> Upload(ICollection<IFormFile> files)
+        public async Task<IActionResult> Uploader(ICollection<IFormFile> files, string directory)
         {
 
             UploadedJobViewModel upper = new UploadedJobViewModel();
-            var uploads = Path.Combine(_environment.WebRootPath, "uploads");
+            var uploads = Path.Combine(_environment.WebRootPath, "uploads", client.ClientCredentials.UserName.UserName,
+                directory);
+            Directory.CreateDirectory(uploads);
             foreach (var file in files)
             {
@@ -109 +296 @@
                     var fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"');
                     await file.SaveAsAsync(Path.Combine(uploads, fileName));
-                    var ioptimizer = ContentManager.Load(Path.Combine(uploads, fileName));
-                    OptimizerHiveTask task = new OptimizerHiveTask((IOptimizer)ioptimizer);
-                    upper.Tasks.Add(task);
+                    // var ioptimizer = ContentManager.Load(Path.Combine(uploads, fileName));
+                    //OptimizerHiveTask task = new OptimizerHiveTask((IOptimizer)ioptimizer);
+                    //upper.Tasks.Add(task);
                 }
             }
             ViewBag.Title = "Upload complete";
-            return View();
-
-        }
+            return RedirectToAction("Uploads", "Job");
+
+        }
+        #endregion
     }
 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Startup.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
 using Microsoft.Extensions.DependencyInjection;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
@@ -11 +6 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.PluginInfrastructure;
+
 
 namespace HeuristicLab.Clients.Hive.WebJobManager
@@ -16 +13 @@
     public class Startup
     {
-        private IHostingEnvironment hostingEnvironment;
+        public IHostingEnvironment hostingEnvironment {
+            get; set; }
         public Startup(IHostingEnvironment hostingEnvironment)
         {
@@ -23 +21 @@
                 .AddEnvironmentVariables();
             var config = builder.Build();
+
+            ApplicationManager.InitializeForWeb();
+
+
             ContentManager.Initialize(new PersistenceContentManager());
             //Console.WriteLine(""+ config.Get("configuration"));
@@ -34 +36 @@
             services.AddMvc();
             services.AddSingleton<ILoginViewModelService, LoginViewModelService>();
+            services.AddSingleton<IHiveServiceLocator, HiveServiceLocatorWebManagerService>();
+            services.AddSignalR();
         }
 
@@ -39 +43 @@
         public void Configure(IApplicationBuilder app)
         {
+            
             if (hostingEnvironment.IsDevelopment())
                 app.UseDeveloperExceptionPage();
 
             app.UseIISPlatformHandler();
+            
+            app.UseStaticFiles();
+            app.UseSignalR();
+            app.UseStatusCodePages();
+            app.UseMvcWithDefaultRoute();
+        }
 
-            app.UseMvcWithDefaultRoute();
-            app.UseStaticFiles();
-            app.UseStatusCodePages();
-        }
+
 
         // Entry point for the application.

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/JobViewModel.cs

@@ -10 +10 @@
         public List<Job> userJobs { get; set; }
 
-        public List<LightweightTask> jobTasks { get; set; }
+        public List<LightweightTask> lightJobTasks { get; set; }
+        public List<Task> filledJobTasks { get; set; }
         public Job selectedJob { get; set; }
         public string message { get; set; }
@@ -17 +18 @@
             userJobs = null;
             selectedJob = null;
+            filledJobTasks = new List<Task>();
             message = "";
         }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/UploadedJobViewModel.cs

@@ -1 @@
-using System;
+using HeuristicLab.Optimization;
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8 +9 @@
     public class UploadedJobViewModel
     {
-        public List<OptimizerHiveTask> Tasks { get; set; }
+        public UploadedJobViewModel()
+        {
+            FullDatePaths = new List<string>();
+            DisplayDatePaths = new List<string>();
+            FullFilesPaths = new List<string>();
+            DisplayFilesPaths = new List<string>();
+            SelectedIndex = -1;
+        }
+
+        public List<string> FullDatePaths { get; set; }
+        public List<string> DisplayDatePaths { get; set; }
+        public List<string> FullFilesPaths { get; set; }
+        public List<string> DisplayFilesPaths { get; set; }
+        public int SelectedIndex { get; set; }
+        public string message { get; set; }
+
+        
     }
 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml

@@ -12 +12 @@
     </div>
     <div class="row" style="margin:10px">
-        <a class="btn btn-success btn-lg btn-block"
+        <a class="btn btn-info btn-lg btn-block"
            asp-controller="Job"
-           asp-action="Upload">
-            Add job
+           asp-action="Uploads">
+            Uploads
         </a>
     </div>
@@ -46 +46 @@
                 <div class="col-sm-8" style="padding:5px; padding-left:10px;">
                     <div class="row">
-                        <h2 style="padding-left:20px"> @Model.selectedJob.Name
-                            <a asp-action="Delete" asp-route-id="@Model.selectedJob.Id" asp-controller="Job" style="margin-bottom:10px;" id="del" class='btn btn-danger'>
+                        <h2 style="padding-left:20px">
+                            @Model.selectedJob.Name
+                            <a onclick="popUpDelete()"
+                               style="margin-bottom:10px;" 
+                               
+                               class='btn btn-danger'>
                                 <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
                             </a>
-</h2>
+                            <a style="display:none" 
+                               asp-action="Delete" 
+                               asp-route-id="@Model.selectedJob.Id" 
+                               asp-controller="Job" id="del"  ></a>
+
+                            <script type="text/javascript">
+                                function popUpDelete() {
+                                    if (confirm("Are you sure you want to delete this job?") == true) {
+                                        document.getElementById("del").click();
+                                    }
+
+                                }
+                            </script>
+            
+                        </h2>
                         <div class="col-sm-6" style="padding-left:30px">
                             <p>Description: @Model.selectedJob.Description</p>
@@ -59 +77 @@
                         </div>
                         <div class="col-sm-6" style="padding-left:30px">
-                            <p>Jobs: @Model.selectedJob.JobCount</p>
                             <p>Calculating: @Model.selectedJob.CalculatingCount</p>
                             <p>Finished: @Model.selectedJob.FinishedCount</p>
@@ -66 +83 @@
                     </div>
                     <div class="row">
-                        <h3 style="padding-left:20px">@Model.jobTasks.Count Task@(Model.jobTasks != null && Model.jobTasks.Count != 1 ? "s" : "" )</h3>
-                        @foreach (var task in Model.jobTasks)
+                        <h3 style="padding-left:20px">@Model.lightJobTasks.Count Task@(Model.lightJobTasks != null && Model.lightJobTasks.Count != 1 ? "s" : "" )</h3>
+                        @foreach (var task in Model.lightJobTasks)
                         {
-                            <p style="padding-left:30px" >
-                                Last update @task.LastTaskDataUpdate - @task.State - @task.ExecutionTime executed - created @task.DateCreated
-                            </p>
+                            <table class="table " 
+                                   style="margin-left:20px;">
+                                <thead>
+                                    <tr>
+                                        <th>@task</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>Last update @task.LastTaskDataUpdate</td>
+                                        <td>State: @task.State</td>
+                                        
+                                    </tr>
+                                    <tr>
+                                        <td>@task.ExecutionTime executed</td>
+                                        <td>Created: @task.DateCreated</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+
                         }
                     </div>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/_Layout.cshtml

@@ -20 +20 @@
             </div>
         </nav>
-        <environment names="Development">
-            <script asp-src-include="~/js/*.js"></script>
-        </environment>
-        <environment names="Staging, Production">
-            <script src="~/js/min/site.min.js"></script>
-        </environment>
+
+        <script src="~/js/jquery-2.1.1.js"></script>
+        <script src="~/js/bootstrap.js"></script>
+      
+        <script src="~/js/jquery.signalr-2.1.2.js"></script>
+        <script src='~/signalr/js'></script>
+        <script src="~/js/morris.js"></script>
+        <script src="~/js/npm.js"></script>
+        <script src="~/js/raphael.js"></script>
         @RenderBody()
     </div>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/project.json

@@ -10 +10 @@
 
   "dependencies": {
+    "Microsoft.AspNet.Http.Abstractions": "1.0.0-rc1-final",
     "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-final",
     "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
     "Microsoft.AspNet.Loader.IIS": "1.0.0-beta7",
     "Microsoft.AspNet.Mvc": "6.0.0-rc1-final",
+    "Microsoft.AspNet.Owin": "1.0.0-rc1-final",
     "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-final",
     "Microsoft.AspNet.Server.IIS": "1.0.0-beta7",
     "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-final",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final"
+    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
+    "Microsoft.AspNet.SignalR.Server": "3.0.0-rc1-final",
+    "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-final",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc1-final"
   },
 
@@ -28 +33 @@
     "dnx451": {
       "dependencies": {
+        "ALGLIB-3.7.0": "1.0.0-*",
+        "AutoDiff-1.0": "1.0.0-*",
         "HeuristicLab.Algorithms.ALPS-3.3": "1.0.0-*",
         "HeuristicLab.Algorithms.Benchmarks-3.3": "1.0.0-*",
@@ -65 +72 @@
         "HeuristicLab.Encodings.LinearLinkageEncoding-3.3": "1.0.0-*",
         "HeuristicLab.Encodings.PermutationEncoding-3.3": "1.0.0-*",
+        "HeuristicLab.Encodings.PermutationEncoding.Views-3.3": "1.0.0-*",
         "HeuristicLab.Encodings.RealVectorEncoding-3.3": "1.0.0-*",
         "HeuristicLab.Encodings.ScheduleEncoding-3.3": "1.0.0-*",
@@ -122 +130 @@
         "HeuristicLab.SequentialEngine-3.3": "1.0.0-*",
         "HeuristicLab.Tracing-3.3": "1.0.0-*",
-        "ALGLIB-3.7.0": "1.0.0-*",
-        "AutoDiff-1.0": "1.0.0-*"
+        "HeuristicLab 3.3": "1.0.0-*"
       },
       "frameworkAssemblies": {
+        "System.configuration": "4.0.0.0",
         "System.Drawing": "4.0.0.0",
         "System.IdentityModel": "4.0.0.0",
+        "System.Net.Http": "4.0.0.0",
+        "System.Runtime.Serialization": "4.0.0.0",
         "System.ServiceModel": "4.0.0.0",
         "System.Web": "4.0.0.0"