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

Timestamp:

05/30/16 16:52:40 (9 years ago)

Author:

jlodewyc

Message:

#2582 Start angular OKB manager, data loaded

Location:

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

Files:

• Jobs/FileOpeningViewModel.cs (modified) (2 diffs)
• Jobs/JobViewModel.cs (modified) (3 diffs)
• Jobs/UploadedJobViewModel.cs (modified) (3 diffs)
• LoginViewModel.cs (modified) (1 diff)
• MasterVM.cs (added)
• NavbarViewModel.cs (modified) (1 diff)
• OKB (added)
• OKB/OkbManagementVM.cs (added)
• OKB/QueryVM.cs (added)
• QueryVM.cs (deleted)
• User/UserViewModel.cs (modified) (3 diffs)

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

@@ -30 +30 @@
     /// Opening files
     /// </summary>
-    public class FileOpeningViewModel
+    public class FileOpeningViewModel :MasterVM
     {
         public OptimizerHiveTask SelectedTask { get; set; }
@@ -37 +37 @@
         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;
-        }
+        public FileOpeningViewModel(HiveWebUser hwu) : base(hwu)
+        { }
     }
 }

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

@@ -30 +30 @@
     /// Keeps list of loaded jobs
     /// </summary>
-    public class JobViewModel
+    public class JobViewModel : MasterVM
     {
-        public HiveWebUser currentUser { get; set; }
         public List<RefreshableJob> userJobs { get; set; }
 
@@ -38 +37 @@
 
         public List<HiveTask> selectedHiveTasks { get; set; }
-        public string message { get; set; }
-        public JobViewModel(HiveWebUser hwu)
+        public JobViewModel(HiveWebUser hwu) : base(hwu)
         {
             userJobs = null;
@@ -45 +43 @@
             selectedHiveTasks = new List<HiveTask>();
             message = "";
-            currentUser = hwu;
         }
     }

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

@@ -11 +11 @@
     /// Used to show data of uploaded files
     /// </summary>
-    public class UploadedJobViewModel
+    public class UploadedJobViewModel : MasterVM
     {
-        public UploadedJobViewModel(HiveWebUser hwu)
+        public UploadedJobViewModel(HiveWebUser hwu) : base(hwu)
         {
             FullDatePaths = new List<string>();
@@ -20 +20 @@
             DisplayFilesPaths = new List<string>();
             SelectedIndex = -1;
-            currentUser = hwu;
         }
         public void clear()
@@ -35 +34 @@
         public List<string> DisplayFilesPaths { get; set; }
         public int SelectedIndex { get; set; }
-        public string message { get; set; }
-        public HiveWebUser currentUser { get; set; }
         
     }

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

@@ -28 +28 @@
     /// Used for login
     /// </summary>
-    public class LoginViewModel
+    public class LoginViewModel // NOT MASTERVM => Starts the user login 
     {
         /// <summary>

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

@@ -24 +24 @@
 namespace HeuristicLab.Clients.Hive.WebJobManager.ViewModels
 {
-    public class NavbarViewModel
+    public class NavbarViewModel : MasterVM
     {
 
         public string Active { get; set; }
-        public HiveWebUser User { get; set; }
 
-        public NavbarViewModel(string ac, HiveWebUser hwu )
+        public NavbarViewModel(string ac, HiveWebUser hwu ) : base(hwu)
         {
             Active = ac;
-            User = hwu;
         }
     }

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using System;
 using System.Collections.Generic;
@@ -31 +31 @@
     /// ViewModel containing User/Group/Role data
     /// </summary>
-    public class UserViewModel
+    public class UserViewModel : MasterVM
     {
-        public HiveWebUser currentUser { get; set; }
-        public string message { get; set; }
         public AccessAdministrationClient accessClient { get; set; }
         public List<Access.User> users { get; set; }
@@ -52 +50 @@
         /// </summary>
         /// <param name="ac">AccessAdminClient for connection</param>
-        public UserViewModel(AccessAdministrationClient ac, HiveWebUser hwu)
+        public UserViewModel(AccessAdministrationClient ac, HiveWebUser hwu) : base(hwu)
         {
-            currentUser = hwu;
             users = new List<Access.User>();
             accessClient = ac;