From 93af8c635acdc14b592d5177e8ca1460cae10eee Mon Sep 17 00:00:00 2001 From: student Date: Mon, 4 May 2026 11:54:06 +1000 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D0=BB=D0=B5=D0=B4=D0=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Policlinica/DB/DoctorRepository.cs | 6 +- Policlinica/DB/UserRepository.cs | 42 +- Policlinica/Models/{Doctors.cs => Doctor.cs} | 2 +- Policlinica/Models/{Records.cs => Record.cs} | 2 +- .../Models/{RecordItems.cs => RecordItem.cs} | 2 +- .../Models/{Services.cs => Service.cs} | 2 +- Policlinica/Models/{Users.cs => User.cs} | 2 +- Policlinica/Policlinica.csproj | 4 +- .../ViewModels/PasswordWindowViewModel.cs | 18 +- Policlinica/Views/PasswordWindow.axaml | 15 +- .../obj/Policlinica.csproj.nuget.dgspec.json | 307 +------ .../obj/Policlinica.csproj.nuget.g.props | 20 +- .../obj/Policlinica.csproj.nuget.g.targets | 19 +- Policlinica/obj/project.assets.json | 756 +++++++++--------- Policlinica/obj/project.nuget.cache | 137 ++-- Policlinica/obj/project.packagespec.json | 2 +- .../obj/rider.project.model.nuget.info | 2 +- Policlinica/obj/rider.project.restore.info | 2 +- 18 files changed, 529 insertions(+), 811 deletions(-) rename Policlinica/Models/{Doctors.cs => Doctor.cs} (87%) rename Policlinica/Models/{Records.cs => Record.cs} (94%) rename Policlinica/Models/{RecordItems.cs => RecordItem.cs} (88%) rename Policlinica/Models/{Services.cs => Service.cs} (89%) rename Policlinica/Models/{Users.cs => User.cs} (88%) diff --git a/Policlinica/DB/DoctorRepository.cs b/Policlinica/DB/DoctorRepository.cs index 2d07ae1..7abcbce 100644 --- a/Policlinica/DB/DoctorRepository.cs +++ b/Policlinica/DB/DoctorRepository.cs @@ -13,9 +13,9 @@ public class DoctorRepository { connection = new MySqlConnection(connect.Value.ConnectionString); } - public List GetDoctorsByTest() + public List GetDoctorsByTest() { - List result = new List(); + List result = new List(); string sql = "select * from doctors"; try { @@ -25,7 +25,7 @@ public class DoctorRepository { while (dr.Read()) { - result.Add(new Doctors + result.Add(new Doctor { Id = dr.GetInt32("id"), Title = dr.GetString("title"), diff --git a/Policlinica/DB/UserRepository.cs b/Policlinica/DB/UserRepository.cs index 658f426..7972b5a 100644 --- a/Policlinica/DB/UserRepository.cs +++ b/Policlinica/DB/UserRepository.cs @@ -15,7 +15,7 @@ public class UserRepository } - public void InsertUser(Users users) + public void InsertUser(User user) { var sql1 = "INSERT INTO Polyclinica.users (id, name, password) VALUES (0, @name, @password); "; var sql2 = "SELECT max(id) as id FROM Polyclinica.users;"; @@ -23,9 +23,9 @@ public class UserRepository } - public List GetUsersByTest() + public List GetUsersByTest() { - List result = new List(); + List result = new List(); string sql = "select * from users"; try { @@ -35,12 +35,12 @@ public class UserRepository { while (dr.Read()) { - result.Add(new Users + result.Add(new User { Id = dr.GetInt32("id"), Name = dr.GetString("name"), Password = dr.GetString("password"), - + }); } } @@ -58,4 +58,36 @@ public class UserRepository return result; } + + + public List CheckLoginAndPassword(string name, string password) + { + List us = new List(); + string sql = @"select * from `users` where `Name` = @name and `Password` = @password"; + try + { + using (var mc = new MySqlCommand(sql, connection)) + { + mc.Parameters.AddWithValue("@name", name); + mc.Parameters.AddWithValue("@password", password); + var reader = mc.ExecuteReader(); + while (reader.Read()) + { + us.Add(new User() + { + Id = reader.GetInt32("id"), + Name = reader.GetString("name"), + Password = reader.GetString("password"), + }); + } + } + } + catch (Exception e) + { + Console.WriteLine(e); + + } + + return us; + } } \ No newline at end of file diff --git a/Policlinica/Models/Doctors.cs b/Policlinica/Models/Doctor.cs similarity index 87% rename from Policlinica/Models/Doctors.cs rename to Policlinica/Models/Doctor.cs index c204253..9a57186 100644 --- a/Policlinica/Models/Doctors.cs +++ b/Policlinica/Models/Doctor.cs @@ -1,6 +1,6 @@ namespace Policlinica.DB; -public class Doctors +public class Doctor { public int Id { get; set; } diff --git a/Policlinica/Models/Records.cs b/Policlinica/Models/Record.cs similarity index 94% rename from Policlinica/Models/Records.cs rename to Policlinica/Models/Record.cs index 3483b38..0b6ba92 100644 --- a/Policlinica/Models/Records.cs +++ b/Policlinica/Models/Record.cs @@ -2,7 +2,7 @@ namespace Policlinica.DB; -public class Records +public class Record { public int Id { get; set; } diff --git a/Policlinica/Models/RecordItems.cs b/Policlinica/Models/RecordItem.cs similarity index 88% rename from Policlinica/Models/RecordItems.cs rename to Policlinica/Models/RecordItem.cs index 3308154..f24a38c 100644 --- a/Policlinica/Models/RecordItems.cs +++ b/Policlinica/Models/RecordItem.cs @@ -1,6 +1,6 @@ namespace Policlinica.DB; -public class RecordItems +public class RecordItem { public int Id { get; set; } diff --git a/Policlinica/Models/Services.cs b/Policlinica/Models/Service.cs similarity index 89% rename from Policlinica/Models/Services.cs rename to Policlinica/Models/Service.cs index 9e7e720..c9c03a4 100644 --- a/Policlinica/Models/Services.cs +++ b/Policlinica/Models/Service.cs @@ -1,6 +1,6 @@ namespace Policlinica.DB; -public class Services +public class Service { public int Id { get; set; } diff --git a/Policlinica/Models/Users.cs b/Policlinica/Models/User.cs similarity index 88% rename from Policlinica/Models/Users.cs rename to Policlinica/Models/User.cs index 3978653..522f675 100644 --- a/Policlinica/Models/Users.cs +++ b/Policlinica/Models/User.cs @@ -1,6 +1,6 @@ namespace Policlinica.DB; -public class Users +public class User { public int Id { get; set; } diff --git a/Policlinica/Policlinica.csproj b/Policlinica/Policlinica.csproj index d6b5820..b02da28 100644 --- a/Policlinica/Policlinica.csproj +++ b/Policlinica/Policlinica.csproj @@ -1,7 +1,7 @@  WinExe - net10.0 + net9.0 enable app.manifest true @@ -21,7 +21,7 @@ None All - + diff --git a/Policlinica/ViewModels/PasswordWindowViewModel.cs b/Policlinica/ViewModels/PasswordWindowViewModel.cs index 88c3d76..0f7e046 100644 --- a/Policlinica/ViewModels/PasswordWindowViewModel.cs +++ b/Policlinica/ViewModels/PasswordWindowViewModel.cs @@ -14,8 +14,7 @@ public partial class PasswordWindowViewModel : ViewModelBase private readonly IServiceProvider _provider; [ObservableProperty] string username; [ObservableProperty] string password; - [ObservableProperty] List _usersList; - [ObservableProperty] private Users selectedUsers; + [ObservableProperty] List _usersList; [ObservableProperty] UserRepository _repository; public PasswordWindowViewModel(IServiceProvider provider, UserRepository repository ) @@ -28,11 +27,9 @@ public partial class PasswordWindowViewModel : ViewModelBase [RelayCommand] public void StartTest() { - if (SelectedUsers == null) - return; + var vm = ActivatorUtilities.CreateInstance( _provider, - SelectedUsers, Username); var win = _provider.GetRequiredService(); //vm.SetClose(win.Close); @@ -44,16 +41,13 @@ public partial class PasswordWindowViewModel : ViewModelBase [RelayCommand] public void SaveDB() { - Users user = new Users + User user = new User { Name = Username, - Password = Password, - Id = SelectedUsers.Id, - + Password = Password }; - _repository.InsertUser(user); - if (SelectedUsers == null) - return; + // if(Users user ) + _repository.CheckLoginAndPassword(name,password); var vm = _serviceProvider.GetRequiredService(); var win = _serviceProvider.GetRequiredService(); diff --git a/Policlinica/Views/PasswordWindow.axaml b/Policlinica/Views/PasswordWindow.axaml index 1ae100c..f11279b 100644 --- a/Policlinica/Views/PasswordWindow.axaml +++ b/Policlinica/Views/PasswordWindow.axaml @@ -13,17 +13,14 @@ - - + - -