diff --git a/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.Designer.cs index 4bedc5a..0b91835 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.Designer.cs @@ -30,13 +30,14 @@ { menuStrip1 = new MenuStrip(); справочникиToolStripMenuItem = new ToolStripMenuItem(); - операцииToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); врачиToolStripMenuItem = new ToolStripMenuItem(); пациентыToolStripMenuItem = new ToolStripMenuItem(); диагнозыToolStripMenuItem = new ToolStripMenuItem(); медикаментыToolStripMenuItem = new ToolStripMenuItem(); + операцииToolStripMenuItem = new ToolStripMenuItem(); записьНаПриемToolStripMenuItem = new ToolStripMenuItem(); + перемещениеЛекарствToolStripMenuItem = new ToolStripMenuItem(); + отчетыToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // @@ -46,7 +47,7 @@ menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчетыToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(782, 28); + menuStrip1.Size = new Size(987, 28); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip1"; // @@ -57,56 +58,68 @@ справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Text = "Справочники"; // + // врачиToolStripMenuItem + // + врачиToolStripMenuItem.Name = "врачиToolStripMenuItem"; + врачиToolStripMenuItem.Size = new Size(224, 26); + врачиToolStripMenuItem.Text = "Врачи"; + врачиToolStripMenuItem.Click += DoctorsToolStripMenuItem_Click; + // + // пациентыToolStripMenuItem + // + пациентыToolStripMenuItem.Name = "пациентыToolStripMenuItem"; + пациентыToolStripMenuItem.Size = new Size(224, 26); + пациентыToolStripMenuItem.Text = "Пациенты"; + пациентыToolStripMenuItem.Click += PatientsToolStripMenuItem_Click; + // + // диагнозыToolStripMenuItem + // + диагнозыToolStripMenuItem.Name = "диагнозыToolStripMenuItem"; + диагнозыToolStripMenuItem.Size = new Size(224, 26); + диагнозыToolStripMenuItem.Text = "Диагнозы"; + диагнозыToolStripMenuItem.Click += DiagnosesToolStripMenuItem_Click; + // + // медикаментыToolStripMenuItem + // + медикаментыToolStripMenuItem.Name = "медикаментыToolStripMenuItem"; + медикаментыToolStripMenuItem.Size = new Size(224, 26); + медикаментыToolStripMenuItem.Text = "Медикаменты"; + медикаментыToolStripMenuItem.Click += MedicinesToolStripMenuItem_Click; + // // операцииToolStripMenuItem // - операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { записьНаПриемToolStripMenuItem }); + операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { записьНаПриемToolStripMenuItem, перемещениеЛекарствToolStripMenuItem }); операцииToolStripMenuItem.Name = "операцииToolStripMenuItem"; операцииToolStripMenuItem.Size = new Size(95, 24); операцииToolStripMenuItem.Text = "Операции"; // + // записьНаПриемToolStripMenuItem + // + записьНаПриемToolStripMenuItem.Name = "записьНаПриемToolStripMenuItem"; + записьНаПриемToolStripMenuItem.Size = new Size(258, 26); + записьНаПриемToolStripMenuItem.Text = "Запись на прием"; + записьНаПриемToolStripMenuItem.Click += VisitsToolStripMenuItem_Click; + // + // перемещениеЛекарствToolStripMenuItem + // + перемещениеЛекарствToolStripMenuItem.Name = "перемещениеЛекарствToolStripMenuItem"; + перемещениеЛекарствToolStripMenuItem.Size = new Size(258, 26); + перемещениеЛекарствToolStripMenuItem.Text = "Перемещение лекарств"; + перемещениеЛекарствToolStripMenuItem.Click += MedicinesMovingsToolStripMenuItem_Click; + // // отчетыToolStripMenuItem // отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; отчетыToolStripMenuItem.Size = new Size(73, 24); отчетыToolStripMenuItem.Text = "Отчеты"; // - // врачиToolStripMenuItem - // - врачиToolStripMenuItem.Name = "врачиToolStripMenuItem"; - врачиToolStripMenuItem.Size = new Size(224, 26); - врачиToolStripMenuItem.Text = "Врачи"; - // - // пациентыToolStripMenuItem - // - пациентыToolStripMenuItem.Name = "пациентыToolStripMenuItem"; - пациентыToolStripMenuItem.Size = new Size(224, 26); - пациентыToolStripMenuItem.Text = "Пациенты"; - // - // диагнозыToolStripMenuItem - // - диагнозыToolStripMenuItem.Name = "диагнозыToolStripMenuItem"; - диагнозыToolStripMenuItem.Size = new Size(224, 26); - диагнозыToolStripMenuItem.Text = "Диагнозы"; - // - // медикаментыToolStripMenuItem - // - медикаментыToolStripMenuItem.Name = "медикаментыToolStripMenuItem"; - медикаментыToolStripMenuItem.Size = new Size(224, 26); - медикаментыToolStripMenuItem.Text = "Медикаменты"; - // - // записьНаПриемToolStripMenuItem - // - записьНаПриемToolStripMenuItem.Name = "записьНаПриемToolStripMenuItem"; - записьНаПриемToolStripMenuItem.Size = new Size(224, 26); - записьНаПриемToolStripMenuItem.Text = "Запись на прием"; - // // FormPolyclinic // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; BackgroundImage = Properties.Resources.c516ff9163fefeaa5974fc7c8855cd02; BackgroundImageLayout = ImageLayout.Stretch; - ClientSize = new Size(782, 403); + ClientSize = new Size(987, 499); Controls.Add(menuStrip1); MainMenuStrip = menuStrip1; Name = "FormPolyclinic"; @@ -129,5 +142,6 @@ private ToolStripMenuItem операцииToolStripMenuItem; private ToolStripMenuItem отчетыToolStripMenuItem; private ToolStripMenuItem записьНаПриемToolStripMenuItem; + private ToolStripMenuItem перемещениеЛекарствToolStripMenuItem; } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.cs b/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.cs index b42e1fc..125e3b4 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.cs @@ -1,10 +1,88 @@ +using ProjectPolyclinic.Forms; +using Unity; + namespace ProjectPolyclinic { public partial class FormPolyclinic : Form { - public FormPolyclinic() + private readonly IUnityContainer _container; + + public FormPolyclinic(IUnityContainer container) { InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + } + + private void PatientsToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void DoctorsToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void VisitsToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void MedicinesToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void MedicinesMovingsToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void DiagnosesToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.resx b/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.resx index a0623c8..6a0ab3b 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.resx +++ b/ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.resx @@ -120,4 +120,7 @@ 17, 17 + + 58 + \ No newline at end of file diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs index f22ddc0..19377d1 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs @@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms { try { - dataGridViewData.DataSource = _patientRepository.ReadPatient(); + dataGridView1.DataSource = _patientRepository.ReadPatient(); } catch (Exception ex) { @@ -95,7 +95,7 @@ namespace ProjectPolyclinic.Forms private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; - if (dataGridViewData.SelectedRows.Count < 1) + if (dataGridView1.SelectedRows.Count < 1) { MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/195-1956806_abort-delete-cancel-icon-cross-no-access-denied.jpg b/ProjectPolyclinic/ProjectPolyclinic/Resources/195-1956806_abort-delete-cancel-icon-cross-no-access-denied.jpg new file mode 100644 index 0000000..49d9526 Binary files /dev/null and b/ProjectPolyclinic/ProjectPolyclinic/Resources/195-1956806_abort-delete-cancel-icon-cross-no-access-denied.jpg differ diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/195-1956806_abort-delete-cancel-icon-cross-no-access-denied.png b/ProjectPolyclinic/ProjectPolyclinic/Resources/195-1956806_abort-delete-cancel-icon-cross-no-access-denied.png new file mode 100644 index 0000000..49d9526 Binary files /dev/null and b/ProjectPolyclinic/ProjectPolyclinic/Resources/195-1956806_abort-delete-cancel-icon-cross-no-access-denied.png differ diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.jpg b/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.jpg new file mode 100644 index 0000000..e4d9850 Binary files /dev/null and b/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.jpg differ diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.png b/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.png new file mode 100644 index 0000000..e4d9850 Binary files /dev/null and b/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.png differ diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/unnamed1.jpg b/ProjectPolyclinic/ProjectPolyclinic/Resources/unnamed1.jpg new file mode 100644 index 0000000..9184f04 Binary files /dev/null and b/ProjectPolyclinic/ProjectPolyclinic/Resources/unnamed1.jpg differ