diff --git a/.idea/.idea.Policlinica/.idea/avalonia.xml b/.idea/.idea.Policlinica/.idea/avalonia.xml index 8572e50..7615629 100644 --- a/.idea/.idea.Policlinica/.idea/avalonia.xml +++ b/.idea/.idea.Policlinica/.idea/avalonia.xml @@ -4,9 +4,14 @@ diff --git a/Policlinica/ViewModels/AutorizationViewModel.cs b/Policlinica/ViewModels/AutorizationViewModel.cs index 8f3346c..a5fdce8 100644 --- a/Policlinica/ViewModels/AutorizationViewModel.cs +++ b/Policlinica/ViewModels/AutorizationViewModel.cs @@ -13,7 +13,7 @@ public partial class AutorizationViewModel : ViewModelBase private readonly IServiceProvider _provider; private readonly Navigation _navigation; - [ObservableProperty] string _username; + [ObservableProperty] string _login; [ObservableProperty] string _password; [ObservableProperty] List _usersList; [ObservableProperty] UserRepository _repository; @@ -33,9 +33,9 @@ public partial class AutorizationViewModel : ViewModelBase var vm = ActivatorUtilities.CreateInstance( _provider, - Username); + Login); var win = _provider.GetRequiredService(); - //vm.SetClose(win.Close); + //vm.SetClose(win.Close); win.DataContext = vm; win.Show(); // close(); @@ -44,13 +44,7 @@ public partial class AutorizationViewModel : ViewModelBase [RelayCommand] public void SaveDB() { - User user = new User - { - Name = Username, - Password = Password - }; - // if(Users user ) - _repository.CheckLoginAndPassword(Username,Password); + _repository.CheckLoginAndPassword(Login,Password); var vm = _provider.GetRequiredService(); var win = _provider.GetRequiredService(); diff --git a/Policlinica/ViewModels/RegistrationViewModel.cs b/Policlinica/ViewModels/RegistrationViewModel.cs index bb9fc2c..403d265 100644 --- a/Policlinica/ViewModels/RegistrationViewModel.cs +++ b/Policlinica/ViewModels/RegistrationViewModel.cs @@ -48,7 +48,6 @@ public partial class RegistrationViewModel:ViewModelBase win.DataContext = vm; win.Show(); _navigation.Close(); - } diff --git a/Policlinica/ViewModels/StartViewModel.cs b/Policlinica/ViewModels/StartViewModel.cs index 11bf544..e5b168b 100644 --- a/Policlinica/ViewModels/StartViewModel.cs +++ b/Policlinica/ViewModels/StartViewModel.cs @@ -13,7 +13,7 @@ public partial class StartViewModel:ViewModelBase { _navigation = navigation; _navigation.SetCurrentView(this); - _navigation.Navigate(sv.GetRequiredService()); + _navigation.Navigate(sv.GetRequiredService()); } Action closeAction; diff --git a/Policlinica/Views/AutorizationView.axaml b/Policlinica/Views/AutorizationView.axaml index 4ff48fc..68a76e7 100644 --- a/Policlinica/Views/AutorizationView.axaml +++ b/Policlinica/Views/AutorizationView.axaml @@ -7,12 +7,13 @@ x:Class="Policlinica.Views.AutorizationView" x:DataType="vm:AutorizationViewModel"> + - + - + @@ -22,4 +23,5 @@ Command="{Binding OpenRegWinCommand}"/> + diff --git a/Policlinica/Views/RegistrationView.axaml b/Policlinica/Views/RegistrationView.axaml index 0f05194..9deb2ac 100644 --- a/Policlinica/Views/RegistrationView.axaml +++ b/Policlinica/Views/RegistrationView.axaml @@ -8,15 +8,12 @@ x:DataType="viewModels:RegistrationViewModel"> - - -