From 379e7f4cdb174cccb749e1a0dcc182d35bac9564 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Wed, 15 May 2024 02:53:44 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=B2=D1=81=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D1=8B=20=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Medical/MedicalView/Diagnoses/FormDiagnoses.cs | 8 ++++++-- Medical/MedicalView/Doctors/FormDoctors.cs | 8 ++++++-- .../MedicalView/FormAbstractList.Designer.cs | 2 +- Medical/MedicalView/FormAbstractList.cs | 17 +++++++++++------ Medical/MedicalView/Patients/FormPatients.cs | 8 ++++++-- .../Specializations/FormSpecializations.cs | 8 ++++++-- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/Medical/MedicalView/Diagnoses/FormDiagnoses.cs b/Medical/MedicalView/Diagnoses/FormDiagnoses.cs index 914d6f9..e347365 100644 --- a/Medical/MedicalView/Diagnoses/FormDiagnoses.cs +++ b/Medical/MedicalView/Diagnoses/FormDiagnoses.cs @@ -1,12 +1,16 @@ using MedicalDatabaseContracts; using MedicalDatabaseContracts.Models; +using MedicalDatabaseContracts.SearchModels; +using MedicalDatabaseContracts.ViewModels; using Microsoft.Extensions.Logging; namespace MedicalView.Diagnoses { - public class FormDiagnoses : FormAbstractList + public class FormDiagnoses : FormAbstractList { - public FormDiagnoses(ILogger> logger, IStorage storage) : base(logger, storage) + public FormDiagnoses( + ILogger logger, + ILogic logic) : base(logger, logic) { Text = "Список диагнозов"; } diff --git a/Medical/MedicalView/Doctors/FormDoctors.cs b/Medical/MedicalView/Doctors/FormDoctors.cs index 47f19dd..a9eae23 100644 --- a/Medical/MedicalView/Doctors/FormDoctors.cs +++ b/Medical/MedicalView/Doctors/FormDoctors.cs @@ -1,12 +1,16 @@ using MedicalDatabaseContracts; using MedicalDatabaseContracts.Models; +using MedicalDatabaseContracts.SearchModels; +using MedicalDatabaseContracts.ViewModels; using Microsoft.Extensions.Logging; namespace MedicalView.Doctors { - public class FormDoctors : FormAbstractList + public class FormDoctors : FormAbstractList { - public FormDoctors(ILogger> logger, IStorage storage) : base(logger, storage) + public FormDoctors( + ILogger logger, + ILogic logic) : base(logger, logic) { Text = "Список врачей"; } diff --git a/Medical/MedicalView/FormAbstractList.Designer.cs b/Medical/MedicalView/FormAbstractList.Designer.cs index 4bc627f..b812a70 100644 --- a/Medical/MedicalView/FormAbstractList.Designer.cs +++ b/Medical/MedicalView/FormAbstractList.Designer.cs @@ -1,6 +1,6 @@ namespace MedicalView { - partial class FormAbstractList + partial class FormAbstractList { /// /// Required designer variable. diff --git a/Medical/MedicalView/FormAbstractList.cs b/Medical/MedicalView/FormAbstractList.cs index b8749fd..211f535 100644 --- a/Medical/MedicalView/FormAbstractList.cs +++ b/Medical/MedicalView/FormAbstractList.cs @@ -1,18 +1,23 @@ using MedicalDatabaseContracts; using MedicalDatabaseContracts.Models; +using MedicalDatabaseContracts.SearchModels; +using MedicalDatabaseContracts.ViewModels; using Microsoft.Extensions.Logging; namespace MedicalView { - public partial class FormAbstractList : Form where T : AbstractModel + public partial class FormAbstractList : Form + where M : AbstractModel + where V : AbstractViewModel + where S : AbstractSearchModel { protected ILogger _logger; - protected IStorage _storage; - public FormAbstractList(ILogger> logger, IStorage storage) + protected ILogic _logic; + public FormAbstractList(ILogger> logger, ILogic logic) { InitializeComponent(); _logger = logger; - _storage = storage; + _logic = logic; } private void FormAbstractList_Load(object sender, EventArgs e) @@ -46,11 +51,11 @@ namespace MedicalView try { long elapsed; - var items = _storage.GetAll(out elapsed); + var items = _logic.ReadList(null, out elapsed); dataGridView.DataSource = items; dataGridView.Columns["Id"].DisplayIndex = 0; - foreach (DataGridViewTextBoxColumn column in dataGridView.Columns) + foreach (DataGridViewColumn column in dataGridView.Columns) { if (column.Name.Contains("Id")) { diff --git a/Medical/MedicalView/Patients/FormPatients.cs b/Medical/MedicalView/Patients/FormPatients.cs index 926b7be..79a97ed 100644 --- a/Medical/MedicalView/Patients/FormPatients.cs +++ b/Medical/MedicalView/Patients/FormPatients.cs @@ -1,12 +1,16 @@ using MedicalDatabaseContracts; using MedicalDatabaseContracts.Models; +using MedicalDatabaseContracts.SearchModels; +using MedicalDatabaseContracts.ViewModels; using Microsoft.Extensions.Logging; namespace MedicalView.Patients { - public class FormPatients : FormAbstractList + public class FormPatients : FormAbstractList { - public FormPatients(ILogger> logger, IStorage storage) : base(logger, storage) + public FormPatients( + ILogger logger, + ILogic logic) : base(logger, logic) { Text = "Список пациентов"; } diff --git a/Medical/MedicalView/Specializations/FormSpecializations.cs b/Medical/MedicalView/Specializations/FormSpecializations.cs index 9a823d1..ccadab0 100644 --- a/Medical/MedicalView/Specializations/FormSpecializations.cs +++ b/Medical/MedicalView/Specializations/FormSpecializations.cs @@ -1,12 +1,16 @@ using MedicalDatabaseContracts; using MedicalDatabaseContracts.Models; +using MedicalDatabaseContracts.SearchModels; +using MedicalDatabaseContracts.ViewModels; using Microsoft.Extensions.Logging; namespace MedicalView.Specializations { - public class FormSpecializations : FormAbstractList + public class FormSpecializations : FormAbstractList { - public FormSpecializations(ILogger> logger, IStorage storage) : base(logger, storage) + public FormSpecializations( + ILogger logger, + ILogic logic) : base(logger, logic) { Text = "Список специализаций"; }