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 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 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(); } - } }