diff --git a/Policlinica/Program.cs b/Policlinica/Program.cs index 016c937..5f81dc7 100644 --- a/Policlinica/Program.cs +++ b/Policlinica/Program.cs @@ -31,7 +31,7 @@ sealed class Program s.AddTransient(); s.AddTransient(); - s.AddTransient(); + s.AddTransient(); s.AddTransient(); //Репозитории diff --git a/Policlinica/ViewModels/AdminWindowViewModel.cs b/Policlinica/ViewModels/AdminWindowViewModel.cs index 45fc0be..7bb0b9e 100644 --- a/Policlinica/ViewModels/AdminWindowViewModel.cs +++ b/Policlinica/ViewModels/AdminWindowViewModel.cs @@ -1,6 +1,27 @@ -namespace Policlinica.ViewModels; +using System; +using System.Collections.Generic; +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; +using Microsoft.Extensions.DependencyInjection; +using Policlinica.DB; +using Policlinica.Views; -public class AdminWindowViewModel : ViewModelBase +namespace Policlinica.ViewModels; + +public partial class AdminWindowViewModel : ViewModelBase { - + private readonly IServiceProvider _serviceProvider; + private readonly Navigation _navigation; + private readonly IServiceProvider _provider; + [ObservableProperty] private string _password; + [ObservableProperty] private string _login; + [ObservableProperty] public string _eror; + + public AdminWindowViewModel(IServiceProvider serviceProvider, Navigation navigation, IServiceProvider provider) + { + _serviceProvider = serviceProvider; + _navigation = navigation; + _provider = provider; + + } } \ No newline at end of file diff --git a/Policlinica/ViewModels/AutorizationViewModel.cs b/Policlinica/ViewModels/AutorizationViewModel.cs index 4d96780..0e83c96 100644 --- a/Policlinica/ViewModels/AutorizationViewModel.cs +++ b/Policlinica/ViewModels/AutorizationViewModel.cs @@ -22,7 +22,7 @@ public partial class AutorizationViewModel : ViewModelBase _provider = provider; _navigation = navigation; } - +/* [RelayCommand] public void StartTest() { @@ -36,7 +36,7 @@ public partial class AutorizationViewModel : ViewModelBase win.Show(); // close(); } - +*/ [RelayCommand] public void Conti() { @@ -55,11 +55,12 @@ public partial class AutorizationViewModel : ViewModelBase var vm = _provider.GetRequiredService(); - var win = _provider.GetRequiredService(); + // var win = _provider.GetRequiredService(); + _navigation.Navigate(vm); //vm.SetClose(win.Close); - win.DataContext = vm; - win.Show(); - //Сlose(); + // win.DataContext = vm; + //win.Show(); + //Сlose(); } diff --git a/Policlinica/Views/AdminWindow.axaml b/Policlinica/Views/AdminWindow.axaml deleted file mode 100644 index c836953..0000000 --- a/Policlinica/Views/AdminWindow.axaml +++ /dev/null @@ -1,9 +0,0 @@ - - Welcome to Avalonia! - diff --git a/Policlinica/Views/AdminWindowView.axaml b/Policlinica/Views/AdminWindowView.axaml new file mode 100644 index 0000000..8b8cc01 --- /dev/null +++ b/Policlinica/Views/AdminWindowView.axaml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + +