Changeset 13847 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels

Timestamp:

05/12/16 17:09:12 (9 years ago)

Author:

jlodewyc

Message:

#2582 Security access implemented, directory renaming and choosing, adding more partials

Location:

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

Files:

• Jobs/DataPackageVM.cs (added)
• Jobs/FileOpeningViewModel.cs (modified) (2 diffs)
• Jobs/JobViewModel.cs (modified) (4 diffs)
• Jobs/UploadedJobViewModel.cs (modified) (4 diffs)
• NavbarViewModel.cs (modified) (2 diffs)
• User/UserViewModel.cs (modified) (3 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/Jobs/FileOpeningViewModel.cs

@@ -1 @@
-using HeuristicLab.Optimization;
-
+using HeuristicLab.Clients.Hive.WebJobManager.Models;
+using HeuristicLab.Optimization;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.ViewModels
@@ -10 +11 @@
     {
         public OptimizerHiveTask SelectedTask { get; set; }
+        public List<string> directories { get; set; }
         public IAlgorithm SelectedAlgorithm { get; set; }
         public Experiment SelectedExperiment { get; set; }
         public BatchRun SelectedBatchRun { get; set; }
         public string message { get; set; }
+        public HiveWebUser currentUser { get; set; }
+
+        public FileOpeningViewModel(HiveWebUser hwu)
+        {
+            currentUser = hwu;
+        }
     }
 }

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

@@ -1 @@
-using System;
+using HeuristicLab.Clients.Hive.WebJobManager.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11 +12 @@
     public class JobViewModel
     {
+        public HiveWebUser currentUser { get; set; }
         public List<RefreshableJob> userJobs { get; set; }
 
@@ -17 +19 @@
         public List<HiveTask> selectedHiveTasks { get; set; }
         public string message { get; set; }
-        public JobViewModel()
+        public JobViewModel(HiveWebUser hwu)
         {
             userJobs = null;
@@ -23 +25 @@
             selectedHiveTasks = new List<HiveTask>();
             message = "";
+            currentUser = hwu;
         }
     }

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

@@ -1 @@
-using HeuristicLab.Optimization;
+using HeuristicLab.Clients.Hive.WebJobManager.Models;
+using HeuristicLab.Optimization;
 using System;
 using System.Collections.Generic;
@@ -12 +13 @@
     public class UploadedJobViewModel
     {
-        public UploadedJobViewModel()
+        public UploadedJobViewModel(HiveWebUser hwu)
+        {
+            FullDatePaths = new List<string>();
+            DisplayDatePaths = new List<string>();
+            FullFilesPaths = new List<string>();
+            DisplayFilesPaths = new List<string>();
+            SelectedIndex = -1;
+            currentUser = hwu;
+        }
+        public void clear()
         {
             FullDatePaths = new List<string>();
@@ -20 +30 @@
             SelectedIndex = -1;
         }
-
         public List<string> FullDatePaths { get; set; }
         public List<string> DisplayDatePaths { get; set; }
@@ -27 +36 @@
         public int SelectedIndex { get; set; }
         public string message { get; set; }
-
+        public HiveWebUser currentUser { get; set; }
         
     }

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

@@ -1 @@
-using System;
+using HeuristicLab.Clients.Hive.WebJobManager.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10 +11 @@
 
         public string Active { get; set; }
+        public HiveWebUser User { get; set; }
 
-        public NavbarViewModel(string ac)
+        public NavbarViewModel(string ac, HiveWebUser hwu )
         {
             Active = ac;
+            User = hwu;
         }
     }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/User/UserViewModel.cs

@@ -1 +1 @@
 using HeuristicLab.Clients.Access.Administration;
+using HeuristicLab.Clients.Hive.WebJobManager.Models;
 using System;
 using System.Collections.Generic;
@@ -12 +13 @@
     public class UserViewModel
     {
-
+        public HiveWebUser currentUser { get; set; }
         public string message { get; set; }
         public AccessAdministrationClient accessClient { get; set; }
@@ -31 +32 @@
         /// </summary>
         /// <param name="ac">AccessAdminClient for connection</param>
-        public UserViewModel(AccessAdministrationClient ac)
+        public UserViewModel(AccessAdministrationClient ac, HiveWebUser hwu)
         {
+            currentUser = hwu;
             users = new List<Access.User>();
             accessClient = ac;