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

Timestamp:

05/10/16 16:55:18 (9 years ago)

Author:

jlodewyc

Message:

#2582 More parameter datatypes, splitting fileopening service, approving users, reopen last file, change name tasks and repetitions

Location:

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

Files:

• JobController.cs (modified) (6 diffs)
• UserController.cs (modified) (1 diff)

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

@@ -104 +104 @@
                 //vm.selectedJob.RefreshAutomatically = true;
                 clientWeb.LoadJob(vm.selectedJob);
-                weblog.getFileOpener(userId).NewModel();
-                weblog.getFileOpener(userId).Job = vm.selectedJob;
+                weblog.getJobOpener(userId).NewModel();
+                weblog.getJobOpener(userId).Job = vm.selectedJob;
                 ViewBag.Title = vm.selectedJob.Job.Name + " - Jobs";
                 ViewBag.SessionId = HttpContext.Session.GetString("UserId");
@@ -153 +153 @@
                 ViewBag.Name = serviceClient.ClientCredentials.UserName.UserName;
                 ViewBag.Title = "Uploads";
+                //Recently opened
+                if (weblog.getFileOpener(userId).Job != null)
+                    ViewBag.active = true;
                 return View("Uploads", upper);
             }
@@ -175 +178 @@
                 else
                     ViewBag.Title = "Add files - Uploads";
+                //Recently opened
+                if (weblog.getFileOpener(userId).Job != null)
+                    ViewBag.active = true;
                 return View("Uploads", upper);
             }
@@ -236 +242 @@
                 fillUploadsPaths(upper, index);
                 upper.message = message;
+                //recently opened
+                if (weblog.getFileOpener(userId).Job != null)
+                    ViewBag.active = true;
                 ViewBag.Title = "File deleted - Uploads";
 
@@ -289 +298 @@
         }
         /// <summary>
+        /// Opens the last opened file in the fileopening service
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult OpenRecent()
+        {
+            if (init())
+            {
+                var serve = weblog.getFileOpener(userId);
+                ViewBag.JobsCount = serve.Job.Job.JobCount;
+                ViewBag.Title = serve.vm.SelectedTask.ItemTask.Name + " - Uploads";
+                ViewBag.SessionId = HttpContext.Session.GetString("UserId");
+                return View("OpenFile", serve.vm);
+            }
+            else
+            {
+                return RedirectToAction("Index", "Home");
+            }
+        }
+        /// <summary>
         /// Adds current opened file to hive, uses FileOpeningService singleton
         /// </summary>
@@ -318 +346 @@
                 return RedirectToAction("Uploads", "Job");
             }
-             else
+            else
             {
                 return RedirectToAction("Index", "Home");

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

@@ -192 +192 @@
             */
         }
+
+        public IActionResult ApproveUser(string id)
+        {
+            if (init())
+            {
+                Guid curr = Guid.Parse(id);
+
+                UserViewModel vm = new UserViewModel(accessClient).refreshAll();
+                
+                    var us = vm.getUserById(curr);
+                us.IsApproved = true;
+                accessClient.updateUser(us);
+                return RedirectToAction("SelectUser", new { id = id });
+
+            }
+            else
+            {
+                return RedirectToAction("Index", "Home");
+            }
+        }
         /// <summary>
         /// Delete a user