From 043267778df9be5f77594031680e16ce03705aeb Mon Sep 17 00:00:00 2001 From: student Date: Tue, 5 May 2026 13:15:49 +1000 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D1=80=D0=BE=D0=B1=D1=8C=D0=B5?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.idea.Policlinica/.idea/avalonia.xml | 5 + .../ViewModels/AutorizationViewModel.cs | 14 +- .../ViewModels/RegistrationViewModel.cs | 1 - Policlinica/ViewModels/StartViewModel.cs | 2 +- Policlinica/Views/AutorizationView.axaml | 6 +- Policlinica/Views/RegistrationView.axaml | 9 +- .../bin/Debug/net9.0/Avalonia.Base.dll | Bin .../net9.0/Avalonia.Controls.ColorPicker.dll | Bin .../bin/Debug/net9.0/Avalonia.Controls.dll | Bin .../Debug/net9.0/Avalonia.DesignerSupport.dll | Bin .../bin/Debug/net9.0/Avalonia.Desktop.dll | Bin .../bin/Debug/net9.0/Avalonia.Diagnostics.dll | Bin .../bin/Debug/net9.0/Avalonia.Dialogs.dll | Bin .../bin/Debug/net9.0/Avalonia.Fonts.Inter.dll | Bin .../bin/Debug/net9.0/Avalonia.FreeDesktop.dll | Bin .../bin/Debug/net9.0/Avalonia.Markup.Xaml.dll | Bin .../bin/Debug/net9.0/Avalonia.Markup.dll | Bin .../bin/Debug/net9.0/Avalonia.Metal.dll | Bin .../bin/Debug/net9.0/Avalonia.MicroCom.dll | Bin .../bin/Debug/net9.0/Avalonia.Native.dll | Bin .../bin/Debug/net9.0/Avalonia.OpenGL.dll | Bin .../Debug/net9.0/Avalonia.Remote.Protocol.dll | Bin .../bin/Debug/net9.0/Avalonia.Skia.dll | Bin .../Debug/net9.0/Avalonia.Themes.Fluent.dll | Bin .../Debug/net9.0/Avalonia.Themes.Simple.dll | Bin .../bin/Debug/net9.0/Avalonia.Vulkan.dll | Bin .../net9.0/Avalonia.Win32.Automation.dll | Bin .../bin/Debug/net9.0/Avalonia.Win32.dll | Bin Policlinica/bin/Debug/net9.0/Avalonia.X11.dll | Bin Policlinica/bin/Debug/net9.0/Avalonia.dll | Bin .../Debug/net9.0/CommunityToolkit.Mvvm.dll | Bin .../bin/Debug/net9.0/HarfBuzzSharp.dll | Bin .../bin/Debug/net9.0/MicroCom.Runtime.dll | Bin ....Extensions.Configuration.Abstractions.dll | Bin ...rosoft.Extensions.Configuration.Binder.dll | Bin ...t.Extensions.Configuration.CommandLine.dll | Bin ...ons.Configuration.EnvironmentVariables.dll | Bin ...xtensions.Configuration.FileExtensions.dll | Bin ...icrosoft.Extensions.Configuration.Json.dll | Bin ...t.Extensions.Configuration.UserSecrets.dll | Bin .../Microsoft.Extensions.Configuration.dll | Bin ...sions.DependencyInjection.Abstractions.dll | Bin ...crosoft.Extensions.DependencyInjection.dll | Bin ...ft.Extensions.Diagnostics.Abstractions.dll | Bin .../Microsoft.Extensions.Diagnostics.dll | Bin ....Extensions.FileProviders.Abstractions.dll | Bin ...soft.Extensions.FileProviders.Physical.dll | Bin ...icrosoft.Extensions.FileSystemGlobbing.dll | Bin ...rosoft.Extensions.Hosting.Abstractions.dll | Bin .../net9.0/Microsoft.Extensions.Hosting.dll | Bin ...rosoft.Extensions.Logging.Abstractions.dll | Bin ...osoft.Extensions.Logging.Configuration.dll | Bin .../Microsoft.Extensions.Logging.Console.dll | Bin .../Microsoft.Extensions.Logging.Debug.dll | Bin .../Microsoft.Extensions.Logging.EventLog.dll | Bin ...crosoft.Extensions.Logging.EventSource.dll | Bin .../net9.0/Microsoft.Extensions.Logging.dll | Bin ...nsions.Options.ConfigurationExtensions.dll | Bin .../net9.0/Microsoft.Extensions.Options.dll | Bin .../Microsoft.Extensions.Primitives.dll | Bin .../bin/Debug/net9.0/MySqlConnector.dll | Bin .../bin/Debug/net9.0/Policlinica.deps.json | 37 +- Policlinica/bin/Debug/net9.0/Policlinica.dll | Bin 226816 -> 227328 bytes Policlinica/bin/Debug/net9.0/Policlinica.pdb | Bin 34532 -> 34288 bytes Policlinica/bin/Debug/net9.0/SkiaSharp.dll | Bin .../System.Diagnostics.DiagnosticSource.dll | Bin .../net9.0/System.Diagnostics.EventLog.dll | Bin .../bin/Debug/net9.0/System.IO.Pipelines.dll | Bin .../net9.0/System.Text.Encodings.Web.dll | Bin .../bin/Debug/net9.0/System.Text.Json.dll | Bin .../bin/Debug/net9.0/Tmds.DBus.Protocol.dll | Bin .../lib/net8.0/System.Text.Encodings.Web.dll | Bin .../linux-arm/native/libHarfBuzzSharp.so | Bin .../runtimes/linux-arm/native/libSkiaSharp.so | Bin .../linux-arm64/native/libHarfBuzzSharp.so | Bin .../linux-arm64/native/libSkiaSharp.so | Bin .../native/libHarfBuzzSharp.so | Bin .../linux-musl-arm/native/libHarfBuzzSharp.so | Bin .../native/libHarfBuzzSharp.so | Bin .../native/libHarfBuzzSharp.so | Bin .../native/libHarfBuzzSharp.so | Bin .../linux-musl-x64/native/libHarfBuzzSharp.so | Bin .../linux-musl-x64/native/libSkiaSharp.so | Bin .../linux-riscv64/native/libHarfBuzzSharp.so | Bin .../linux-x64/native/libHarfBuzzSharp.so | Bin .../runtimes/linux-x64/native/libSkiaSharp.so | Bin .../linux-x86/native/libHarfBuzzSharp.so | Bin .../osx/native/libAvaloniaNative.dylib | Bin .../osx/native/libHarfBuzzSharp.dylib | Bin .../runtimes/osx/native/libSkiaSharp.dylib | Bin .../win-arm64/native/av_libglesv2.dll | Bin .../win-arm64/native/libHarfBuzzSharp.dll | Bin .../win-arm64/native/libSkiaSharp.dll | Bin .../runtimes/win-x64/native/av_libglesv2.dll | Bin .../win-x64/native/libHarfBuzzSharp.dll | Bin .../runtimes/win-x64/native/libSkiaSharp.dll | Bin .../runtimes/win-x86/native/av_libglesv2.dll | Bin .../win-x86/native/libHarfBuzzSharp.dll | Bin .../runtimes/win-x86/native/libSkiaSharp.dll | Bin .../System.Diagnostics.EventLog.Messages.dll | Bin .../net9.0/System.Diagnostics.EventLog.dll | Bin .../lib/net9.0/System.Text.Encodings.Web.dll | Bin .../net9.0/Avalonia/Resources.Inputs.cache | 2 +- .../obj/Debug/net9.0/Avalonia/references | 444 +++++++++--------- .../obj/Debug/net9.0/Avalonia/resources | Bin 181936 -> 181947 bytes .../Debug/net9.0/Policlinica.AssemblyInfo.cs | 2 +- .../Policlinica.AssemblyInfoInputs.cache | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 16 +- .../obj/Debug/net9.0/Policlinica.assets.cache | Bin 47707 -> 45993 bytes ...Policlinica.csproj.AssemblyReference.cache | Bin 30784 -> 30039 bytes ...Policlinica.csproj.CoreCompileInputs.cache | 2 +- .../Policlinica.csproj.FileListAbsolute.txt | 339 ++++++++----- Policlinica/obj/Debug/net9.0/Policlinica.dll | Bin 226816 -> 227328 bytes .../net9.0/Policlinica.genruntimeconfig.cache | 2 +- Policlinica/obj/Debug/net9.0/Policlinica.pdb | Bin 34532 -> 34288 bytes .../Debug/net9.0/Policlinica.sourcelink.json | 2 +- .../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 | 37 +- .../obj/Policlinica.csproj.nuget.g.props | 20 +- .../obj/Policlinica.csproj.nuget.g.targets | 20 +- Policlinica/obj/project.assets.json | 35 +- Policlinica/obj/project.nuget.cache | 130 +++-- Policlinica/obj/project.packagespec.json | 2 +- .../obj/rider.project.model.nuget.info | 2 +- Policlinica/obj/rider.project.restore.info | 2 +- 126 files changed, 615 insertions(+), 518 deletions(-) mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Base.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Controls.ColorPicker.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Controls.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.DesignerSupport.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Desktop.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Diagnostics.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Dialogs.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Fonts.Inter.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.FreeDesktop.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Markup.Xaml.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Markup.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Metal.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.MicroCom.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Native.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.OpenGL.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Remote.Protocol.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Skia.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Themes.Fluent.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Themes.Simple.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Vulkan.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Win32.Automation.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.Win32.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.X11.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Avalonia.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/CommunityToolkit.Mvvm.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/HarfBuzzSharp.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/MicroCom.Runtime.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Configuration.Abstractions.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Configuration.Binder.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Configuration.CommandLine.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Configuration.EnvironmentVariables.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Configuration.FileExtensions.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Configuration.Json.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Configuration.UserSecrets.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Configuration.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.DependencyInjection.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Diagnostics.Abstractions.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Diagnostics.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.FileProviders.Abstractions.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.FileProviders.Physical.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.FileSystemGlobbing.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Hosting.Abstractions.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Hosting.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Logging.Abstractions.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Logging.Configuration.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Logging.Console.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Logging.Debug.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Logging.EventLog.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Logging.EventSource.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Logging.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Options.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Microsoft.Extensions.Primitives.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/MySqlConnector.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/SkiaSharp.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/System.Diagnostics.DiagnosticSource.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/System.Diagnostics.EventLog.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/System.IO.Pipelines.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/System.Text.Encodings.Web.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/System.Text.Json.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/Tmds.DBus.Protocol.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/browser/lib/net8.0/System.Text.Encodings.Web.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-arm/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-arm/native/libSkiaSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-arm64/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-arm64/native/libSkiaSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-loongarch64/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-musl-arm/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-musl-arm64/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-musl-loongarch64/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-musl-riscv64/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-musl-x64/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-musl-x64/native/libSkiaSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-riscv64/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-x64/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-x64/native/libSkiaSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/linux-x86/native/libHarfBuzzSharp.so mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/osx/native/libAvaloniaNative.dylib mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/osx/native/libHarfBuzzSharp.dylib mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/osx/native/libSkiaSharp.dylib mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-arm64/native/av_libglesv2.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-arm64/native/libHarfBuzzSharp.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-arm64/native/libSkiaSharp.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-x64/native/av_libglesv2.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-x64/native/libHarfBuzzSharp.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-x64/native/libSkiaSharp.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-x86/native/av_libglesv2.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-x86/native/libHarfBuzzSharp.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win-x86/native/libSkiaSharp.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win/lib/net9.0/System.Diagnostics.EventLog.Messages.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win/lib/net9.0/System.Diagnostics.EventLog.dll mode change 100644 => 100755 Policlinica/bin/Debug/net9.0/runtimes/win/lib/net9.0/System.Text.Encodings.Web.dll 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"> - - -