From 7605195b62d0d794f742dc3575fcbfe3ca476433 Mon Sep 17 00:00:00 2001 From: kisame Date: Thu, 28 Nov 2024 20:02:37 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B1=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=B2=D1=81=D1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectPolyclinic/Entities/Doctor.cs | 4 ++-- .../ProjectPolyclinic/Forms/FormDoctor.cs | 2 +- .../Forms/FormDoctorPayment.cs | 23 ------------------- .../ProjectPolyclinic/Forms/FormDrug.cs | 3 +-- .../Forms/FormMedicalHistories.cs | 10 -------- .../Forms/FormMedicalHistory.cs | 1 - .../ProjectPolyclinic/Forms/FormPatient.cs | 14 ++++------- .../ProjectPolyclinic/Forms/FormPatients.cs | 3 +-- 8 files changed, 9 insertions(+), 51 deletions(-) diff --git a/ProjectPolyclinic/ProjectPolyclinic/Entities/Doctor.cs b/ProjectPolyclinic/ProjectPolyclinic/Entities/Doctor.cs index 5950ccb..f3e16b7 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Entities/Doctor.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Entities/Doctor.cs @@ -18,9 +18,9 @@ public class Doctor public int Room { get; private set; } - public Specialization Specialization { get; private set; } //свойство Specialization, которое имеет тип Specialization + public Specialization Specialization { get; private set; } - public SpecializationLevel SpecializationLevel { get; private set; } //свойство SpecializationLevel, которое имеет тип SpecializationLevel + public SpecializationLevel SpecializationLevel { get; private set; } public static Doctor CreateEntity(int id, string first_Name, string last_Name, int room, Specialization specialization, SpecializationLevel specializationLevel) { diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctor.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctor.cs index 097d613..b655e81 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctor.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctor.cs @@ -63,7 +63,7 @@ namespace ProjectPolyclinic.Forms } } - + private void buttonSave_Click(object sender, EventArgs e) { try diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctorPayment.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctorPayment.cs index bc3f755..9ad810d 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctorPayment.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctorPayment.cs @@ -36,18 +36,15 @@ public partial class FormDoctorPayment : Form throw new Exception("Имеются не заполненные поля"); } - // Получаем значение из первой строки колонки ColumnMonth string month = dataGridViewPay.Rows[0].Cells["ColumnMonth"].Value?.ToString(); int countPatient = int.Parse(dataGridViewPay.Rows[0].Cells["Column2"].Value?.ToString() ?? "0"); int payment = int.Parse(dataGridViewPay.Rows[0].Cells["Column3"].Value?.ToString() ?? "0"); - // Проверяем, что месяц не пустой if (string.IsNullOrEmpty(month)) { throw new Exception("Месяц не заполнен"); } - // Создаем элемент DoctorPayments _doctorPayRepository.CreateDoctorPayments(DoctorPay.CreateElement(0, (int)comboBoxDoctor.SelectedValue!, month, countPatient, payment)); @@ -61,24 +58,4 @@ public partial class FormDoctorPayment : Form } private void buttonCancel_Click(object sender, EventArgs e) => Close(); - - private List CreateListDoctorPaymentsFromDataGrid() - { - var list = new List(); - foreach (DataGridViewRow row in dataGridViewPay.Rows) - { - if (row.Cells["ColumnMonth"].Value == null || row.Cells["ColumnCount"].Value == null || row.Cells["ColumnPayment"] == null) - { - continue; - } - // ДОДЕЛАТЬ!!! - list.Add(DoctorPay.CreateElement(0, 0, row.Cells["ColumnMonth"].Value.ToString(), Convert.ToInt32(row.Cells["ColumnCount"].Value), - Convert.ToInt32(row.Cells["ColumnPayment"].Value))); - } - - return list; - } - - - } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDrug.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDrug.cs index 5466374..3205513 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDrug.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDrug.cs @@ -58,10 +58,9 @@ public partial class FormDrug : Form InitializeComponent(); _drugRepository = drugRepository ?? throw new ArgumentNullException(nameof(drugRepository)); - // вытаскиваем все значения foreach (var elem in Enum.GetValues(typeof(DrugsNames))) { - checkedListBoxName.Items.Add(elem); // заполняем поэлементно значения + checkedListBoxName.Items.Add(elem); } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicalHistories.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicalHistories.cs index 4790bed..5599289 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicalHistories.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicalHistories.cs @@ -60,16 +60,6 @@ public partial class FormMedicalHistories : Form private void buttonAdd_Click(object sender, EventArgs e) { - //try - //{ - // _container.Resolve().ShowDialog(); - // LoadList(); - //} - //catch (Exception ex) - //{ - // MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error); - //} - try { _container.Resolve().ShowDialog(); diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicalHistory.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicalHistory.cs index b0bb1f3..5063173 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicalHistory.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicalHistory.cs @@ -32,7 +32,6 @@ public partial class FormMedicalHistory : Form _medicalHistoryRepository = medicalHistoryRepository ?? throw new ArgumentNullException(nameof(medicalHistoryRepository)); - // Настройка ComboBox comboBoxPacient.DataSource = patientRepository.ReadPatient(); comboBoxPacient.DisplayMember = "First_Name"; comboBoxPacient.ValueMember = "Id"; diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.cs index a3fe07a..c4fafc2 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.cs @@ -30,18 +30,17 @@ public partial class FormPatient : Form - public int Id // свойство + public int Id { set { try { - var patient = _patientRepository.ReadPatientById(value); // value - некое значение - if (patient == null) // по этому значению пытаемся найти запись в репозитории + var patient = _patientRepository.ReadPatientById(value); + if (patient == null) { - throw new InvalidDataException(nameof(patient)); // если не находим выкидываем ошибку + throw new InvalidDataException(nameof(patient)); } - // Если все норм, то пытаемся заполнить поля textBoxFirstName.Text = patient.First_Name; textBoxLastName.Text = patient.Last_Name; textBoxAdress.Text = patient.Address; @@ -62,24 +61,19 @@ public partial class FormPatient : Form { try { - // проверяем что поля заполнены if (string.IsNullOrWhiteSpace(textBoxFirstName.Text) || string.IsNullOrWhiteSpace(textBoxLastName.Text) || string.IsNullOrWhiteSpace(textBoxNumPhone.Text) || string.IsNullOrWhiteSpace(textBoxAdress.Text)) { throw new Exception("Имеются незаполненные поля"); } - // проверка есть ли у нас id if (_patientId.HasValue) { - // мы создаем запись и передаем id _patientRepository.UpdatePatient(CreatePatient(_patientId.Value)); } else { - // если id нет, то мы создаем запись, с id ноль _patientRepository.CreatPatient(CreatePatient(0)); } - // закрываем форму Close(); } catch (Exception ex) diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs index 9dea67b..8ca5b05 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs @@ -55,11 +55,10 @@ public partial class FormPatients : Form private void buttonAdd_Click(object sender, EventArgs e) { - // мы получаем через container объект FormPatient и вызываем его try { _container.Resolve().ShowDialog(); - LoadList(); // обновление списка + LoadList(); } catch (Exception ex) {