diff --git a/Labaratory/Labaratory/Labaratory.csproj b/Labaratory/Labaratory/Labaratory.csproj index f7695c4..38f2631 100644 --- a/Labaratory/Labaratory/Labaratory.csproj +++ b/Labaratory/Labaratory/Labaratory.csproj @@ -103,6 +103,9 @@ Model1.tt + + + True @@ -150,9 +153,22 @@ Model1.tt - - SessionWindow.xaml - + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -161,15 +177,23 @@ App.xaml Code - + + + AdminWindow.xaml + + + ByhalterWindow.xaml + + + LaborantExplorer.xaml + + + LaborantWindow.xaml + MainWindow.xaml Code - - Designer - MSBuild:Compile - diff --git a/Labaratory/Labaratory/ViewModels/SessionModel.cs b/Labaratory/Labaratory/ViewModels/AdminModel.cs similarity index 80% rename from Labaratory/Labaratory/ViewModels/SessionModel.cs rename to Labaratory/Labaratory/ViewModels/AdminModel.cs index 130bf5e..7b30107 100644 --- a/Labaratory/Labaratory/ViewModels/SessionModel.cs +++ b/Labaratory/Labaratory/ViewModels/AdminModel.cs @@ -10,11 +10,11 @@ using Wpf.Ui.Input; namespace Labaratory.ViewModels { - public class SessionModel : BaseViewModel + public class AdminModel : BaseViewModel { public Models.User CurrentUser { get; set; } - public SessionModel(Models.User user) + public AdminModel(Models.User user) { CurrentUser = user; } diff --git a/Labaratory/Labaratory/ViewModels/ByhalterModel.cs b/Labaratory/Labaratory/ViewModels/ByhalterModel.cs new file mode 100644 index 0000000..1db3410 --- /dev/null +++ b/Labaratory/Labaratory/ViewModels/ByhalterModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Labaratory.ViewModels +{ + public class ByhalterModel : BaseViewModel + { + public Models.User CurrentUser { get; set; } + + public ByhalterModel(Models.User user) + { + CurrentUser = user; + } + } +} diff --git a/Labaratory/Labaratory/ViewModels/Laborant.cs b/Labaratory/Labaratory/ViewModels/Laborant.cs new file mode 100644 index 0000000..2d51f34 --- /dev/null +++ b/Labaratory/Labaratory/ViewModels/Laborant.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Labaratory.ViewModels +{ + public class Laborant : BaseViewModel + { + public Models.User CurrentUser { get; set; } + + public Laborant(Models.User user) + { + CurrentUser = user; + } + } +} diff --git a/Labaratory/Labaratory/ViewModels/LaborantExplorer.cs b/Labaratory/Labaratory/ViewModels/LaborantExplorer.cs new file mode 100644 index 0000000..b43db61 --- /dev/null +++ b/Labaratory/Labaratory/ViewModels/LaborantExplorer.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Labaratory.ViewModels +{ + public class LaborantExplorer : BaseViewModel + { + public Models.User CurrentUser { get; set; } + + public LaborantExplorer(Models.User user) + { + CurrentUser = user; + } + } +} diff --git a/Labaratory/Labaratory/ViewModels/LoginViewModel.cs b/Labaratory/Labaratory/ViewModels/LoginViewModel.cs index 5b52fcc..7ab7b0c 100644 --- a/Labaratory/Labaratory/ViewModels/LoginViewModel.cs +++ b/Labaratory/Labaratory/ViewModels/LoginViewModel.cs @@ -77,13 +77,38 @@ namespace Labaratory MessageBox.Show($"Успешный вход! Добро пожаловать, {user.Login}"); if (parameter is Window window) { - var nextWindow = new SessionWindow(); - - var mainVM = new SessionModel(user); - // Привязываем VM к окну - nextWindow.DataContext = mainVM; + if (user.Role.Value == 1) + { + var nextWindow = new AdminWindow(); - nextWindow.Show(); + var mainVM = new AdminModel(user); + nextWindow.DataContext = mainVM; + nextWindow.Show(); + } + if (user.Role.Value == 2) + { + var nextWindow = new ByhalterWindow(); + + var mainVM = new ByhalterModel(user); + nextWindow.DataContext = mainVM; + nextWindow.Show(); + } + if (user.Role.Value == 3) + { + var nextWindow = new Views.Laborant(); + + var mainVM = new ViewModels.Laborant(user); + nextWindow.DataContext = mainVM; + nextWindow.Show(); + } + if (user.Role.Value == 4) + { + var nextWindow = new Views.LaborantExplorer(); + + var mainVM = new ViewModels.LaborantExplorer(user); + nextWindow.DataContext = mainVM; + nextWindow.Show(); + } window.Close(); } } diff --git a/Labaratory/Labaratory/Views/SessionWindow.xaml b/Labaratory/Labaratory/Views/AdminWindow.xaml similarity index 78% rename from Labaratory/Labaratory/Views/SessionWindow.xaml rename to Labaratory/Labaratory/Views/AdminWindow.xaml index 14b2369..e7f4894 100644 --- a/Labaratory/Labaratory/Views/SessionWindow.xaml +++ b/Labaratory/Labaratory/Views/AdminWindow.xaml @@ -1,11 +1,11 @@ - + Title="AdminWindow" Height="450" Width="800"> diff --git a/Labaratory/Labaratory/Views/SessionWindow.xaml.cs b/Labaratory/Labaratory/Views/AdminWindow.xaml.cs similarity index 75% rename from Labaratory/Labaratory/Views/SessionWindow.xaml.cs rename to Labaratory/Labaratory/Views/AdminWindow.xaml.cs index b258254..2a2d137 100644 --- a/Labaratory/Labaratory/Views/SessionWindow.xaml.cs +++ b/Labaratory/Labaratory/Views/AdminWindow.xaml.cs @@ -15,11 +15,11 @@ using System.Windows.Shapes; namespace Labaratory.Views { /// - /// Логика взаимодействия для SessionWindow.xaml + /// Логика взаимодействия для AdminWindow.xaml /// - public partial class SessionWindow : Window + public partial class AdminWindow : Window { - public SessionWindow() + public AdminWindow() { InitializeComponent(); } diff --git a/Labaratory/Labaratory/Views/ByhalterWindow.xaml b/Labaratory/Labaratory/Views/ByhalterWindow.xaml new file mode 100644 index 0000000..56d31b0 --- /dev/null +++ b/Labaratory/Labaratory/Views/ByhalterWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/Labaratory/Labaratory/Views/ByhalterWindow.xaml.cs b/Labaratory/Labaratory/Views/ByhalterWindow.xaml.cs new file mode 100644 index 0000000..f41c45d --- /dev/null +++ b/Labaratory/Labaratory/Views/ByhalterWindow.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace Labaratory.Views +{ + /// + /// Логика взаимодействия для ByhalterWindow.xaml + /// + public partial class ByhalterWindow : Window + { + public ByhalterWindow() + { + InitializeComponent(); + } + } +} diff --git a/Labaratory/Labaratory/Views/LaborantExplorer.xaml b/Labaratory/Labaratory/Views/LaborantExplorer.xaml new file mode 100644 index 0000000..c4f35c2 --- /dev/null +++ b/Labaratory/Labaratory/Views/LaborantExplorer.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/Labaratory/Labaratory/Views/LaborantExplorer.xaml.cs b/Labaratory/Labaratory/Views/LaborantExplorer.xaml.cs new file mode 100644 index 0000000..41456d9 --- /dev/null +++ b/Labaratory/Labaratory/Views/LaborantExplorer.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace Labaratory.Views +{ + /// + /// Логика взаимодействия для LaborantExplorer.xaml + /// + public partial class LaborantExplorer : Window + { + public LaborantExplorer() + { + InitializeComponent(); + } + } +} diff --git a/Labaratory/Labaratory/Views/LaborantWindow.xaml b/Labaratory/Labaratory/Views/LaborantWindow.xaml new file mode 100644 index 0000000..74e1ef6 --- /dev/null +++ b/Labaratory/Labaratory/Views/LaborantWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/Labaratory/Labaratory/Views/LaborantWindow.xaml.cs b/Labaratory/Labaratory/Views/LaborantWindow.xaml.cs new file mode 100644 index 0000000..6739134 --- /dev/null +++ b/Labaratory/Labaratory/Views/LaborantWindow.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace Labaratory.Views +{ + /// + /// Логика взаимодействия для Laborant.xaml + /// + public partial class Laborant : Window + { + public Laborant() + { + InitializeComponent(); + } + } +}