From 19955aa16137f0a9c31a66c3bc792bce5fec11f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= <elina_kallin@mail.ru>
Date: Wed, 8 May 2024 02:16:42 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BC=D0=B0=D1=81=D1=82=D0=B5=D1=80=D0=B0.=20=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BA=D0=BE!!!!!!!=20=D0=BD=D1=83=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=BF=D0=B5=D1=80=D0=B5=D1=81=D0=BC=D0=BE=D1=82=D1=80?=
 =?UTF-8?q?=D0=B5=D1=82=D1=8C=20=D0=BF=D1=80=D0=B8=D0=BA=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=87=D0=B8=D0=BA=20=D1=81=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B9=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B2=20=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B8=D0=B4=20=D0=B2=D1=8C=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeautySalon/BeautySalon/FormMasters.cs        | 22 ++++++++++++-------
 .../Implements/MasterDatabase.cs              | 13 +++++++++++
 .../Implements/SpecialisationDatabase.cs      |  6 -----
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/BeautySalon/BeautySalon/FormMasters.cs b/BeautySalon/BeautySalon/FormMasters.cs
index 3cc9ad7..2c9cdff 100644
--- a/BeautySalon/BeautySalon/FormMasters.cs
+++ b/BeautySalon/BeautySalon/FormMasters.cs
@@ -1,4 +1,5 @@
 using BeautySalonDBModels;
+using BeautySalonDBModels.Implements;
 using BeautySalonDBModels.Models;
 using System;
 using System.Collections.Generic;
@@ -32,17 +33,22 @@ namespace BeautySalon
 
         private void LoadData()
         {
-            var masters = masterDb.GetObjects();
+            List<Master> masters = masterDb.GetObjects();
+            MasterDatabase mdb = new MasterDatabase();
+
+            dataGridView.Rows.Clear();
+
+            if (dataGridView.ColumnCount == 0)
+            {
+                dataGridView.Columns.Add("MasterId", "ID");
+                dataGridView.Columns.Add("Specialisation", "Specialisation");
+                dataGridView.Columns.Add("FIO", "FIO");
+            }
 
             foreach (Master master in masters)
             {
-
-            }
-
-
-            if (list != null)
-            {
-                dataGridView.DataSource = list;
+                string specialisationName = mdb.GetNameSpecialisation(master);
+                dataGridView.Rows.Add(master.MasterId, specialisationName, master.FIO);
             }
         }
 
diff --git a/BeautySalon/BeautySalonDBModels/Implements/MasterDatabase.cs b/BeautySalon/BeautySalonDBModels/Implements/MasterDatabase.cs
index 8b7dc8f..b63dc87 100644
--- a/BeautySalon/BeautySalonDBModels/Implements/MasterDatabase.cs
+++ b/BeautySalon/BeautySalonDBModels/Implements/MasterDatabase.cs
@@ -82,5 +82,18 @@ namespace BeautySalonDBModels.Implements
             cmd.Parameters.AddWithValue("@id", master.MasterId);
             cmd.ExecuteNonQuery();
         }
+
+        public string GetNameSpecialisation(Master master)
+        {
+            SpecialisationDatabase db = new SpecialisationDatabase();
+            int specId = master.SpecialisationId;
+            List<Specialisation> specialisations = db.GetObjects();
+
+            foreach (Specialisation specialisation in specialisations)
+            {
+                if (specialisation.SpecialisationId == specId) return specialisation.Name.ToString();
+            }
+            return string.Empty;
+        }
     }
 }
diff --git a/BeautySalon/BeautySalonDBModels/Implements/SpecialisationDatabase.cs b/BeautySalon/BeautySalonDBModels/Implements/SpecialisationDatabase.cs
index 428629d..8811f1c 100644
--- a/BeautySalon/BeautySalonDBModels/Implements/SpecialisationDatabase.cs
+++ b/BeautySalon/BeautySalonDBModels/Implements/SpecialisationDatabase.cs
@@ -1,10 +1,5 @@
 using BeautySalonDBModels.Models;
 using Npgsql;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BeautySalonDBModels.Implements
 {
@@ -80,6 +75,5 @@ namespace BeautySalonDBModels.Implements
             cmd.Parameters.AddWithValue("@SpecialisationId", specialisation.SpecialisationId);
             cmd.ExecuteNonQuery();
         }
-
     }
 }