From 45ac8e1742d487e0e284bd111d953b160ac93c33 Mon Sep 17 00:00:00 2001 From: vikto Date: Thu, 7 May 2026 21:10:21 +1000 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=D0=BE=20?= =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Policlinica/Program.cs | 2 +- .../ViewModels/AdminWindowViewModel.cs | 27 +- .../ViewModels/AutorizationViewModel.cs | 13 +- Policlinica/Views/AdminWindow.axaml | 9 - Policlinica/Views/AdminWindowView.axaml | 26 + ...ndow.axaml.cs => AdminWindowView.axaml.cs} | 4 +- .../bin/Debug/net9.0/Policlinica.deps.json | 37 +- Policlinica/bin/Debug/net9.0/Policlinica.dll | Bin 228864 -> 230912 bytes Policlinica/bin/Debug/net9.0/Policlinica.exe | Bin 156672 -> 156672 bytes Policlinica/bin/Debug/net9.0/Policlinica.pdb | Bin 34520 -> 35616 bytes .../net9.0/Avalonia/Resources.Inputs.cache | 2 +- .../obj/Debug/net9.0/Avalonia/references | 444 +++++++++--------- .../obj/Debug/net9.0/Avalonia/resources | Bin 182069 -> 183347 bytes .../Debug/net9.0/Policlinica.AssemblyInfo.cs | 2 +- .../Policlinica.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 16 +- .../obj/Debug/net9.0/Policlinica.assets.cache | Bin 45993 -> 47707 bytes ...Policlinica.csproj.AssemblyReference.cache | Bin 30039 -> 30784 bytes ...Policlinica.csproj.CoreCompileInputs.cache | 2 +- .../Policlinica.csproj.FileListAbsolute.txt | 113 +++++ Policlinica/obj/Debug/net9.0/Policlinica.dll | Bin 228864 -> 230912 bytes .../net9.0/Policlinica.genruntimeconfig.cache | 2 +- Policlinica/obj/Debug/net9.0/Policlinica.pdb | Bin 34520 -> 35616 bytes .../Debug/net9.0/Policlinica.sourcelink.json | 2 +- Policlinica/obj/Debug/net9.0/apphost.exe | Bin 156672 -> 156672 bytes .../obj/Debug/net9.0/ref/Policlinica.dll | Bin 13312 -> 13312 bytes .../obj/Debug/net9.0/refint/Policlinica.dll | Bin 13312 -> 13312 bytes .../obj/Policlinica.csproj.nuget.dgspec.json | 19 +- .../obj/Policlinica.csproj.nuget.g.props | 20 +- .../obj/Policlinica.csproj.nuget.g.targets | 20 +- Policlinica/obj/project.assets.json | 17 +- Policlinica/obj/project.nuget.cache | 126 ++--- Policlinica/obj/project.packagespec.json | 2 +- .../obj/rider.project.model.nuget.info | 2 +- Policlinica/obj/rider.project.restore.info | 2 +- 35 files changed, 518 insertions(+), 393 deletions(-) delete mode 100644 Policlinica/Views/AdminWindow.axaml create mode 100644 Policlinica/Views/AdminWindowView.axaml rename Policlinica/Views/{AdminWindow.axaml.cs => AdminWindowView.axaml.cs} (66%) 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 @@ + + + + + + + + + + + + + + + +