Последние изменения

This commit is contained in:
DanilaSmolin08 2024-12-07 23:09:28 +04:00
parent 9fd95f194f
commit 2a17a4b4cb
27 changed files with 281 additions and 249 deletions

View File

@ -32,9 +32,9 @@
buttonUpd = new Button(); buttonUpd = new Button();
buttonDel = new Button(); buttonDel = new Button();
buttonAdd = new Button(); buttonAdd = new Button();
dataGridViewDiagnoses = new DataGridView(); DataGridViewDiagnoses = new DataGridView();
panel1.SuspendLayout(); panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridViewDiagnoses).BeginInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewDiagnoses).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// panel1 // panel1
@ -50,61 +50,64 @@
// //
// buttonUpd // buttonUpd
// //
buttonUpd.Location = new Point(56, 306); buttonUpd.BackgroundImage = Properties.Resources.kisspng_computer_icons_transparency_image_editing_symbol_manage_svg_png_icon_free_download_171_77_onli_5d28d47b0152b7_3749987215629569230054;
buttonUpd.BackgroundImageLayout = ImageLayout.Stretch;
buttonUpd.Location = new Point(56, 286);
buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(116, 85); buttonUpd.Size = new Size(116, 105);
buttonUpd.TabIndex = 2; buttonUpd.TabIndex = 2;
buttonUpd.Text = "Изменить";
buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += buttonUpd_Click; buttonUpd.Click += buttonUpd_Click;
// //
// buttonDel // buttonDel
// //
buttonDel.Location = new Point(56, 171); buttonDel.BackgroundImage = Properties.Resources.trash_bin_circle_background_icon_free_vector;
buttonDel.BackgroundImageLayout = ImageLayout.Stretch;
buttonDel.Location = new Point(56, 153);
buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(116, 86); buttonDel.Size = new Size(116, 104);
buttonDel.TabIndex = 1; buttonDel.TabIndex = 1;
buttonDel.Text = "Удалить";
buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += buttonDel_Click; buttonDel.Click += buttonDel_Click;
// //
// buttonAdd // buttonAdd
// //
buttonAdd.BackgroundImage = Properties.Resources.Fairytale_button_add1;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(56, 26); buttonAdd.Location = new Point(56, 26);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(116, 91); buttonAdd.Size = new Size(116, 91);
buttonAdd.TabIndex = 0; buttonAdd.TabIndex = 0;
buttonAdd.Text = "Добавить";
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click; buttonAdd.Click += buttonAdd_Click;
// //
// dataGridViewDiagnoses // DataGridViewDiagnoses
// //
dataGridViewDiagnoses.AllowUserToAddRows = false; DataGridViewDiagnoses.AllowUserToAddRows = false;
dataGridViewDiagnoses.AllowUserToDeleteRows = false; DataGridViewDiagnoses.AllowUserToDeleteRows = false;
dataGridViewDiagnoses.AllowUserToResizeColumns = false; DataGridViewDiagnoses.AllowUserToResizeColumns = false;
dataGridViewDiagnoses.AllowUserToResizeRows = false; DataGridViewDiagnoses.AllowUserToResizeRows = false;
dataGridViewDiagnoses.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; DataGridViewDiagnoses.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewDiagnoses.Dock = DockStyle.Fill; DataGridViewDiagnoses.Dock = DockStyle.Fill;
dataGridViewDiagnoses.Location = new Point(0, 0); DataGridViewDiagnoses.Location = new Point(0, 0);
dataGridViewDiagnoses.Name = "dataGridViewDiagnoses"; DataGridViewDiagnoses.Name = "DataGridViewDiagnoses";
dataGridViewDiagnoses.ReadOnly = true; DataGridViewDiagnoses.ReadOnly = true;
dataGridViewDiagnoses.RowHeadersWidth = 51; DataGridViewDiagnoses.RowHeadersWidth = 51;
dataGridViewDiagnoses.Size = new Size(590, 450); DataGridViewDiagnoses.Size = new Size(590, 450);
dataGridViewDiagnoses.TabIndex = 1; DataGridViewDiagnoses.TabIndex = 1;
// //
// FormDiagnoses // FormDiagnoses
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450); ClientSize = new Size(800, 450);
Controls.Add(dataGridViewDiagnoses); Controls.Add(DataGridViewDiagnoses);
Controls.Add(panel1); Controls.Add(panel1);
Name = "FormDiagnoses"; Name = "FormDiagnoses";
Text = "Дигнозы"; Text = "Дигнозы";
Load += FormDiagnoses_Load; Load += FormDiagnoses_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridViewDiagnoses).EndInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewDiagnoses).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
@ -114,6 +117,6 @@
private Button buttonUpd; private Button buttonUpd;
private Button buttonDel; private Button buttonDel;
private Button buttonAdd; private Button buttonAdd;
private DataGridView dataGridViewDiagnoses; private DataGridView DataGridViewDiagnoses;
} }
} }

View File

@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms
{ {
try try
{ {
dataGridViewDiagnoses.DataSource = _diagnosisRepository.ReadDiagnosis(); DataGridViewDiagnoses.DataSource = _diagnosisRepository.ReadDiagnosis();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms
private bool TryGetIdentifierFromSelectedRow(out int id) private bool TryGetIdentifierFromSelectedRow(out int id)
{ {
id = 0; id = 0;
if (dataGridViewDiagnoses.SelectedRows.Count < 1) if (DataGridViewDiagnoses.SelectedRows.Count < 1)
{ {
MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false; return false;
} }
id = Convert.ToInt32(dataGridViewDiagnoses.SelectedRows[0].Cells["Id"].Value); id = Convert.ToInt32(DataGridViewDiagnoses.SelectedRows[0].Cells["Id"].Value);
return true; return true;
} }
} }

View File

@ -32,9 +32,9 @@
buttonUpd = new Button(); buttonUpd = new Button();
buttonDel = new Button(); buttonDel = new Button();
buttonAdd = new Button(); buttonAdd = new Button();
dataGridViewDoctors = new DataGridView(); DataGridViewDoctors = new DataGridView();
panel1.SuspendLayout(); panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridViewDoctors).BeginInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewDoctors).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// panel1 // panel1
@ -51,75 +51,78 @@
// buttonUpd // buttonUpd
// //
buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonUpd.Location = new Point(38, 257); buttonUpd.BackgroundImage = Properties.Resources.kisspng_computer_icons_transparency_image_editing_symbol_manage_svg_png_icon_free_download_171_77_onli_5d28d47b0152b7_3749987215629569230054;
buttonUpd.BackgroundImageLayout = ImageLayout.Stretch;
buttonUpd.Location = new Point(38, 261);
buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(119, 85); buttonUpd.Size = new Size(119, 101);
buttonUpd.TabIndex = 2; buttonUpd.TabIndex = 2;
buttonUpd.Text = "Изменить";
buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += buttonUpd_Click; buttonUpd.Click += buttonUpd_Click;
// //
// buttonDel // buttonDel
// //
buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonDel.BackgroundImage = Properties.Resources.trash_bin_circle_background_icon_free_vector;
buttonDel.BackgroundImageLayout = ImageLayout.Stretch;
buttonDel.Location = new Point(38, 135); buttonDel.Location = new Point(38, 135);
buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(119, 88); buttonDel.Size = new Size(119, 100);
buttonDel.TabIndex = 1; buttonDel.TabIndex = 1;
buttonDel.Text = "Удалить";
buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += buttonDel_Click; buttonDel.Click += buttonDel_Click;
// //
// buttonAdd // buttonAdd
// //
buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAdd.BackgroundImage = Properties.Resources.Fairytale_button_add1;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(38, 12); buttonAdd.Location = new Point(38, 12);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(119, 85); buttonAdd.Size = new Size(119, 94);
buttonAdd.TabIndex = 0; buttonAdd.TabIndex = 0;
buttonAdd.Text = "Добавить";
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click; buttonAdd.Click += buttonAdd_Click;
// //
// dataGridViewDoctors // DataGridViewDoctors
// //
dataGridViewDoctors.AllowUserToAddRows = false; DataGridViewDoctors.AllowUserToAddRows = false;
dataGridViewDoctors.AllowUserToDeleteRows = false; DataGridViewDoctors.AllowUserToDeleteRows = false;
dataGridViewDoctors.AllowUserToResizeColumns = false; DataGridViewDoctors.AllowUserToResizeColumns = false;
dataGridViewDoctors.AllowUserToResizeRows = false; DataGridViewDoctors.AllowUserToResizeRows = false;
dataGridViewDoctors.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; DataGridViewDoctors.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridViewDoctors.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; DataGridViewDoctors.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewDoctors.Dock = DockStyle.Fill; DataGridViewDoctors.Dock = DockStyle.Fill;
dataGridViewDoctors.Location = new Point(0, 0); DataGridViewDoctors.Location = new Point(0, 0);
dataGridViewDoctors.MultiSelect = false; DataGridViewDoctors.MultiSelect = false;
dataGridViewDoctors.Name = "dataGridViewDoctors"; DataGridViewDoctors.Name = "DataGridViewDoctors";
dataGridViewDoctors.ReadOnly = true; DataGridViewDoctors.ReadOnly = true;
dataGridViewDoctors.RowHeadersVisible = false; DataGridViewDoctors.RowHeadersVisible = false;
dataGridViewDoctors.RowHeadersWidth = 51; DataGridViewDoctors.RowHeadersWidth = 51;
dataGridViewDoctors.SelectionMode = DataGridViewSelectionMode.FullRowSelect; DataGridViewDoctors.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridViewDoctors.Size = new Size(603, 450); DataGridViewDoctors.Size = new Size(603, 450);
dataGridViewDoctors.TabIndex = 1; DataGridViewDoctors.TabIndex = 1;
// //
// FormDoctors // FormDoctors
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450); ClientSize = new Size(800, 450);
Controls.Add(dataGridViewDoctors); Controls.Add(DataGridViewDoctors);
Controls.Add(panel1); Controls.Add(panel1);
Name = "FormDoctors"; Name = "FormDoctors";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "Доктора"; Text = "Доктора";
Load += FormDoctors_Load; Load += FormDoctors_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridViewDoctors).EndInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewDoctors).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
#endregion #endregion
private Panel panel1; private Panel panel1;
private DataGridView dataGridViewDoctors; private DataGridView DataGridViewDoctors;
private Button buttonUpd; private Button buttonUpd;
private Button buttonDel; private Button buttonDel;
private Button buttonAdd; private Button buttonAdd;

View File

@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms
{ {
try try
{ {
dataGridViewDoctors.DataSource = _doctorRepository.ReadDoctor(); DataGridViewDoctors.DataSource = _doctorRepository.ReadDoctor();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms
private bool TryGetIdentifierFromSelectedRow(out int id) private bool TryGetIdentifierFromSelectedRow(out int id)
{ {
id = 0; id = 0;
if (dataGridViewDoctors.SelectedRows.Count < 1) if (DataGridViewDoctors.SelectedRows.Count < 1)
{ {
MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false; return false;
} }
id = Convert.ToInt32(dataGridViewDoctors.SelectedRows[0].Cells["Id"].Value); id = Convert.ToInt32(DataGridViewDoctors.SelectedRows[0].Cells["Id"].Value);
return true; return true;
} }
} }

View File

@ -32,9 +32,9 @@
buttonUpd = new Button(); buttonUpd = new Button();
buttonDel = new Button(); buttonDel = new Button();
buttonAdd = new Button(); buttonAdd = new Button();
dataGridViewMedicines = new DataGridView(); DataGridViewMedicines = new DataGridView();
panel1.SuspendLayout(); panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridViewMedicines).BeginInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewMedicines).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// panel1 // panel1
@ -51,71 +51,76 @@
// buttonUpd // buttonUpd
// //
buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonUpd.BackgroundImage = Properties.Resources.kisspng_computer_icons_transparency_image_editing_symbol_manage_svg_png_icon_free_download_171_77_onli_5d28d47b0152b7_3749987215629569230054;
buttonUpd.BackgroundImageLayout = ImageLayout.Stretch;
buttonUpd.Location = new Point(30, 277); buttonUpd.Location = new Point(30, 277);
buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(118, 83); buttonUpd.Size = new Size(118, 105);
buttonUpd.TabIndex = 2; buttonUpd.TabIndex = 2;
buttonUpd.Text = "Изменить";
buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += buttonUpd_Click; buttonUpd.Click += buttonUpd_Click;
// //
// buttonDel // buttonDel
// //
buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonDel.BackgroundImage = Properties.Resources.trash_bin_circle_background_icon_free_vector;
buttonDel.BackgroundImageLayout = ImageLayout.Stretch;
buttonDel.Location = new Point(30, 155); buttonDel.Location = new Point(30, 155);
buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(118, 85); buttonDel.Size = new Size(118, 85);
buttonDel.TabIndex = 1; buttonDel.TabIndex = 1;
buttonDel.Text = "Удалить";
buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += buttonDel_Click; buttonDel.Click += buttonDel_Click;
// //
// buttonAdd // buttonAdd
// //
buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAdd.AutoSize = true;
buttonAdd.BackgroundImage = Properties.Resources.Fairytale_button_add1;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(30, 34); buttonAdd.Location = new Point(30, 34);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(118, 86); buttonAdd.Size = new Size(118, 86);
buttonAdd.TabIndex = 0; buttonAdd.TabIndex = 0;
buttonAdd.Text = "Добавить";
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += buttonAdd_Click; buttonAdd.Click += buttonAdd_Click;
// //
// dataGridViewMedicines // DataGridViewMedicines
// //
dataGridViewMedicines.AllowUserToAddRows = false; DataGridViewMedicines.AllowUserToAddRows = false;
dataGridViewMedicines.AllowUserToDeleteRows = false; DataGridViewMedicines.AllowUserToDeleteRows = false;
dataGridViewMedicines.AllowUserToResizeColumns = false; DataGridViewMedicines.AllowUserToResizeColumns = false;
dataGridViewMedicines.AllowUserToResizeRows = false; DataGridViewMedicines.AllowUserToResizeRows = false;
dataGridViewMedicines.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; DataGridViewMedicines.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewMedicines.Dock = DockStyle.Fill; DataGridViewMedicines.Dock = DockStyle.Fill;
dataGridViewMedicines.Location = new Point(0, 0); DataGridViewMedicines.Location = new Point(0, 0);
dataGridViewMedicines.Name = "dataGridViewMedicines"; DataGridViewMedicines.Name = "DataGridViewMedicines";
dataGridViewMedicines.ReadOnly = true; DataGridViewMedicines.ReadOnly = true;
dataGridViewMedicines.RowHeadersWidth = 51; DataGridViewMedicines.RowHeadersWidth = 51;
dataGridViewMedicines.Size = new Size(565, 424); DataGridViewMedicines.Size = new Size(565, 424);
dataGridViewMedicines.TabIndex = 1; DataGridViewMedicines.TabIndex = 1;
// //
// FormMedicines // FormMedicines
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(746, 424); ClientSize = new Size(746, 424);
Controls.Add(dataGridViewMedicines); Controls.Add(DataGridViewMedicines);
Controls.Add(panel1); Controls.Add(panel1);
Name = "FormMedicines"; Name = "FormMedicines";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "Лекарства"; Text = "Лекарства";
Load += FormMedicines_Load; Load += FormMedicines_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridViewMedicines).EndInit(); panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)DataGridViewMedicines).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
#endregion #endregion
private Panel panel1; private Panel panel1;
private DataGridView dataGridViewMedicines; private DataGridView DataGridViewMedicines;
private Button buttonUpd; private Button buttonUpd;
private Button buttonDel; private Button buttonDel;
private Button buttonAdd; private Button buttonAdd;

View File

@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms
{ {
try try
{ {
dataGridViewMedicines.DataSource = _medicinesRepository.ReadMedicines(); DataGridViewMedicines.DataSource = _medicinesRepository.ReadMedicines();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms
private bool TryGetIdentifierFromSelectedRow(out int id) private bool TryGetIdentifierFromSelectedRow(out int id)
{ {
id = 0; id = 0;
if (dataGridViewMedicines.SelectedRows.Count < 1) if (DataGridViewMedicines.SelectedRows.Count < 1)
{ {
MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false; return false;
} }
id = Convert.ToInt32(dataGridViewMedicines.SelectedRows[0].Cells["Id"].Value); id = Convert.ToInt32(DataGridViewMedicines.SelectedRows[0].Cells["Id"].Value);
return true; return true;
} }
} }

View File

@ -28,7 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
dateTimePickerData = new DateTimePicker(); DateTimePickerData = new DateTimePicker();
label1 = new Label(); label1 = new Label();
buttonSave = new Button(); buttonSave = new Button();
buttonCancel = new Button(); buttonCancel = new Button();
@ -38,12 +38,12 @@
comboBoxMedicinesStatement = new ComboBox(); comboBoxMedicinesStatement = new ComboBox();
SuspendLayout(); SuspendLayout();
// //
// dateTimePickerData // DateTimePickerData
// //
dateTimePickerData.Location = new Point(164, 24); DateTimePickerData.Location = new Point(164, 24);
dateTimePickerData.Name = "dateTimePickerData"; DateTimePickerData.Name = "DateTimePickerData";
dateTimePickerData.Size = new Size(245, 27); DateTimePickerData.Size = new Size(245, 27);
dateTimePickerData.TabIndex = 0; DateTimePickerData.TabIndex = 0;
// //
// label1 // label1
// //
@ -122,7 +122,7 @@
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
Controls.Add(buttonSave); Controls.Add(buttonSave);
Controls.Add(label1); Controls.Add(label1);
Controls.Add(dateTimePickerData); Controls.Add(DateTimePickerData);
Name = "FormMedicinesMoving"; Name = "FormMedicinesMoving";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "Перемещение лекарств"; Text = "Перемещение лекарств";
@ -132,7 +132,7 @@
#endregion #endregion
private DateTimePicker dateTimePickerData; private DateTimePicker DateTimePickerData;
private Label label1; private Label label1;
private Button buttonSave; private Button buttonSave;
private Button buttonCancel; private Button buttonCancel;

View File

@ -26,7 +26,7 @@ namespace ProjectPolyclinic.Forms
throw new InvalidOperationException("Операция с указанным идентификатором не найдена."); throw new InvalidOperationException("Операция с указанным идентификатором не найдена.");
} }
dateTimePickerData.Value = medicinesMoving.Date; DateTimePickerData.Value = medicinesMoving.Date;
comboBoxName.SelectedValue = medicinesMoving.MedicinesId; comboBoxName.SelectedValue = medicinesMoving.MedicinesId;
comboBoxMedicinesStatement.SelectedValue = medicinesMoving.MedicinesStatement.FirstOrDefault(); comboBoxMedicinesStatement.SelectedValue = medicinesMoving.MedicinesStatement.FirstOrDefault();
@ -64,7 +64,7 @@ namespace ProjectPolyclinic.Forms
throw new Exception("Имеются незаполненные поля."); throw new Exception("Имеются незаполненные поля.");
} }
if (!DateTime.TryParse(dateTimePickerData.Text, out var operationDate)) if (!DateTime.TryParse(DateTimePickerData.Text, out var operationDate))
{ {
throw new Exception("Неверный формат даты."); throw new Exception("Неверный формат даты.");
} }

View File

@ -32,9 +32,9 @@
buttonUpd = new Button(); buttonUpd = new Button();
buttonDel = new Button(); buttonDel = new Button();
buttonAdd = new Button(); buttonAdd = new Button();
dataGridViewMedicinesMovings = new DataGridView(); DataGridViewMedicinesMovings = new DataGridView();
panel1.SuspendLayout(); panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridViewMedicinesMovings).BeginInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewMedicinesMovings).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// panel1 // panel1
@ -50,71 +50,74 @@
// //
// buttonUpd // buttonUpd
// //
buttonUpd.Location = new Point(24, 214); buttonUpd.BackgroundImage = Properties.Resources.kisspng_computer_icons_transparency_image_editing_symbol_manage_svg_png_icon_free_download_171_77_onli_5d28d47b0152b7_3749987215629569230054;
buttonUpd.BackgroundImageLayout = ImageLayout.Stretch;
buttonUpd.Location = new Point(24, 247);
buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(133, 78); buttonUpd.Size = new Size(133, 97);
buttonUpd.TabIndex = 2; buttonUpd.TabIndex = 2;
buttonUpd.Text = "Изменить";
buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += ButtonUpd_Click; buttonUpd.Click += ButtonUpd_Click;
// //
// buttonDel // buttonDel
// //
buttonDel.Location = new Point(24, 114); buttonDel.BackgroundImage = Properties.Resources.trash_bin_circle_background_icon_free_vector;
buttonDel.BackgroundImageLayout = ImageLayout.Stretch;
buttonDel.Location = new Point(24, 132);
buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(133, 72); buttonDel.Size = new Size(133, 94);
buttonDel.TabIndex = 1; buttonDel.TabIndex = 1;
buttonDel.Text = "Удалить";
buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += ButtonDel_Click; buttonDel.Click += ButtonDel_Click;
// //
// buttonAdd // buttonAdd
// //
buttonAdd.BackgroundImage = Properties.Resources.Fairytale_button_add1;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(24, 12); buttonAdd.Location = new Point(24, 12);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(133, 76); buttonAdd.Size = new Size(133, 98);
buttonAdd.TabIndex = 0; buttonAdd.TabIndex = 0;
buttonAdd.Text = "Создать";
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += ButtonAdd_Click; buttonAdd.Click += ButtonAdd_Click;
// //
// dataGridViewMedicinesMovings // DataGridViewMedicinesMovings
// //
dataGridViewMedicinesMovings.AllowUserToAddRows = false; DataGridViewMedicinesMovings.AllowUserToAddRows = false;
dataGridViewMedicinesMovings.AllowUserToDeleteRows = false; DataGridViewMedicinesMovings.AllowUserToDeleteRows = false;
dataGridViewMedicinesMovings.AllowUserToResizeColumns = false; DataGridViewMedicinesMovings.AllowUserToResizeColumns = false;
dataGridViewMedicinesMovings.AllowUserToResizeRows = false; DataGridViewMedicinesMovings.AllowUserToResizeRows = false;
dataGridViewMedicinesMovings.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; DataGridViewMedicinesMovings.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridViewMedicinesMovings.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; DataGridViewMedicinesMovings.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewMedicinesMovings.Dock = DockStyle.Fill; DataGridViewMedicinesMovings.Dock = DockStyle.Fill;
dataGridViewMedicinesMovings.Location = new Point(0, 0); DataGridViewMedicinesMovings.Location = new Point(0, 0);
dataGridViewMedicinesMovings.MultiSelect = false; DataGridViewMedicinesMovings.MultiSelect = false;
dataGridViewMedicinesMovings.Name = "dataGridViewMedicinesMovings"; DataGridViewMedicinesMovings.Name = "DataGridViewMedicinesMovings";
dataGridViewMedicinesMovings.ReadOnly = true; DataGridViewMedicinesMovings.ReadOnly = true;
dataGridViewMedicinesMovings.RowHeadersWidth = 51; DataGridViewMedicinesMovings.RowHeadersWidth = 51;
dataGridViewMedicinesMovings.SelectionMode = DataGridViewSelectionMode.FullRowSelect; DataGridViewMedicinesMovings.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridViewMedicinesMovings.Size = new Size(466, 356); DataGridViewMedicinesMovings.Size = new Size(466, 356);
dataGridViewMedicinesMovings.TabIndex = 1; DataGridViewMedicinesMovings.TabIndex = 1;
dataGridViewMedicinesMovings.Click += FormMedicinesMovings_Load;
// //
// FormMedicinesMovings // FormMedicinesMovings
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(652, 356); ClientSize = new Size(652, 356);
Controls.Add(dataGridViewMedicinesMovings); Controls.Add(DataGridViewMedicinesMovings);
Controls.Add(panel1); Controls.Add(panel1);
Name = "FormMedicinesMovings"; Name = "FormMedicinesMovings";
Text = "Перемещения лекарств"; Text = "Перемещения лекарств";
Load += FormMedicinesMovings_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridViewMedicinesMovings).EndInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewMedicinesMovings).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
#endregion #endregion
private Panel panel1; private Panel panel1;
private DataGridView dataGridViewMedicinesMovings; private DataGridView DataGridViewMedicinesMovings;
private Button buttonUpd; private Button buttonUpd;
private Button buttonDel; private Button buttonDel;
private Button buttonAdd; private Button buttonAdd;

View File

@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms
{ {
try try
{ {
dataGridViewMedicinesMovings.DataSource = _medicinesMovingRepository.ReadMedicinesMovings(); DataGridViewMedicinesMovings.DataSource = _medicinesMovingRepository.ReadMedicinesMovings();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms
private bool TryGetIdentifierFromSelectedRow(out int id) private bool TryGetIdentifierFromSelectedRow(out int id)
{ {
id = 0; id = 0;
if (dataGridViewMedicinesMovings.SelectedRows.Count < 1) if (DataGridViewMedicinesMovings.SelectedRows.Count < 1)
{ {
MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false; return false;
} }
id = Convert.ToInt32(dataGridViewMedicinesMovings.SelectedRows[0].Cells["Id"].Value); id = Convert.ToInt32(DataGridViewMedicinesMovings.SelectedRows[0].Cells["Id"].Value);
return true; return true;
} }
} }

View File

@ -39,7 +39,7 @@
textBoxMedicalCardNumber = new MaskedTextBox(); textBoxMedicalCardNumber = new MaskedTextBox();
button1 = new Button(); button1 = new Button();
button2 = new Button(); button2 = new Button();
dateTimePicker1 = new DateTimePicker(); DateTimePickerDate = new DateTimePicker();
SuspendLayout(); SuspendLayout();
// //
// label1 // label1
@ -139,19 +139,19 @@
button2.UseVisualStyleBackColor = true; button2.UseVisualStyleBackColor = true;
button2.Click += ButtonCancel_Click; button2.Click += ButtonCancel_Click;
// //
// dateTimePicker1 // DateTimePickerDate
// //
dateTimePicker1.Location = new Point(137, 194); DateTimePickerDate.Location = new Point(137, 194);
dateTimePicker1.Name = "dateTimePicker1"; DateTimePickerDate.Name = "DateTimePickerDate";
dateTimePicker1.Size = new Size(201, 27); DateTimePickerDate.Size = new Size(201, 27);
dateTimePicker1.TabIndex = 13; DateTimePickerDate.TabIndex = 13;
// //
// FormPatient // FormPatient
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(350, 463); ClientSize = new Size(350, 463);
Controls.Add(dateTimePicker1); Controls.Add(DateTimePickerDate);
Controls.Add(button2); Controls.Add(button2);
Controls.Add(button1); Controls.Add(button1);
Controls.Add(textBoxMedicalCardNumber); Controls.Add(textBoxMedicalCardNumber);
@ -177,13 +177,12 @@
private Label label2; private Label label2;
private TextBox textBoxLastName; private TextBox textBoxLastName;
private Label label3; private Label label3;
private MaskedTextBox dateTimePickerBirthDate;
private TextBox textBoxAddress; private TextBox textBoxAddress;
private Label label4; private Label label4;
private Label label5; private Label label5;
private MaskedTextBox textBoxMedicalCardNumber; private MaskedTextBox textBoxMedicalCardNumber;
private Button button1; private Button button1;
private Button button2; private Button button2;
private DateTimePicker dateTimePicker1; private DateTimePicker DateTimePickerDate;
} }
} }

View File

@ -21,7 +21,7 @@ namespace ProjectPolyclinic.Forms
} }
textBoxFirstName.Text = patient.FirstName; textBoxFirstName.Text = patient.FirstName;
textBoxLastName.Text = patient.LastName; textBoxLastName.Text = patient.LastName;
dateTimePicker1.Value = patient.BirthDate; DateTimePickerDate.Value = patient.BirthDate;
textBoxAddress.Text = patient.Address; textBoxAddress.Text = patient.Address;
textBoxMedicalCardNumber.Text = patient.MedicalCardNumber.ToString(); textBoxMedicalCardNumber.Text = patient.MedicalCardNumber.ToString();
_patientId = value; _patientId = value;
@ -39,8 +39,8 @@ namespace ProjectPolyclinic.Forms
InitializeComponent(); InitializeComponent();
_patientRepository = patientRepository ?? throw new ArgumentNullException(nameof(patientRepository)); _patientRepository = patientRepository ?? throw new ArgumentNullException(nameof(patientRepository));
dateTimePicker1.MaxDate = DateTime.Today; DateTimePickerDate.MaxDate = DateTime.Today;
dateTimePicker1.MinDate = new DateTime(1900, 1, 1); DateTimePickerDate.MinDate = new DateTime(1900, 1, 1);
} }
private void ButtonSave_Click(object sender, EventArgs e) private void ButtonSave_Click(object sender, EventArgs e)
@ -55,7 +55,7 @@ namespace ProjectPolyclinic.Forms
throw new Exception("Имеются незаполненные поля"); throw new Exception("Имеются незаполненные поля");
} }
var birthDate = dateTimePicker1.Value; var birthDate = DateTimePickerDate.Value;
if (_patientId.HasValue) if (_patientId.HasValue)
{ {

View File

@ -33,10 +33,10 @@
ButtonDel = new Button(); ButtonDel = new Button();
ButtonAdd = new Button(); ButtonAdd = new Button();
dataGridViewData = new DataGridView(); dataGridViewData = new DataGridView();
dataGridView1 = new DataGridView(); DataGridViewPatients = new DataGridView();
panel1.SuspendLayout(); panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit();
((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewPatients).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// panel1 // panel1
@ -53,34 +53,38 @@
// ButtonUpd // ButtonUpd
// //
ButtonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; ButtonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
ButtonUpd.BackgroundImage = Properties.Resources.kisspng_computer_icons_transparency_image_editing_symbol_manage_svg_png_icon_free_download_171_77_onli_5d28d47b0152b7_3749987215629569230054;
ButtonUpd.BackgroundImageLayout = ImageLayout.Stretch;
ButtonUpd.Location = new Point(29, 283); ButtonUpd.Location = new Point(29, 283);
ButtonUpd.Name = "ButtonUpd"; ButtonUpd.Name = "ButtonUpd";
ButtonUpd.Size = new Size(124, 78); ButtonUpd.Size = new Size(124, 101);
ButtonUpd.TabIndex = 2; ButtonUpd.TabIndex = 2;
ButtonUpd.Text = "Изменить";
ButtonUpd.UseVisualStyleBackColor = true; ButtonUpd.UseVisualStyleBackColor = true;
ButtonUpd.Click += ButtonUpd_Click; ButtonUpd.Click += ButtonUpd_Click;
// //
// ButtonDel // ButtonDel
// //
ButtonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; ButtonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
ButtonDel.BackColor = SystemColors.ControlLight;
ButtonDel.BackgroundImage = Properties.Resources.trash_bin_circle_background_icon_free_vector;
ButtonDel.BackgroundImageLayout = ImageLayout.Stretch;
ButtonDel.Location = new Point(29, 160); ButtonDel.Location = new Point(29, 160);
ButtonDel.Name = "ButtonDel"; ButtonDel.Name = "ButtonDel";
ButtonDel.Size = new Size(124, 81); ButtonDel.Size = new Size(124, 98);
ButtonDel.TabIndex = 1; ButtonDel.TabIndex = 1;
ButtonDel.Text = "Удалить"; ButtonDel.UseVisualStyleBackColor = false;
ButtonDel.UseVisualStyleBackColor = true;
ButtonDel.Click += ButtonDel_Click; ButtonDel.Click += ButtonDel_Click;
// //
// ButtonAdd // ButtonAdd
// //
ButtonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; ButtonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
ButtonAdd.BackgroundImageLayout = ImageLayout.Center; ButtonAdd.BackgroundImage = Properties.Resources.Fairytale_button_add1;
ButtonAdd.BackgroundImageLayout = ImageLayout.Stretch;
ButtonAdd.Location = new Point(29, 40); ButtonAdd.Location = new Point(29, 40);
ButtonAdd.Name = "ButtonAdd"; ButtonAdd.Name = "ButtonAdd";
ButtonAdd.Size = new Size(124, 75); ButtonAdd.Size = new Size(124, 91);
ButtonAdd.TabIndex = 0; ButtonAdd.TabIndex = 0;
ButtonAdd.Text = "Добавить"; ButtonAdd.TextAlign = ContentAlignment.BottomLeft;
ButtonAdd.UseVisualStyleBackColor = true; ButtonAdd.UseVisualStyleBackColor = true;
ButtonAdd.Click += ButtonAdd_Click; ButtonAdd.Click += ButtonAdd_Click;
// //
@ -103,31 +107,31 @@
dataGridViewData.Size = new Size(564, 450); dataGridViewData.Size = new Size(564, 450);
dataGridViewData.TabIndex = 1; dataGridViewData.TabIndex = 1;
// //
// dataGridView1 // DataGridViewPatients
// //
dataGridView1.AllowUserToAddRows = false; DataGridViewPatients.AllowUserToAddRows = false;
dataGridView1.AllowUserToDeleteRows = false; DataGridViewPatients.AllowUserToDeleteRows = false;
dataGridView1.AllowUserToResizeColumns = false; DataGridViewPatients.AllowUserToResizeColumns = false;
dataGridView1.AllowUserToResizeRows = false; DataGridViewPatients.AllowUserToResizeRows = false;
dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; DataGridViewPatients.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; DataGridViewPatients.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView1.Dock = DockStyle.Fill; DataGridViewPatients.Dock = DockStyle.Fill;
dataGridView1.Location = new Point(0, 0); DataGridViewPatients.Location = new Point(0, 0);
dataGridView1.MultiSelect = false; DataGridViewPatients.MultiSelect = false;
dataGridView1.Name = "dataGridView1"; DataGridViewPatients.Name = "DataGridViewPatients";
dataGridView1.ReadOnly = true; DataGridViewPatients.ReadOnly = true;
dataGridView1.RowHeadersVisible = false; DataGridViewPatients.RowHeadersVisible = false;
dataGridView1.RowHeadersWidth = 51; DataGridViewPatients.RowHeadersWidth = 51;
dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; DataGridViewPatients.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView1.Size = new Size(564, 450); DataGridViewPatients.Size = new Size(564, 450);
dataGridView1.TabIndex = 2; DataGridViewPatients.TabIndex = 2;
// //
// FormPatients // FormPatients
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(742, 450); ClientSize = new Size(742, 450);
Controls.Add(dataGridView1); Controls.Add(DataGridViewPatients);
Controls.Add(dataGridViewData); Controls.Add(dataGridViewData);
Controls.Add(panel1); Controls.Add(panel1);
Name = "FormPatients"; Name = "FormPatients";
@ -136,7 +140,7 @@
Load += FormPatients_Load; Load += FormPatients_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();
((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewPatients).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
@ -147,6 +151,6 @@
private Button ButtonDel; private Button ButtonDel;
private Button ButtonAdd; private Button ButtonAdd;
private DataGridView dataGridViewData; private DataGridView dataGridViewData;
private DataGridView dataGridView1; private DataGridView DataGridViewPatients;
} }
} }

View File

@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms
{ {
try try
{ {
dataGridView1.DataSource = _patientRepository.ReadPatient(); DataGridViewPatients.DataSource = _patientRepository.ReadPatient();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms
private bool TryGetIdentifierFromSelectedRow(out int id) private bool TryGetIdentifierFromSelectedRow(out int id)
{ {
id = 0; id = 0;
if (dataGridView1.SelectedRows.Count < 1) if (DataGridViewPatients.SelectedRows.Count < 1)
{ {
MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false; return false;
} }
id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value); id = Convert.ToInt32(DataGridViewPatients.SelectedRows[0].Cells["Id"].Value);
return true; return true;
} }
} }

View File

@ -28,7 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
dateTimePicker1 = new DateTimePicker(); DateTimePickerData = new DateTimePicker();
label1 = new Label(); label1 = new Label();
label2 = new Label(); label2 = new Label();
label3 = new Label(); label3 = new Label();
@ -39,19 +39,19 @@
buttonSave = new Button(); buttonSave = new Button();
buttonCancel = new Button(); buttonCancel = new Button();
groupBoxMedicines = new GroupBox(); groupBoxMedicines = new GroupBox();
dataGridViewMedicines = new DataGridView(); DataGridViewMedicines = new DataGridView();
ColumnMedicine = new DataGridViewComboBoxColumn(); ColumnMedicine = new DataGridViewComboBoxColumn();
ColumnQuantity = new DataGridViewTextBoxColumn(); ColumnQuantity = new DataGridViewTextBoxColumn();
groupBoxMedicines.SuspendLayout(); groupBoxMedicines.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridViewMedicines).BeginInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewMedicines).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// dateTimePicker1 // DateTimePickerData
// //
dateTimePicker1.Location = new Point(132, 24); DateTimePickerData.Location = new Point(132, 24);
dateTimePicker1.Name = "dateTimePicker1"; DateTimePickerData.Name = "DateTimePickerData";
dateTimePicker1.Size = new Size(250, 27); DateTimePickerData.Size = new Size(250, 27);
dateTimePicker1.TabIndex = 0; DateTimePickerData.TabIndex = 0;
// //
// label1 // label1
// //
@ -137,7 +137,7 @@
// //
// groupBoxMedicines // groupBoxMedicines
// //
groupBoxMedicines.Controls.Add(dataGridViewMedicines); groupBoxMedicines.Controls.Add(DataGridViewMedicines);
groupBoxMedicines.Location = new Point(12, 358); groupBoxMedicines.Location = new Point(12, 358);
groupBoxMedicines.Name = "groupBoxMedicines"; groupBoxMedicines.Name = "groupBoxMedicines";
groupBoxMedicines.Size = new Size(370, 197); groupBoxMedicines.Size = new Size(370, 197);
@ -145,22 +145,22 @@
groupBoxMedicines.TabStop = false; groupBoxMedicines.TabStop = false;
groupBoxMedicines.Text = "Лекарства"; groupBoxMedicines.Text = "Лекарства";
// //
// dataGridViewMedicines // DataGridViewMedicines
// //
dataGridViewMedicines.AllowUserToResizeColumns = false; DataGridViewMedicines.AllowUserToResizeColumns = false;
dataGridViewMedicines.AllowUserToResizeRows = false; DataGridViewMedicines.AllowUserToResizeRows = false;
dataGridViewMedicines.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; DataGridViewMedicines.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
dataGridViewMedicines.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; DataGridViewMedicines.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridViewMedicines.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; DataGridViewMedicines.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridViewMedicines.Columns.AddRange(new DataGridViewColumn[] { ColumnMedicine, ColumnQuantity }); DataGridViewMedicines.Columns.AddRange(new DataGridViewColumn[] { ColumnMedicine, ColumnQuantity });
dataGridViewMedicines.Location = new Point(3, 23); DataGridViewMedicines.Location = new Point(3, 23);
dataGridViewMedicines.MultiSelect = false; DataGridViewMedicines.MultiSelect = false;
dataGridViewMedicines.Name = "dataGridViewMedicines"; DataGridViewMedicines.Name = "DataGridViewMedicines";
dataGridViewMedicines.RowHeadersVisible = false; DataGridViewMedicines.RowHeadersVisible = false;
dataGridViewMedicines.RowHeadersWidth = 51; DataGridViewMedicines.RowHeadersWidth = 51;
dataGridViewMedicines.SelectionMode = DataGridViewSelectionMode.FullRowSelect; DataGridViewMedicines.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridViewMedicines.Size = new Size(364, 171); DataGridViewMedicines.Size = new Size(364, 171);
dataGridViewMedicines.TabIndex = 0; DataGridViewMedicines.TabIndex = 0;
// //
// ColumnMedicine // ColumnMedicine
// //
@ -191,19 +191,19 @@
Controls.Add(label3); Controls.Add(label3);
Controls.Add(label2); Controls.Add(label2);
Controls.Add(label1); Controls.Add(label1);
Controls.Add(dateTimePicker1); Controls.Add(DateTimePickerData);
Name = "FormVisit"; Name = "FormVisit";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "Запись на прием"; Text = "Запись на прием";
groupBoxMedicines.ResumeLayout(false); groupBoxMedicines.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridViewMedicines).EndInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewMedicines).EndInit();
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();
} }
#endregion #endregion
private DateTimePicker dateTimePicker1; private DateTimePicker DateTimePickerData;
private Label label1; private Label label1;
private Label label2; private Label label2;
private Label label3; private Label label3;
@ -214,7 +214,7 @@
private Button buttonSave; private Button buttonSave;
private Button buttonCancel; private Button buttonCancel;
private GroupBox groupBoxMedicines; private GroupBox groupBoxMedicines;
private DataGridView dataGridViewMedicines; private DataGridView DataGridViewMedicines;
private DataGridViewComboBoxColumn ColumnMedicine; private DataGridViewComboBoxColumn ColumnMedicine;
private DataGridViewTextBoxColumn ColumnQuantity; private DataGridViewTextBoxColumn ColumnQuantity;
} }

View File

@ -30,15 +30,15 @@ namespace ProjectPolyclinic.Forms
throw new InvalidOperationException("Визит с указанным идентификатором не найден."); throw new InvalidOperationException("Визит с указанным идентификатором не найден.");
} }
dateTimePicker1.Value = visit.Date; DateTimePickerData.Value = visit.Date;
comboBoxDiagnosis.SelectedValue = visit.DiagnosisId; comboBoxDiagnosis.SelectedValue = visit.DiagnosisId;
comboBoxPatient.SelectedValue = visit.PatientId; comboBoxPatient.SelectedValue = visit.PatientId;
comboBoxDoctor.SelectedValue = visit.DoctorId; comboBoxDoctor.SelectedValue = visit.DoctorId;
dataGridViewMedicines.Rows.Clear(); DataGridViewMedicines.Rows.Clear();
foreach (var medicineVisit in visit.MedicinesVisits) foreach (var medicineVisit in visit.MedicinesVisits)
{ {
dataGridViewMedicines.Rows.Add( DataGridViewMedicines.Rows.Add(
medicineVisit.MedicinesId, medicineVisit.MedicinesId,
medicineVisit.Quantity medicineVisit.Quantity
); );
@ -92,12 +92,12 @@ namespace ProjectPolyclinic.Forms
if (comboBoxDiagnosis.SelectedIndex < 0 || if (comboBoxDiagnosis.SelectedIndex < 0 ||
comboBoxPatient.SelectedIndex < 0 || comboBoxPatient.SelectedIndex < 0 ||
comboBoxDoctor.SelectedIndex < 0 || comboBoxDoctor.SelectedIndex < 0 ||
dataGridViewMedicines.RowCount < 1) DataGridViewMedicines.RowCount < 1)
{ {
throw new Exception("Имеются незаполненные поля."); throw new Exception("Имеются незаполненные поля.");
} }
if (!DateTime.TryParse(dateTimePicker1.Text, out var visitDate)) if (!DateTime.TryParse(DateTimePickerData.Text, out var visitDate))
{ {
throw new Exception("Неверный формат даты."); throw new Exception("Неверный формат даты.");
} }
@ -130,7 +130,7 @@ namespace ProjectPolyclinic.Forms
{ {
var list = new List<MedicinesVisit>(); var list = new List<MedicinesVisit>();
foreach (DataGridViewRow row in dataGridViewMedicines.Rows) foreach (DataGridViewRow row in DataGridViewMedicines.Rows)
{ {
if (row.Cells["ColumnMedicine"].Value == null || if (row.Cells["ColumnMedicine"].Value == null ||
row.Cells["ColumnQuantity"].Value == null) row.Cells["ColumnQuantity"].Value == null)

View File

@ -123,4 +123,10 @@
<metadata name="ColumnQuantity.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="ColumnQuantity.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="ColumnMedicine.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ColumnQuantity.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>

View File

@ -32,9 +32,9 @@
buttonUpd = new Button(); buttonUpd = new Button();
buttonDel = new Button(); buttonDel = new Button();
buttonAdd = new Button(); buttonAdd = new Button();
dataGridView1 = new DataGridView(); DataGridViewVisits = new DataGridView();
panel1.SuspendLayout(); panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewVisits).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// panel1 // panel1
@ -51,64 +51,65 @@
// buttonUpd // buttonUpd
// //
buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonUpd.Location = new Point(31, 266); buttonUpd.BackgroundImageLayout = ImageLayout.Stretch;
buttonUpd.Location = new Point(31, 282);
buttonUpd.Name = "buttonUpd"; buttonUpd.Name = "buttonUpd";
buttonUpd.Size = new Size(146, 102); buttonUpd.Size = new Size(146, 114);
buttonUpd.TabIndex = 2; buttonUpd.TabIndex = 2;
buttonUpd.Text = "Изменить";
buttonUpd.UseVisualStyleBackColor = true; buttonUpd.UseVisualStyleBackColor = true;
buttonUpd.Click += ButtonUpd_Click; buttonUpd.Click += ButtonUpd_Click;
// //
// buttonDel // buttonDel
// //
buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonDel.Location = new Point(31, 140); buttonDel.BackgroundImageLayout = ImageLayout.Stretch;
buttonDel.Location = new Point(31, 151);
buttonDel.Name = "buttonDel"; buttonDel.Name = "buttonDel";
buttonDel.Size = new Size(146, 91); buttonDel.Size = new Size(146, 109);
buttonDel.TabIndex = 1; buttonDel.TabIndex = 1;
buttonDel.Text = "Удалить";
buttonDel.UseVisualStyleBackColor = true; buttonDel.UseVisualStyleBackColor = true;
buttonDel.Click += ButtonDel_Click; buttonDel.Click += ButtonDel_Click;
// //
// buttonAdd // buttonAdd
// //
buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAdd.BackgroundImage = Properties.Resources.Fairytale_button_add1;
buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
buttonAdd.Location = new Point(31, 22); buttonAdd.Location = new Point(31, 22);
buttonAdd.Name = "buttonAdd"; buttonAdd.Name = "buttonAdd";
buttonAdd.Size = new Size(146, 86); buttonAdd.Size = new Size(146, 112);
buttonAdd.TabIndex = 0; buttonAdd.TabIndex = 0;
buttonAdd.Text = "Добавить";
buttonAdd.UseVisualStyleBackColor = true; buttonAdd.UseVisualStyleBackColor = true;
buttonAdd.Click += ButtonAdd_Click; buttonAdd.Click += ButtonAdd_Click;
// //
// dataGridView1 // DataGridViewVisits
// //
dataGridView1.AllowUserToAddRows = false; DataGridViewVisits.AllowUserToAddRows = false;
dataGridView1.AllowUserToDeleteRows = false; DataGridViewVisits.AllowUserToDeleteRows = false;
dataGridView1.AllowUserToResizeColumns = false; DataGridViewVisits.AllowUserToResizeColumns = false;
dataGridView1.AllowUserToResizeRows = false; DataGridViewVisits.AllowUserToResizeRows = false;
dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; DataGridViewVisits.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView1.Dock = DockStyle.Fill; DataGridViewVisits.Dock = DockStyle.Fill;
dataGridView1.Location = new Point(0, 0); DataGridViewVisits.Location = new Point(0, 0);
dataGridView1.Name = "dataGridView1"; DataGridViewVisits.Name = "DataGridViewVisits";
dataGridView1.ReadOnly = true; DataGridViewVisits.ReadOnly = true;
dataGridView1.RowHeadersWidth = 51; DataGridViewVisits.RowHeadersWidth = 51;
dataGridView1.Size = new Size(513, 443); DataGridViewVisits.Size = new Size(513, 443);
dataGridView1.TabIndex = 1; DataGridViewVisits.TabIndex = 1;
// //
// FormVisits // FormVisits
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(714, 443); ClientSize = new Size(714, 443);
Controls.Add(dataGridView1); Controls.Add(DataGridViewVisits);
Controls.Add(panel1); Controls.Add(panel1);
Name = "FormVisits"; Name = "FormVisits";
StartPosition = FormStartPosition.CenterParent; StartPosition = FormStartPosition.CenterParent;
Text = "Записи на прием"; Text = "Записи на прием";
Load += FormVisits_Load; Load += FormVisits_Load;
panel1.ResumeLayout(false); panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); ((System.ComponentModel.ISupportInitialize)DataGridViewVisits).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
@ -118,6 +119,6 @@
private Button buttonUpd; private Button buttonUpd;
private Button buttonDel; private Button buttonDel;
private Button buttonAdd; private Button buttonAdd;
private DataGridView dataGridView1; private DataGridView DataGridViewVisits;
} }
} }

View File

@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms
{ {
try try
{ {
dataGridView1.DataSource = _visitRepository.ReadVisit(); DataGridViewVisits.DataSource = _visitRepository.ReadVisit();
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms
private bool TryGetIdentifierFromSelectedRow(out int id) private bool TryGetIdentifierFromSelectedRow(out int id)
{ {
id = 0; id = 0;
if (dataGridView1.SelectedRows.Count < 1) if (DataGridViewVisits.SelectedRows.Count < 1)
{ {
MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false; return false;
} }
id = Convert.ToInt32(dataGridView1.SelectedRows[0].Cells["Id"].Value); id = Convert.ToInt32(DataGridViewVisits.SelectedRows[0].Cells["Id"].Value);
return true; return true;
} }
} }

View File

@ -73,9 +73,9 @@ namespace ProjectPolyclinic.Properties {
/// <summary> /// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary> /// </summary>
internal static System.Drawing.Bitmap Fairytale_button_add_svg { internal static System.Drawing.Bitmap Fairytale_button_add1 {
get { get {
object obj = ResourceManager.GetObject("Fairytale_button_add.svg", resourceCulture); object obj = ResourceManager.GetObject("Fairytale_button_add1", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
} }
} }
@ -83,9 +83,20 @@ namespace ProjectPolyclinic.Properties {
/// <summary> /// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary> /// </summary>
internal static System.Drawing.Bitmap Fairytale_button_add1 { internal static System.Drawing.Bitmap kisspng_computer_icons_transparency_image_editing_symbol_manage_svg_png_icon_free_download_171_77_onli_5d28d47b0152b7_3749987215629569230054 {
get { get {
object obj = ResourceManager.GetObject("Fairytale_button_add1", resourceCulture); object obj = ResourceManager.GetObject("kisspng-computer-icons-transparency-image-editing-symbol-manage-svg-png-icon-free" +
"-download-171-77-onli-5d28d47b0152b7.3749987215629569230054", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap trash_bin_circle_background_icon_free_vector {
get {
object obj = ResourceManager.GetObject("trash-bin-circle-background-icon-free-vector", resourceCulture);
return ((System.Drawing.Bitmap)(obj)); return ((System.Drawing.Bitmap)(obj));
} }
} }

View File

@ -121,16 +121,13 @@
<data name="c516ff9163fefeaa5974fc7c8855cd02" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="c516ff9163fefeaa5974fc7c8855cd02" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\c516ff9163fefeaa5974fc7c8855cd02.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\c516ff9163fefeaa5974fc7c8855cd02.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="unnamed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\unnamed1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Fairytale_button_add.svg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Fairytale_button_add.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Fairytale_button_add1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Fairytale_button_add1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Fairytale_button_add.svg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Fairytale_button_add.svg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="195-1956806_abort-delete-cancel-icon-cross-no-access-denied" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="trash-bin-circle-background-icon-free-vector" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\195-1956806_abort-delete-cancel-icon-cross-no-access-denied.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\trash-bin-circle-background-icon-free-vector.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="kisspng-computer-icons-transparency-image-editing-symbol-manage-svg-png-icon-free-download-171-77-onli-5d28d47b0152b7.3749987215629569230054" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\kisspng-computer-icons-transparency-image-editing-symbol-manage-svg-png-icon-free-download-171-77-onli-5d28d47b0152b7.3749987215629569230054.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 408 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB