#234 fix missing strategy instance

InUniversity · May 17, 2023 · ab37d71 · ab37d71
1 parent f22aba4
commit ab37d71
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/CompanyManagement/ViewModels/UserControls/OrganizationViewModel.cs b/CompanyManagement/ViewModels/UserControls/OrganizationViewModel.cs
@@ -55,20 +55,21 @@ private void SetVisibilityViewEmployees()
 
         private void InitDeptStrategy()
         {
+            IDeptStrategy strategy = new DeptForDeptHead();
             try
             {
                 var curEmpl = CurrentUser.Ins.Empl;
-                var deptStrategy = DeptStrategyFactory.Create(curEmpl.EmplRole.Perms);
-                var viewModel = new DepartmentsViewModel(deptStrategy)
-                {
-                    ParentDataContext = this
-                };
-                departmentsView.DataContext = viewModel;
+                strategy = DeptStrategyFactory.Create(curEmpl.EmplRole.Perms);
             }
             catch (Exception ex)
             {
                 Log.Ins.Error(nameof(OrganizationViewModel), ex.Message);
             }
+            var viewModel = new DepartmentsViewModel(strategy)
+            {
+                ParentDataContext = this
+            };
+            departmentsView.DataContext = viewModel;
         }
 
         private void SetCommand()

diff --git a/CompanyManagement/ViewModels/Windows/LoginViewModel.cs b/CompanyManagement/ViewModels/Windows/LoginViewModel.cs
@@ -62,17 +62,18 @@ private void ExecuteLoginCommand(Window window)
 
         private void ShowMainWindow(EPermission perms)
         {
+            IMainStrategy strategy = new MainForEmployee();
             try
             {
-                var mainStrategy = MainStrategyFactory.Create(perms);
-                var viewModel = new MainViewModel(mainStrategy);
-                var nextWindow = new MainWindow { DataContext = viewModel };
-                nextWindow.ShowDialog();
+                strategy = MainStrategyFactory.Create(perms);
             }
             catch (Exception ex)
             {
                 Log.Ins.Error(nameof(LoginViewModel), ex.Message);
             }
+            var viewModel = new MainViewModel(strategy);
+            var nextWindow = new MainWindow { DataContext = viewModel };
+            nextWindow.ShowDialog();
         }
 
         private void RefreshAllText()

diff --git a/CompanyManagement/Views/UserControls/ProjectsUC.xaml.cs b/CompanyManagement/Views/UserControls/ProjectsUC.xaml.cs
@@ -15,16 +15,17 @@ public partial class ProjectsUC : UserControl
         public ProjectsUC()
         {
             InitializeComponent();
+            IProjectsStrategy strategy = new ProjectsForEmployee();
             try
             {
                 var curEmpl = CurrentUser.Ins.Empl;
-                var projectsStrategy = ProjectsStrategyFactory.Create(curEmpl.EmplRole.Perms);
-                DataContext = new ProjectsViewModel(projectsStrategy);
+                strategy = ProjectsStrategyFactory.Create(curEmpl.EmplRole.Perms);
             }
             catch (Exception ex)
             {
                 Log.Ins.Error(nameof(ProjectsUC), ex.Message);
             }
+            DataContext = new ProjectsViewModel(strategy);
         }
     }
 }