From d95e6f8b9b59a1c459e4cb199d9e1e0b048f5970 Mon Sep 17 00:00:00 2001
From: Allllen4a <a30122004z@gmail.com>
Date: Wed, 1 May 2024 17:41:26 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindingModels/ClientBindingModel.cs                     | 3 ++-
 .../BeautySalonContracts/SearchModels/ClientSearchModel.cs  | 3 ++-
 .../BeautySalonContracts/ViewModels/ClientViewModel.cs      | 6 ++++--
 .../BeautySalonDataModels/Models/IClientModel.cs            | 2 +-
 .../BeautySalonDatabaseImplement/BeautySalonDatabase.cs     | 2 +-
 .../BeautySalonDatabaseImplement/Models/Client.cs           | 5 ++++-
 BeautySalonView/ClientWebApp/Controllers/HomeController.cs  | 3 ++-
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/BeautySalonView/BeautySalonContracts/BindingModels/ClientBindingModel.cs b/BeautySalonView/BeautySalonContracts/BindingModels/ClientBindingModel.cs
index 6382660..8d5986f 100644
--- a/BeautySalonView/BeautySalonContracts/BindingModels/ClientBindingModel.cs
+++ b/BeautySalonView/BeautySalonContracts/BindingModels/ClientBindingModel.cs
@@ -10,10 +10,11 @@ namespace BeautySalonContracts.BindingModels
 
         public string ClientFIO {  get; set; } = string.Empty;
 
+        public string ClientPhone { get; set; } = string.Empty;
+
         public string ClientEmail { get; set; } = string.Empty;
 
         public string ClientPassword { get; set; } = string.Empty;
 
-        public string ClientPhone { get; set; } = string.Empty;
     }
 }
diff --git a/BeautySalonView/BeautySalonContracts/SearchModels/ClientSearchModel.cs b/BeautySalonView/BeautySalonContracts/SearchModels/ClientSearchModel.cs
index ea2540f..a2ad7b5 100644
--- a/BeautySalonView/BeautySalonContracts/SearchModels/ClientSearchModel.cs
+++ b/BeautySalonView/BeautySalonContracts/SearchModels/ClientSearchModel.cs
@@ -4,7 +4,8 @@
     {
         public int? Id { get; set; }
         public string? ClientLogin { get; set; }
-        public string? ClientFIO { get; set; }  
+        public string? ClientFIO { get; set; }
+        public string? ClientPhone { get; set; }
         public string? ClientEmail { get; set; }
         public string? ClientPassword { get; set; }
     }
diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/ClientViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/ClientViewModel.cs
index ef02ec6..25ad0f2 100644
--- a/BeautySalonView/BeautySalonContracts/ViewModels/ClientViewModel.cs
+++ b/BeautySalonView/BeautySalonContracts/ViewModels/ClientViewModel.cs
@@ -18,13 +18,15 @@ namespace BeautySalonContracts.ViewModels
         [DisplayName("ФИО клиента")]
         public string ClientFIO { get; set; } = string.Empty;
 
+        [DisplayName("Телефон клиента")]
+        public string ClientPhone { get; set; } = string.Empty;
+
         [DisplayName("Почта клиента")]
         public string ClientEmail { get; set; } = string.Empty;
 
         [DisplayName("Пароль клиента")]
         public string ClientPassword { get; set; } = string.Empty;
 
-        [DisplayName("Телефон клиента")]
-        public string ClientPhone { get; set; } = string.Empty;
+        
     }
 }
diff --git a/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs b/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs
index 4234959..00c74dc 100644
--- a/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs
+++ b/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs
@@ -4,8 +4,8 @@
     {
         string ClientLogin { get; }
         string ClientFIO { get; }
+        string ClientPhone { get; }
         string ClientEmail { get; }
         string ClientPassword { get; }
-        string ClientPhone { get; }
     }
 }
\ No newline at end of file
diff --git a/BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs b/BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs
index 8935b6f..a792ccf 100644
--- a/BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs
+++ b/BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs
@@ -18,7 +18,7 @@ namespace BeautySalonDatabaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=PRETTYNAME;Initial Catalog=BeautySalonDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=ALYONA;Initial Catalog=BeautySalonDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }
diff --git a/BeautySalonView/BeautySalonDatabaseImplement/Models/Client.cs b/BeautySalonView/BeautySalonDatabaseImplement/Models/Client.cs
index 3fd8ea4..79971dd 100644
--- a/BeautySalonView/BeautySalonDatabaseImplement/Models/Client.cs
+++ b/BeautySalonView/BeautySalonDatabaseImplement/Models/Client.cs
@@ -44,6 +44,7 @@ namespace BeautySalonDatabaseImplement.Models
                 Id = model.Id,
                 ClientLogin = model.ClientLogin,
                 ClientFIO = model.ClientFIO,
+                ClientPhone = model.ClientPhone,
                 ClientEmail = model.ClientEmail,
                 ClientPassword = model.ClientPassword,
             };
@@ -56,7 +57,8 @@ namespace BeautySalonDatabaseImplement.Models
                 return;
             }
             ClientLogin = model.ClientLogin;
-            ClientFIO = model.ClientFIO;    
+            ClientFIO = model.ClientFIO;
+            ClientPhone = model.ClientPhone;
             ClientEmail = model.ClientEmail;
             ClientPassword = model.ClientPassword;
         }
@@ -66,6 +68,7 @@ namespace BeautySalonDatabaseImplement.Models
             Id = Id,
             ClientLogin = ClientLogin,
             ClientFIO = ClientFIO,
+            ClientPhone = ClientPhone,
             ClientEmail = ClientEmail,
             ClientPassword = ClientPassword,
         };
diff --git a/BeautySalonView/ClientWebApp/Controllers/HomeController.cs b/BeautySalonView/ClientWebApp/Controllers/HomeController.cs
index 3e28200..5102ccf 100644
--- a/BeautySalonView/ClientWebApp/Controllers/HomeController.cs
+++ b/BeautySalonView/ClientWebApp/Controllers/HomeController.cs
@@ -58,7 +58,7 @@ namespace BeutySalonClientApp.Controllers
         }
 
         [HttpPost]
-        public void Register(string login, string fio, string password, string email)
+        public void Register(string login, string fio, string phone, string password, string email)
         {
             if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(fio) ||  string.IsNullOrEmpty(password) || string.IsNullOrEmpty(email))
             {
@@ -68,6 +68,7 @@ namespace BeutySalonClientApp.Controllers
             {
                 ClientLogin = login,
                 ClientFIO = fio,
+                ClientPhone = phone,
                 ClientEmail = email,               
                 ClientPassword = password
             });