From 26694989ee52d8351828db50239a6bc35c5e26a0 Mon Sep 17 00:00:00 2001 From: Artemij Date: Tue, 12 May 2026 20:02:51 +1000 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D1=82=D1=83=D0=BF=D0=B8=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/AdminWindowViewModel.cs | 3 --- Policlinica/ViewModels/DoctorViewModel.cs | 5 +++-- Policlinica/ViewModels/ServiceViewModel.cs | 10 ++++++---- Policlinica/Views/DoctoraWindow.axaml | 7 ++++--- Policlinica/bin/Debug/net9.0/Policlinica.dll | Bin 253440 -> 252928 bytes Policlinica/bin/Debug/net9.0/Policlinica.exe | Bin 156672 -> 156672 bytes Policlinica/bin/Debug/net9.0/Policlinica.pdb | Bin 46972 -> 46280 bytes .../obj/Debug/net9.0/Avalonia/resources | Bin 186117 -> 186269 bytes .../Debug/net9.0/Policlinica.AssemblyInfo.cs | 2 +- .../Policlinica.AssemblyInfoInputs.cache | 2 +- Policlinica/obj/Debug/net9.0/Policlinica.dll | Bin 253440 -> 252928 bytes Policlinica/obj/Debug/net9.0/Policlinica.pdb | Bin 46972 -> 46280 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 16384 -> 16384 bytes .../obj/Debug/net9.0/refint/Policlinica.dll | Bin 16384 -> 16384 bytes 16 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Policlinica/ViewModels/AdminWindowViewModel.cs b/Policlinica/ViewModels/AdminWindowViewModel.cs index ac73602..ad7cd00 100644 --- a/Policlinica/ViewModels/AdminWindowViewModel.cs +++ b/Policlinica/ViewModels/AdminWindowViewModel.cs @@ -15,9 +15,6 @@ public partial class AdminWindowViewModel : ViewModelBase private readonly Navigation _navigation; private readonly IServiceProvider _provider; private readonly RecordRep _recordRep; - [ObservableProperty] private string _password; - [ObservableProperty] private string _login; - [ObservableProperty] public string _eror; [ObservableProperty] ObservableCollection _recordsList = new(); [ObservableProperty] private Record _selectedRecord; diff --git a/Policlinica/ViewModels/DoctorViewModel.cs b/Policlinica/ViewModels/DoctorViewModel.cs index 67eadf2..64916a3 100644 --- a/Policlinica/ViewModels/DoctorViewModel.cs +++ b/Policlinica/ViewModels/DoctorViewModel.cs @@ -16,12 +16,13 @@ public partial class DoctorViewModel : ViewModelBase [ObservableProperty] string name; [ObservableProperty] List _doctorList; [ObservableProperty] Doctor selectedDoctor; - [ObservableProperty] string g; + // [ObservableProperty] string g; - public DoctorViewModel(IServiceProvider provider, DoctorRepository repository) + public DoctorViewModel(IServiceProvider provider, DoctorRepository repository, Navigation navigation) { _provider = provider; _doctorList = repository.GetDoctorsByTest(); + _navigation = navigation; } [RelayCommand] diff --git a/Policlinica/ViewModels/ServiceViewModel.cs b/Policlinica/ViewModels/ServiceViewModel.cs index 5929a34..bd900f0 100644 --- a/Policlinica/ViewModels/ServiceViewModel.cs +++ b/Policlinica/ViewModels/ServiceViewModel.cs @@ -12,15 +12,16 @@ namespace Policlinica.ViewModels; public partial class ServiceViewModel : ViewModelBase { - + private readonly IServiceProvider _provider; private readonly Navigation _navigation; [ObservableProperty] List _services; ServiceRepository _serviceRepository; [ObservableProperty] string _login; [ObservableProperty] Doctor _selectedDoctor; - - public ServiceViewModel(IServiceProvider provider, Navigation navigation,Doctor selectedDoctor, ServiceRepository repository) + + public ServiceViewModel(IServiceProvider provider, Navigation navigation, Doctor selectedDoctor, + ServiceRepository repository) { _provider = provider; _navigation = navigation; @@ -57,5 +58,6 @@ public partial class ServiceViewModel : ViewModelBase // close(); } + } + } -} \ No newline at end of file diff --git a/Policlinica/Views/DoctoraWindow.axaml b/Policlinica/Views/DoctoraWindow.axaml index e39f99a..0981787 100644 --- a/Policlinica/Views/DoctoraWindow.axaml +++ b/Policlinica/Views/DoctoraWindow.axaml @@ -6,6 +6,8 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Policlinica.Views.DoctoraWindow" x:DataType="vm:DoctorViewModel"> + + @@ -16,13 +18,12 @@ - +