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

Timestamp:

03/30/16 17:30:01 (9 years ago)

Author:

jlodewyc

Message:

#2582 Job Manager done. Start user management

Location:

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

Files:

• JobController.cs (modified) (6 diffs)
• ResourceController.cs (modified) (2 diffs)
• UserController.cs (modified) (5 diffs)

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

@@ -138 +138 @@
 
                 vm.userJobs = clientWeb.Jobs.ToList();
-                ViewBag.Title = "Jobs";
+                ViewBag.Title = vm.message + " - Jobs";
                 return View("Index", vm);
             }
@@ -161 +161 @@
                 fillUploadsPaths(upper, -1);
                 ViewBag.Name = serviceClient.ClientCredentials.UserName.UserName;
-                ViewBag.Title = "Uploaded files";
+                ViewBag.Title = "Uploads";
                 return View("Uploads", upper);
             }
@@ -181 +181 @@
                 UploadedJobViewModel upper = new UploadedJobViewModel();
                 fillUploadsPaths(upper, index);
-
-                ViewBag.Title = "Uploaded files";
+                if(index != -1)
+                    ViewBag.Title = upper.DisplayDatePaths[index] + " - Uploads";
+                else
+                    ViewBag.Title = "Add files - Uploads";
                 return View("Uploads", upper);
             }
@@ -244 +246 @@
                 fillUploadsPaths(upper, index);
                 upper.message = message;
-                ViewBag.Title = "Uploaded files";
+                ViewBag.Title = "File deleted - Uploads";
 
                 return View("Uploads", upper);
@@ -288 +290 @@
                 serve.setTasks();
                 ViewBag.JobsCount = serve.Job.Job.JobCount;
-                ViewBag.Title = serve.vm.SelectedTask.ItemTask.Name + " - Open file";
+                ViewBag.Title = serve.vm.SelectedTask.ItemTask.Name + " - Uploads";
                 ViewBag.SessionId = HttpContext.Session.GetString("UserId");
                 return View("OpenFile", serve.vm);
@@ -378 +380 @@
                 }
             }
-            ViewBag.Title = "Upload complete";
+            ViewBag.Title = "Upload complete - Uploads";
             return RedirectToAction("Uploads", "Job");
 

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

@@ -24 +24 @@
         {
             weblog = WebLoginService.Instance;
+            _environment = env;
+        }
+        private void init()
+        {
             var u = HttpContext.Session.GetString("UserId");
             if (u == null || u == "" || Guid.Parse(u) == Guid.Empty)
@@ -32 +36 @@
                 clientWeb = new HiveClientWeb(serviceLocator, userId);
             }
-            else {
+            else
+            {
                 userId = Guid.Parse(u);
-
                 serviceLocator = weblog.getServiceLocator(userId);
                 serviceClient = serviceLocator.getHiveServiceClient();
                 clientWeb = weblog.getClientWeb(userId);
             }
-
-            _environment = env;
         }
         public IActionResult Index()
         {
+            init();
             if (serviceLocator.CheckLogin())
             {

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

@@ -1 @@
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
+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;
@@ -11 +13 @@
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
 {
-    public class UserController: Controller
+    public class UserController : Controller
     {
         private WebLoginService weblog;
         private HiveServiceLocatorWeb serviceLocator;
-        private HiveServiceClient serviceClient;
-        private HiveClientWeb clientWeb;
+        private AccessAdministrationClient accessClient;
         private Guid userId;
 
@@ -24 +25 @@
         {
             weblog = WebLoginService.Instance;
+            _environment = env;
+        }
+        #region Users
+        private void init()
+        {
             var u = HttpContext.Session.GetString("UserId");
             if (u == null || u == "" || Guid.Parse(u) == Guid.Empty)
@@ -29 +35 @@
                 userId = Guid.Empty;
                 serviceLocator = new HiveServiceLocatorWeb();
-                serviceClient = serviceLocator.getHiveServiceClient();
-                clientWeb = new HiveClientWeb(serviceLocator, userId);
             }
-            else {
+            else
+            {
                 userId = Guid.Parse(u);
-
                 serviceLocator = weblog.getServiceLocator(userId);
-                serviceClient = serviceLocator.getHiveServiceClient();
-                clientWeb = weblog.getClientWeb(userId);
+                accessClient = weblog.getAccessAdminClient(userId);
             }
-
-            _environment = env;
         }
         public IActionResult Index()
         {
+            init();
             if (serviceLocator.CheckLogin())
             {
-                
-                ViewBag.Title = "User management";
-                return View("Index");
+
+                ViewBag.Title = "Users";
+                // accessClient.RefreshUsers();
+                UserViewModel vm = new UserViewModel();
+                vm.users = new List<string>() { "Jean" };
+                return View("Index", vm);
             }
             else
@@ -55 +60 @@
             }
         }
+        public IActionResult SelectUser(string id)
+        {
+            init();
+            if (serviceLocator.CheckLogin())
+            {
+                Guid curr = Guid.Parse(id);
+                UserViewModel vm = new UserViewModel();
+                vm.users = new List<string>() { "Jean" };
+                if (curr == Guid.Empty)
+                {
+                    vm.SelectedUser = "";
+                    ViewBag.Title = "Add User";
+                }
+                else
+                {
+                    vm.SelectedUser = "Jean";
+                    ViewBag.Title = "Jean";
+                }
+                ViewBag.Title += " - Users";
+                return View("Index", vm);
+            }
+            else
+            {
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        #endregion
+
+        #region Groups
+        public IActionResult Groups()
+        {
+            init();
+            if (serviceLocator.CheckLogin())
+            {
+
+                ViewBag.Title = "Groups";
+                // accessClient.RefreshUsers();
+                
+                return View("Groups");
+            }
+            else
+            {
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        #endregion
+        #region Roles
+        public IActionResult Roles()
+        {
+            init();
+            if (serviceLocator.CheckLogin())
+            {
+
+                ViewBag.Title = "Roles";
+                // accessClient.RefreshUsers();
+
+                return View("Roles");
+            }
+            else
+            {
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        #endregion
     }
 }