Changeset 13860 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers

Timestamp:

05/25/16 16:48:19 (9 years ago)

Author:

jlodewyc

Message:

#2582 RC2 migration fixed. OKB query implemented. Preparing for OKB manager

Location:

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

Files:

• HomeController.cs (modified) (1 diff)
• JobController.cs (modified) (5 diffs)
• QueryController.cs (added)
• ResourceController.cs (modified) (1 diff)
• UserController.cs (modified) (1 diff)

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

@@ -1 @@
-using HeuristicLab.Clients.Access;
-using HeuristicLab.Clients.Common;
-using HeuristicLab.Clients.Common.Properties;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.ServiceModel.Security;
-using Microsoft.AspNet.Http;
 using System;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+using Microsoft.AspNetCore.Http;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers

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

@@ -1 @@
-using Microsoft.AspNet.Mvc;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using Microsoft.AspNetCore.Mvc;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using System;
@@ -6 +27 @@
 using System.Threading.Tasks;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using System.ServiceModel.Security;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
+
 using System.IO;
 using Microsoft.Net.Http.Headers;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using System.Threading;
+
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -90 +111 @@
                 ViewBag.SessionId = HttpContext.Session.GetString("UserId");
                 ViewBag.Title = "Jobs";
-                return View(vm);
+                return View("Index", vm);
             }
             else
@@ -338 +359 @@
                 var serve = weblog.getFileOpener(userId);
                 serve.NewModel();
-                serve.env = _environment;
+                serve.env = (Microsoft.AspNetCore.Hosting.IHostingEnvironment)_environment;
                 serve.vm.directories = upper.DisplayDatePaths;
                 var ioptimizer = ContentManager.Load(upper.FullFilesPaths[filedex]);
@@ -465 +486 @@
                     {
                         var fileName = ContentDispositionHeaderValue.Parse(file.ContentDisposition).FileName.Trim('"');
-                        await file.SaveAsAsync(Path.Combine(uploads, fileName));
+                        await file.CopyToAsync(new FileStream(Path.Combine(uploads, fileName),FileMode.OpenOrCreate));
                         // var ioptimizer = ContentManager.Load(Path.Combine(uploads, fileName));
                         //OptimizerHiveTask task = new OptimizerHiveTask((IOptimizer)ioptimizer);

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

@@ -1 @@
-using HeuristicLab.Clients.Access;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.ServiceModel.Security;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers

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

@@ -1 @@
-using HeuristicLab.Clients.Access.Administration;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;