diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDiagnoses.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDiagnoses.Designer.cs index 38da5fe..cbec9cf 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDiagnoses.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDiagnoses.Designer.cs @@ -32,9 +32,9 @@ buttonUpd = new Button(); buttonDel = new Button(); buttonAdd = new Button(); - dataGridViewDiagnoses = new DataGridView(); + DataGridViewDiagnoses = new DataGridView(); panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridViewDiagnoses).BeginInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewDiagnoses).BeginInit(); SuspendLayout(); // // panel1 @@ -50,61 +50,64 @@ // // 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.Size = new Size(116, 85); + buttonUpd.Size = new Size(116, 105); buttonUpd.TabIndex = 2; - buttonUpd.Text = "Изменить"; buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += buttonUpd_Click; // // 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.Size = new Size(116, 86); + buttonDel.Size = new Size(116, 104); buttonDel.TabIndex = 1; - buttonDel.Text = "Удалить"; buttonDel.UseVisualStyleBackColor = true; buttonDel.Click += buttonDel_Click; // // buttonAdd // + buttonAdd.BackgroundImage = Properties.Resources.Fairytale_button_add1; + buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; buttonAdd.Location = new Point(56, 26); buttonAdd.Name = "buttonAdd"; buttonAdd.Size = new Size(116, 91); buttonAdd.TabIndex = 0; - buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; buttonAdd.Click += buttonAdd_Click; // - // dataGridViewDiagnoses + // DataGridViewDiagnoses // - dataGridViewDiagnoses.AllowUserToAddRows = false; - dataGridViewDiagnoses.AllowUserToDeleteRows = false; - dataGridViewDiagnoses.AllowUserToResizeColumns = false; - dataGridViewDiagnoses.AllowUserToResizeRows = false; - dataGridViewDiagnoses.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewDiagnoses.Dock = DockStyle.Fill; - dataGridViewDiagnoses.Location = new Point(0, 0); - dataGridViewDiagnoses.Name = "dataGridViewDiagnoses"; - dataGridViewDiagnoses.ReadOnly = true; - dataGridViewDiagnoses.RowHeadersWidth = 51; - dataGridViewDiagnoses.Size = new Size(590, 450); - dataGridViewDiagnoses.TabIndex = 1; + DataGridViewDiagnoses.AllowUserToAddRows = false; + DataGridViewDiagnoses.AllowUserToDeleteRows = false; + DataGridViewDiagnoses.AllowUserToResizeColumns = false; + DataGridViewDiagnoses.AllowUserToResizeRows = false; + DataGridViewDiagnoses.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridViewDiagnoses.Dock = DockStyle.Fill; + DataGridViewDiagnoses.Location = new Point(0, 0); + DataGridViewDiagnoses.Name = "DataGridViewDiagnoses"; + DataGridViewDiagnoses.ReadOnly = true; + DataGridViewDiagnoses.RowHeadersWidth = 51; + DataGridViewDiagnoses.Size = new Size(590, 450); + DataGridViewDiagnoses.TabIndex = 1; // // FormDiagnoses // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); - Controls.Add(dataGridViewDiagnoses); + Controls.Add(DataGridViewDiagnoses); Controls.Add(panel1); Name = "FormDiagnoses"; Text = "Дигнозы"; Load += FormDiagnoses_Load; panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridViewDiagnoses).EndInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewDiagnoses).EndInit(); ResumeLayout(false); } @@ -114,6 +117,6 @@ private Button buttonUpd; private Button buttonDel; private Button buttonAdd; - private DataGridView dataGridViewDiagnoses; + private DataGridView DataGridViewDiagnoses; } } \ No newline at end of file diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDiagnoses.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDiagnoses.cs index 1e49830..9d80b66 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDiagnoses.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDiagnoses.cs @@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms { try { - dataGridViewDiagnoses.DataSource = _diagnosisRepository.ReadDiagnosis(); + DataGridViewDiagnoses.DataSource = _diagnosisRepository.ReadDiagnosis(); } catch (Exception ex) { @@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; - if (dataGridViewDiagnoses.SelectedRows.Count < 1) + if (DataGridViewDiagnoses.SelectedRows.Count < 1) { MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } - id = Convert.ToInt32(dataGridViewDiagnoses.SelectedRows[0].Cells["Id"].Value); + id = Convert.ToInt32(DataGridViewDiagnoses.SelectedRows[0].Cells["Id"].Value); return true; } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctors.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctors.Designer.cs index 45dbb44..9735836 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctors.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctors.Designer.cs @@ -32,9 +32,9 @@ buttonUpd = new Button(); buttonDel = new Button(); buttonAdd = new Button(); - dataGridViewDoctors = new DataGridView(); + DataGridViewDoctors = new DataGridView(); panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridViewDoctors).BeginInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewDoctors).BeginInit(); SuspendLayout(); // // panel1 @@ -51,75 +51,78 @@ // buttonUpd // 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.Size = new Size(119, 85); + buttonUpd.Size = new Size(119, 101); buttonUpd.TabIndex = 2; - buttonUpd.Text = "Изменить"; buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += buttonUpd_Click; // // buttonDel // 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.Name = "buttonDel"; - buttonDel.Size = new Size(119, 88); + buttonDel.Size = new Size(119, 100); buttonDel.TabIndex = 1; - buttonDel.Text = "Удалить"; buttonDel.UseVisualStyleBackColor = true; buttonDel.Click += buttonDel_Click; // // buttonAdd // 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.Name = "buttonAdd"; - buttonAdd.Size = new Size(119, 85); + buttonAdd.Size = new Size(119, 94); buttonAdd.TabIndex = 0; - buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; buttonAdd.Click += buttonAdd_Click; // - // dataGridViewDoctors + // DataGridViewDoctors // - dataGridViewDoctors.AllowUserToAddRows = false; - dataGridViewDoctors.AllowUserToDeleteRows = false; - dataGridViewDoctors.AllowUserToResizeColumns = false; - dataGridViewDoctors.AllowUserToResizeRows = false; - dataGridViewDoctors.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridViewDoctors.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewDoctors.Dock = DockStyle.Fill; - dataGridViewDoctors.Location = new Point(0, 0); - dataGridViewDoctors.MultiSelect = false; - dataGridViewDoctors.Name = "dataGridViewDoctors"; - dataGridViewDoctors.ReadOnly = true; - dataGridViewDoctors.RowHeadersVisible = false; - dataGridViewDoctors.RowHeadersWidth = 51; - dataGridViewDoctors.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridViewDoctors.Size = new Size(603, 450); - dataGridViewDoctors.TabIndex = 1; + DataGridViewDoctors.AllowUserToAddRows = false; + DataGridViewDoctors.AllowUserToDeleteRows = false; + DataGridViewDoctors.AllowUserToResizeColumns = false; + DataGridViewDoctors.AllowUserToResizeRows = false; + DataGridViewDoctors.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + DataGridViewDoctors.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridViewDoctors.Dock = DockStyle.Fill; + DataGridViewDoctors.Location = new Point(0, 0); + DataGridViewDoctors.MultiSelect = false; + DataGridViewDoctors.Name = "DataGridViewDoctors"; + DataGridViewDoctors.ReadOnly = true; + DataGridViewDoctors.RowHeadersVisible = false; + DataGridViewDoctors.RowHeadersWidth = 51; + DataGridViewDoctors.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + DataGridViewDoctors.Size = new Size(603, 450); + DataGridViewDoctors.TabIndex = 1; // // FormDoctors // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); - Controls.Add(dataGridViewDoctors); + Controls.Add(DataGridViewDoctors); Controls.Add(panel1); Name = "FormDoctors"; StartPosition = FormStartPosition.CenterParent; Text = "Доктора"; Load += FormDoctors_Load; panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridViewDoctors).EndInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewDoctors).EndInit(); ResumeLayout(false); } #endregion private Panel panel1; - private DataGridView dataGridViewDoctors; + private DataGridView DataGridViewDoctors; private Button buttonUpd; private Button buttonDel; private Button buttonAdd; diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctors.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctors.cs index 0dad5a3..db65840 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctors.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctors.cs @@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms { try { - dataGridViewDoctors.DataSource = _doctorRepository.ReadDoctor(); + DataGridViewDoctors.DataSource = _doctorRepository.ReadDoctor(); } catch (Exception ex) { @@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; - if (dataGridViewDoctors.SelectedRows.Count < 1) + if (DataGridViewDoctors.SelectedRows.Count < 1) { MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } - id = Convert.ToInt32(dataGridViewDoctors.SelectedRows[0].Cells["Id"].Value); + id = Convert.ToInt32(DataGridViewDoctors.SelectedRows[0].Cells["Id"].Value); return true; } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicines.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicines.Designer.cs index 2c87ced..712cc4c 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicines.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicines.Designer.cs @@ -32,9 +32,9 @@ buttonUpd = new Button(); buttonDel = new Button(); buttonAdd = new Button(); - dataGridViewMedicines = new DataGridView(); + DataGridViewMedicines = new DataGridView(); panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridViewMedicines).BeginInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewMedicines).BeginInit(); SuspendLayout(); // // panel1 @@ -51,71 +51,76 @@ // buttonUpd // 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.Name = "buttonUpd"; - buttonUpd.Size = new Size(118, 83); + buttonUpd.Size = new Size(118, 105); buttonUpd.TabIndex = 2; - buttonUpd.Text = "Изменить"; buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += buttonUpd_Click; // // buttonDel // 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.Name = "buttonDel"; buttonDel.Size = new Size(118, 85); buttonDel.TabIndex = 1; - buttonDel.Text = "Удалить"; buttonDel.UseVisualStyleBackColor = true; buttonDel.Click += buttonDel_Click; // // buttonAdd // 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.Name = "buttonAdd"; buttonAdd.Size = new Size(118, 86); buttonAdd.TabIndex = 0; - buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; buttonAdd.Click += buttonAdd_Click; // - // dataGridViewMedicines + // DataGridViewMedicines // - dataGridViewMedicines.AllowUserToAddRows = false; - dataGridViewMedicines.AllowUserToDeleteRows = false; - dataGridViewMedicines.AllowUserToResizeColumns = false; - dataGridViewMedicines.AllowUserToResizeRows = false; - dataGridViewMedicines.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewMedicines.Dock = DockStyle.Fill; - dataGridViewMedicines.Location = new Point(0, 0); - dataGridViewMedicines.Name = "dataGridViewMedicines"; - dataGridViewMedicines.ReadOnly = true; - dataGridViewMedicines.RowHeadersWidth = 51; - dataGridViewMedicines.Size = new Size(565, 424); - dataGridViewMedicines.TabIndex = 1; + DataGridViewMedicines.AllowUserToAddRows = false; + DataGridViewMedicines.AllowUserToDeleteRows = false; + DataGridViewMedicines.AllowUserToResizeColumns = false; + DataGridViewMedicines.AllowUserToResizeRows = false; + DataGridViewMedicines.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridViewMedicines.Dock = DockStyle.Fill; + DataGridViewMedicines.Location = new Point(0, 0); + DataGridViewMedicines.Name = "DataGridViewMedicines"; + DataGridViewMedicines.ReadOnly = true; + DataGridViewMedicines.RowHeadersWidth = 51; + DataGridViewMedicines.Size = new Size(565, 424); + DataGridViewMedicines.TabIndex = 1; // // FormMedicines // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(746, 424); - Controls.Add(dataGridViewMedicines); + Controls.Add(DataGridViewMedicines); Controls.Add(panel1); Name = "FormMedicines"; StartPosition = FormStartPosition.CenterParent; Text = "Лекарства"; Load += FormMedicines_Load; panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridViewMedicines).EndInit(); + panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)DataGridViewMedicines).EndInit(); ResumeLayout(false); } #endregion private Panel panel1; - private DataGridView dataGridViewMedicines; + private DataGridView DataGridViewMedicines; private Button buttonUpd; private Button buttonDel; private Button buttonAdd; diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicines.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicines.cs index 5f59079..fa121b3 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicines.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicines.cs @@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms { try { - dataGridViewMedicines.DataSource = _medicinesRepository.ReadMedicines(); + DataGridViewMedicines.DataSource = _medicinesRepository.ReadMedicines(); } catch (Exception ex) { @@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; - if (dataGridViewMedicines.SelectedRows.Count < 1) + if (DataGridViewMedicines.SelectedRows.Count < 1) { MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } - id = Convert.ToInt32(dataGridViewMedicines.SelectedRows[0].Cells["Id"].Value); + id = Convert.ToInt32(DataGridViewMedicines.SelectedRows[0].Cells["Id"].Value); return true; } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMoving.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMoving.Designer.cs index b0bd260..843112e 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMoving.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMoving.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - dateTimePickerData = new DateTimePicker(); + DateTimePickerData = new DateTimePicker(); label1 = new Label(); buttonSave = new Button(); buttonCancel = new Button(); @@ -38,12 +38,12 @@ comboBoxMedicinesStatement = new ComboBox(); SuspendLayout(); // - // dateTimePickerData + // DateTimePickerData // - dateTimePickerData.Location = new Point(164, 24); - dateTimePickerData.Name = "dateTimePickerData"; - dateTimePickerData.Size = new Size(245, 27); - dateTimePickerData.TabIndex = 0; + DateTimePickerData.Location = new Point(164, 24); + DateTimePickerData.Name = "DateTimePickerData"; + DateTimePickerData.Size = new Size(245, 27); + DateTimePickerData.TabIndex = 0; // // label1 // @@ -122,7 +122,7 @@ Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(label1); - Controls.Add(dateTimePickerData); + Controls.Add(DateTimePickerData); Name = "FormMedicinesMoving"; StartPosition = FormStartPosition.CenterParent; Text = "Перемещение лекарств"; @@ -132,7 +132,7 @@ #endregion - private DateTimePicker dateTimePickerData; + private DateTimePicker DateTimePickerData; private Label label1; private Button buttonSave; private Button buttonCancel; diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMoving.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMoving.cs index 9890820..4e0d956 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMoving.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMoving.cs @@ -26,7 +26,7 @@ namespace ProjectPolyclinic.Forms throw new InvalidOperationException("Операция с указанным идентификатором не найдена."); } - dateTimePickerData.Value = medicinesMoving.Date; + DateTimePickerData.Value = medicinesMoving.Date; comboBoxName.SelectedValue = medicinesMoving.MedicinesId; comboBoxMedicinesStatement.SelectedValue = medicinesMoving.MedicinesStatement.FirstOrDefault(); @@ -64,7 +64,7 @@ namespace ProjectPolyclinic.Forms throw new Exception("Имеются незаполненные поля."); } - if (!DateTime.TryParse(dateTimePickerData.Text, out var operationDate)) + if (!DateTime.TryParse(DateTimePickerData.Text, out var operationDate)) { throw new Exception("Неверный формат даты."); } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMovings.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMovings.Designer.cs index 11f1338..4f6b076 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMovings.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMovings.Designer.cs @@ -32,9 +32,9 @@ buttonUpd = new Button(); buttonDel = new Button(); buttonAdd = new Button(); - dataGridViewMedicinesMovings = new DataGridView(); + DataGridViewMedicinesMovings = new DataGridView(); panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridViewMedicinesMovings).BeginInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewMedicinesMovings).BeginInit(); SuspendLayout(); // // panel1 @@ -50,71 +50,74 @@ // // 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.Size = new Size(133, 78); + buttonUpd.Size = new Size(133, 97); buttonUpd.TabIndex = 2; - buttonUpd.Text = "Изменить"; buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += ButtonUpd_Click; // // 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.Size = new Size(133, 72); + buttonDel.Size = new Size(133, 94); buttonDel.TabIndex = 1; - buttonDel.Text = "Удалить"; buttonDel.UseVisualStyleBackColor = true; buttonDel.Click += ButtonDel_Click; // // buttonAdd // + buttonAdd.BackgroundImage = Properties.Resources.Fairytale_button_add1; + buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; buttonAdd.Location = new Point(24, 12); buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(133, 76); + buttonAdd.Size = new Size(133, 98); buttonAdd.TabIndex = 0; - buttonAdd.Text = "Создать"; buttonAdd.UseVisualStyleBackColor = true; buttonAdd.Click += ButtonAdd_Click; // - // dataGridViewMedicinesMovings + // DataGridViewMedicinesMovings // - dataGridViewMedicinesMovings.AllowUserToAddRows = false; - dataGridViewMedicinesMovings.AllowUserToDeleteRows = false; - dataGridViewMedicinesMovings.AllowUserToResizeColumns = false; - dataGridViewMedicinesMovings.AllowUserToResizeRows = false; - dataGridViewMedicinesMovings.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridViewMedicinesMovings.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewMedicinesMovings.Dock = DockStyle.Fill; - dataGridViewMedicinesMovings.Location = new Point(0, 0); - dataGridViewMedicinesMovings.MultiSelect = false; - dataGridViewMedicinesMovings.Name = "dataGridViewMedicinesMovings"; - dataGridViewMedicinesMovings.ReadOnly = true; - dataGridViewMedicinesMovings.RowHeadersWidth = 51; - dataGridViewMedicinesMovings.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridViewMedicinesMovings.Size = new Size(466, 356); - dataGridViewMedicinesMovings.TabIndex = 1; - dataGridViewMedicinesMovings.Click += FormMedicinesMovings_Load; + DataGridViewMedicinesMovings.AllowUserToAddRows = false; + DataGridViewMedicinesMovings.AllowUserToDeleteRows = false; + DataGridViewMedicinesMovings.AllowUserToResizeColumns = false; + DataGridViewMedicinesMovings.AllowUserToResizeRows = false; + DataGridViewMedicinesMovings.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + DataGridViewMedicinesMovings.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridViewMedicinesMovings.Dock = DockStyle.Fill; + DataGridViewMedicinesMovings.Location = new Point(0, 0); + DataGridViewMedicinesMovings.MultiSelect = false; + DataGridViewMedicinesMovings.Name = "DataGridViewMedicinesMovings"; + DataGridViewMedicinesMovings.ReadOnly = true; + DataGridViewMedicinesMovings.RowHeadersWidth = 51; + DataGridViewMedicinesMovings.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + DataGridViewMedicinesMovings.Size = new Size(466, 356); + DataGridViewMedicinesMovings.TabIndex = 1; // // FormMedicinesMovings // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(652, 356); - Controls.Add(dataGridViewMedicinesMovings); + Controls.Add(DataGridViewMedicinesMovings); Controls.Add(panel1); Name = "FormMedicinesMovings"; Text = "Перемещения лекарств"; + Load += FormMedicinesMovings_Load; panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridViewMedicinesMovings).EndInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewMedicinesMovings).EndInit(); ResumeLayout(false); } #endregion private Panel panel1; - private DataGridView dataGridViewMedicinesMovings; + private DataGridView DataGridViewMedicinesMovings; private Button buttonUpd; private Button buttonDel; private Button buttonAdd; diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMovings.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMovings.cs index 7e67091..1d84a22 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMovings.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormMedicinesMovings.cs @@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms { try { - dataGridViewMedicinesMovings.DataSource = _medicinesMovingRepository.ReadMedicinesMovings(); + DataGridViewMedicinesMovings.DataSource = _medicinesMovingRepository.ReadMedicinesMovings(); } catch (Exception ex) { @@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; - if (dataGridViewMedicinesMovings.SelectedRows.Count < 1) + if (DataGridViewMedicinesMovings.SelectedRows.Count < 1) { MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } - id = Convert.ToInt32(dataGridViewMedicinesMovings.SelectedRows[0].Cells["Id"].Value); + id = Convert.ToInt32(DataGridViewMedicinesMovings.SelectedRows[0].Cells["Id"].Value); return true; } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.Designer.cs index d94d73c..b5500af 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.Designer.cs @@ -39,7 +39,7 @@ textBoxMedicalCardNumber = new MaskedTextBox(); button1 = new Button(); button2 = new Button(); - dateTimePicker1 = new DateTimePicker(); + DateTimePickerDate = new DateTimePicker(); SuspendLayout(); // // label1 @@ -139,19 +139,19 @@ button2.UseVisualStyleBackColor = true; button2.Click += ButtonCancel_Click; // - // dateTimePicker1 + // DateTimePickerDate // - dateTimePicker1.Location = new Point(137, 194); - dateTimePicker1.Name = "dateTimePicker1"; - dateTimePicker1.Size = new Size(201, 27); - dateTimePicker1.TabIndex = 13; + DateTimePickerDate.Location = new Point(137, 194); + DateTimePickerDate.Name = "DateTimePickerDate"; + DateTimePickerDate.Size = new Size(201, 27); + DateTimePickerDate.TabIndex = 13; // // FormPatient // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(350, 463); - Controls.Add(dateTimePicker1); + Controls.Add(DateTimePickerDate); Controls.Add(button2); Controls.Add(button1); Controls.Add(textBoxMedicalCardNumber); @@ -177,13 +177,12 @@ private Label label2; private TextBox textBoxLastName; private Label label3; - private MaskedTextBox dateTimePickerBirthDate; private TextBox textBoxAddress; private Label label4; private Label label5; private MaskedTextBox textBoxMedicalCardNumber; private Button button1; private Button button2; - private DateTimePicker dateTimePicker1; + private DateTimePicker DateTimePickerDate; } } \ No newline at end of file diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.cs index 9359004..5464c16 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatient.cs @@ -21,7 +21,7 @@ namespace ProjectPolyclinic.Forms } textBoxFirstName.Text = patient.FirstName; textBoxLastName.Text = patient.LastName; - dateTimePicker1.Value = patient.BirthDate; + DateTimePickerDate.Value = patient.BirthDate; textBoxAddress.Text = patient.Address; textBoxMedicalCardNumber.Text = patient.MedicalCardNumber.ToString(); _patientId = value; @@ -39,8 +39,8 @@ namespace ProjectPolyclinic.Forms InitializeComponent(); _patientRepository = patientRepository ?? throw new ArgumentNullException(nameof(patientRepository)); - dateTimePicker1.MaxDate = DateTime.Today; - dateTimePicker1.MinDate = new DateTime(1900, 1, 1); + DateTimePickerDate.MaxDate = DateTime.Today; + DateTimePickerDate.MinDate = new DateTime(1900, 1, 1); } private void ButtonSave_Click(object sender, EventArgs e) @@ -55,7 +55,7 @@ namespace ProjectPolyclinic.Forms throw new Exception("Имеются незаполненные поля"); } - var birthDate = dateTimePicker1.Value; + var birthDate = DateTimePickerDate.Value; if (_patientId.HasValue) { diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.Designer.cs index 02092b3..ee75a19 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.Designer.cs @@ -33,10 +33,10 @@ ButtonDel = new Button(); ButtonAdd = new Button(); dataGridViewData = new DataGridView(); - dataGridView1 = new DataGridView(); + DataGridViewPatients = new DataGridView(); panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewPatients).BeginInit(); SuspendLayout(); // // panel1 @@ -53,34 +53,38 @@ // ButtonUpd // 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.Name = "ButtonUpd"; - ButtonUpd.Size = new Size(124, 78); + ButtonUpd.Size = new Size(124, 101); ButtonUpd.TabIndex = 2; - ButtonUpd.Text = "Изменить"; ButtonUpd.UseVisualStyleBackColor = true; ButtonUpd.Click += ButtonUpd_Click; // // ButtonDel // 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.Name = "ButtonDel"; - ButtonDel.Size = new Size(124, 81); + ButtonDel.Size = new Size(124, 98); ButtonDel.TabIndex = 1; - ButtonDel.Text = "Удалить"; - ButtonDel.UseVisualStyleBackColor = true; + ButtonDel.UseVisualStyleBackColor = false; ButtonDel.Click += ButtonDel_Click; // // ButtonAdd // 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.Name = "ButtonAdd"; - ButtonAdd.Size = new Size(124, 75); + ButtonAdd.Size = new Size(124, 91); ButtonAdd.TabIndex = 0; - ButtonAdd.Text = "Добавить"; + ButtonAdd.TextAlign = ContentAlignment.BottomLeft; ButtonAdd.UseVisualStyleBackColor = true; ButtonAdd.Click += ButtonAdd_Click; // @@ -103,31 +107,31 @@ dataGridViewData.Size = new Size(564, 450); dataGridViewData.TabIndex = 1; // - // dataGridView1 + // DataGridViewPatients // - dataGridView1.AllowUserToAddRows = false; - dataGridView1.AllowUserToDeleteRows = false; - dataGridView1.AllowUserToResizeColumns = false; - dataGridView1.AllowUserToResizeRows = false; - dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Dock = DockStyle.Fill; - dataGridView1.Location = new Point(0, 0); - dataGridView1.MultiSelect = false; - dataGridView1.Name = "dataGridView1"; - dataGridView1.ReadOnly = true; - dataGridView1.RowHeadersVisible = false; - dataGridView1.RowHeadersWidth = 51; - dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView1.Size = new Size(564, 450); - dataGridView1.TabIndex = 2; + DataGridViewPatients.AllowUserToAddRows = false; + DataGridViewPatients.AllowUserToDeleteRows = false; + DataGridViewPatients.AllowUserToResizeColumns = false; + DataGridViewPatients.AllowUserToResizeRows = false; + DataGridViewPatients.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + DataGridViewPatients.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridViewPatients.Dock = DockStyle.Fill; + DataGridViewPatients.Location = new Point(0, 0); + DataGridViewPatients.MultiSelect = false; + DataGridViewPatients.Name = "DataGridViewPatients"; + DataGridViewPatients.ReadOnly = true; + DataGridViewPatients.RowHeadersVisible = false; + DataGridViewPatients.RowHeadersWidth = 51; + DataGridViewPatients.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + DataGridViewPatients.Size = new Size(564, 450); + DataGridViewPatients.TabIndex = 2; // // FormPatients // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(742, 450); - Controls.Add(dataGridView1); + Controls.Add(DataGridViewPatients); Controls.Add(dataGridViewData); Controls.Add(panel1); Name = "FormPatients"; @@ -136,7 +140,7 @@ Load += FormPatients_Load; panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewPatients).EndInit(); ResumeLayout(false); } @@ -147,6 +151,6 @@ private Button ButtonDel; private Button ButtonAdd; private DataGridView dataGridViewData; - private DataGridView dataGridView1; + private DataGridView DataGridViewPatients; } } \ No newline at end of file diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs index 19377d1..bc5a198 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormPatients.cs @@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms { try { - dataGridView1.DataSource = _patientRepository.ReadPatient(); + DataGridViewPatients.DataSource = _patientRepository.ReadPatient(); } catch (Exception ex) { @@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; - if (dataGridView1.SelectedRows.Count < 1) + if (DataGridViewPatients.SelectedRows.Count < 1) { MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } - id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value); + id = Convert.ToInt32(DataGridViewPatients.SelectedRows[0].Cells["Id"].Value); return true; } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.Designer.cs index 5a929e3..eaa79d2 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - dateTimePicker1 = new DateTimePicker(); + DateTimePickerData = new DateTimePicker(); label1 = new Label(); label2 = new Label(); label3 = new Label(); @@ -39,19 +39,19 @@ buttonSave = new Button(); buttonCancel = new Button(); groupBoxMedicines = new GroupBox(); - dataGridViewMedicines = new DataGridView(); + DataGridViewMedicines = new DataGridView(); ColumnMedicine = new DataGridViewComboBoxColumn(); ColumnQuantity = new DataGridViewTextBoxColumn(); groupBoxMedicines.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridViewMedicines).BeginInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewMedicines).BeginInit(); SuspendLayout(); // - // dateTimePicker1 + // DateTimePickerData // - dateTimePicker1.Location = new Point(132, 24); - dateTimePicker1.Name = "dateTimePicker1"; - dateTimePicker1.Size = new Size(250, 27); - dateTimePicker1.TabIndex = 0; + DateTimePickerData.Location = new Point(132, 24); + DateTimePickerData.Name = "DateTimePickerData"; + DateTimePickerData.Size = new Size(250, 27); + DateTimePickerData.TabIndex = 0; // // label1 // @@ -137,7 +137,7 @@ // // groupBoxMedicines // - groupBoxMedicines.Controls.Add(dataGridViewMedicines); + groupBoxMedicines.Controls.Add(DataGridViewMedicines); groupBoxMedicines.Location = new Point(12, 358); groupBoxMedicines.Name = "groupBoxMedicines"; groupBoxMedicines.Size = new Size(370, 197); @@ -145,22 +145,22 @@ groupBoxMedicines.TabStop = false; groupBoxMedicines.Text = "Лекарства"; // - // dataGridViewMedicines + // DataGridViewMedicines // - dataGridViewMedicines.AllowUserToResizeColumns = false; - dataGridViewMedicines.AllowUserToResizeRows = false; - dataGridViewMedicines.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - dataGridViewMedicines.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridViewMedicines.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewMedicines.Columns.AddRange(new DataGridViewColumn[] { ColumnMedicine, ColumnQuantity }); - dataGridViewMedicines.Location = new Point(3, 23); - dataGridViewMedicines.MultiSelect = false; - dataGridViewMedicines.Name = "dataGridViewMedicines"; - dataGridViewMedicines.RowHeadersVisible = false; - dataGridViewMedicines.RowHeadersWidth = 51; - dataGridViewMedicines.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridViewMedicines.Size = new Size(364, 171); - dataGridViewMedicines.TabIndex = 0; + DataGridViewMedicines.AllowUserToResizeColumns = false; + DataGridViewMedicines.AllowUserToResizeRows = false; + DataGridViewMedicines.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + DataGridViewMedicines.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + DataGridViewMedicines.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridViewMedicines.Columns.AddRange(new DataGridViewColumn[] { ColumnMedicine, ColumnQuantity }); + DataGridViewMedicines.Location = new Point(3, 23); + DataGridViewMedicines.MultiSelect = false; + DataGridViewMedicines.Name = "DataGridViewMedicines"; + DataGridViewMedicines.RowHeadersVisible = false; + DataGridViewMedicines.RowHeadersWidth = 51; + DataGridViewMedicines.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + DataGridViewMedicines.Size = new Size(364, 171); + DataGridViewMedicines.TabIndex = 0; // // ColumnMedicine // @@ -191,19 +191,19 @@ Controls.Add(label3); Controls.Add(label2); Controls.Add(label1); - Controls.Add(dateTimePicker1); + Controls.Add(DateTimePickerData); Name = "FormVisit"; StartPosition = FormStartPosition.CenterParent; Text = "Запись на прием"; groupBoxMedicines.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridViewMedicines).EndInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewMedicines).EndInit(); ResumeLayout(false); PerformLayout(); } #endregion - private DateTimePicker dateTimePicker1; + private DateTimePicker DateTimePickerData; private Label label1; private Label label2; private Label label3; @@ -214,7 +214,7 @@ private Button buttonSave; private Button buttonCancel; private GroupBox groupBoxMedicines; - private DataGridView dataGridViewMedicines; + private DataGridView DataGridViewMedicines; private DataGridViewComboBoxColumn ColumnMedicine; private DataGridViewTextBoxColumn ColumnQuantity; } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.cs index 7ff2bef..4a79418 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.cs @@ -30,15 +30,15 @@ namespace ProjectPolyclinic.Forms throw new InvalidOperationException("Визит с указанным идентификатором не найден."); } - dateTimePicker1.Value = visit.Date; + DateTimePickerData.Value = visit.Date; comboBoxDiagnosis.SelectedValue = visit.DiagnosisId; comboBoxPatient.SelectedValue = visit.PatientId; comboBoxDoctor.SelectedValue = visit.DoctorId; - dataGridViewMedicines.Rows.Clear(); + DataGridViewMedicines.Rows.Clear(); foreach (var medicineVisit in visit.MedicinesVisits) { - dataGridViewMedicines.Rows.Add( + DataGridViewMedicines.Rows.Add( medicineVisit.MedicinesId, medicineVisit.Quantity ); @@ -92,12 +92,12 @@ namespace ProjectPolyclinic.Forms if (comboBoxDiagnosis.SelectedIndex < 0 || comboBoxPatient.SelectedIndex < 0 || comboBoxDoctor.SelectedIndex < 0 || - dataGridViewMedicines.RowCount < 1) + DataGridViewMedicines.RowCount < 1) { throw new Exception("Имеются незаполненные поля."); } - if (!DateTime.TryParse(dateTimePicker1.Text, out var visitDate)) + if (!DateTime.TryParse(DateTimePickerData.Text, out var visitDate)) { throw new Exception("Неверный формат даты."); } @@ -130,7 +130,7 @@ namespace ProjectPolyclinic.Forms { var list = new List(); - foreach (DataGridViewRow row in dataGridViewMedicines.Rows) + foreach (DataGridViewRow row in DataGridViewMedicines.Rows) { if (row.Cells["ColumnMedicine"].Value == null || row.Cells["ColumnQuantity"].Value == null) diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.resx b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.resx index a1bf26f..b0cdbeb 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.resx +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisit.resx @@ -123,4 +123,10 @@ True + + True + + + True + \ No newline at end of file diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisits.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisits.Designer.cs index f79fa5f..b061ebe 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisits.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisits.Designer.cs @@ -32,9 +32,9 @@ buttonUpd = new Button(); buttonDel = new Button(); buttonAdd = new Button(); - dataGridView1 = new DataGridView(); + DataGridViewVisits = new DataGridView(); panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewVisits).BeginInit(); SuspendLayout(); // // panel1 @@ -51,64 +51,65 @@ // buttonUpd // 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.Size = new Size(146, 102); + buttonUpd.Size = new Size(146, 114); buttonUpd.TabIndex = 2; - buttonUpd.Text = "Изменить"; buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += ButtonUpd_Click; // // buttonDel // 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.Size = new Size(146, 91); + buttonDel.Size = new Size(146, 109); buttonDel.TabIndex = 1; - buttonDel.Text = "Удалить"; buttonDel.UseVisualStyleBackColor = true; buttonDel.Click += ButtonDel_Click; // // buttonAdd // 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.Name = "buttonAdd"; - buttonAdd.Size = new Size(146, 86); + buttonAdd.Size = new Size(146, 112); buttonAdd.TabIndex = 0; - buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; buttonAdd.Click += ButtonAdd_Click; // - // dataGridView1 + // DataGridViewVisits // - dataGridView1.AllowUserToAddRows = false; - dataGridView1.AllowUserToDeleteRows = false; - dataGridView1.AllowUserToResizeColumns = false; - dataGridView1.AllowUserToResizeRows = false; - dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Dock = DockStyle.Fill; - dataGridView1.Location = new Point(0, 0); - dataGridView1.Name = "dataGridView1"; - dataGridView1.ReadOnly = true; - dataGridView1.RowHeadersWidth = 51; - dataGridView1.Size = new Size(513, 443); - dataGridView1.TabIndex = 1; + DataGridViewVisits.AllowUserToAddRows = false; + DataGridViewVisits.AllowUserToDeleteRows = false; + DataGridViewVisits.AllowUserToResizeColumns = false; + DataGridViewVisits.AllowUserToResizeRows = false; + DataGridViewVisits.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridViewVisits.Dock = DockStyle.Fill; + DataGridViewVisits.Location = new Point(0, 0); + DataGridViewVisits.Name = "DataGridViewVisits"; + DataGridViewVisits.ReadOnly = true; + DataGridViewVisits.RowHeadersWidth = 51; + DataGridViewVisits.Size = new Size(513, 443); + DataGridViewVisits.TabIndex = 1; // // FormVisits // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(714, 443); - Controls.Add(dataGridView1); + Controls.Add(DataGridViewVisits); Controls.Add(panel1); Name = "FormVisits"; StartPosition = FormStartPosition.CenterParent; Text = "Записи на прием"; Load += FormVisits_Load; panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ((System.ComponentModel.ISupportInitialize)DataGridViewVisits).EndInit(); ResumeLayout(false); } @@ -118,6 +119,6 @@ private Button buttonUpd; private Button buttonDel; private Button buttonAdd; - private DataGridView dataGridView1; + private DataGridView DataGridViewVisits; } } \ No newline at end of file diff --git a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisits.cs b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisits.cs index 910605a..a2f50ed 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisits.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisits.cs @@ -84,7 +84,7 @@ namespace ProjectPolyclinic.Forms { try { - dataGridView1.DataSource = _visitRepository.ReadVisit(); + DataGridViewVisits.DataSource = _visitRepository.ReadVisit(); } catch (Exception ex) { @@ -95,12 +95,12 @@ namespace ProjectPolyclinic.Forms private bool TryGetIdentifierFromSelectedRow(out int id) { id = 0; - if (dataGridView1.SelectedRows.Count < 1) + if (DataGridViewVisits.SelectedRows.Count < 1) { MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return false; } - id = Convert.ToInt32(dataGridView1.SelectedRows[0].Cells["Id"].Value); + id = Convert.ToInt32(DataGridViewVisits.SelectedRows[0].Cells["Id"].Value); return true; } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Properties/Resources.Designer.cs b/ProjectPolyclinic/ProjectPolyclinic/Properties/Resources.Designer.cs index 0036aeb..e7dc0f9 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Properties/Resources.Designer.cs +++ b/ProjectPolyclinic/ProjectPolyclinic/Properties/Resources.Designer.cs @@ -73,9 +73,9 @@ namespace ProjectPolyclinic.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Fairytale_button_add_svg { + internal static System.Drawing.Bitmap Fairytale_button_add1 { get { - object obj = ResourceManager.GetObject("Fairytale_button_add.svg", resourceCulture); + object obj = ResourceManager.GetObject("Fairytale_button_add1", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -83,9 +83,20 @@ namespace ProjectPolyclinic.Properties { /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// - 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 { - 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)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + 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)); } } diff --git a/ProjectPolyclinic/ProjectPolyclinic/Properties/Resources.resx b/ProjectPolyclinic/ProjectPolyclinic/Properties/Resources.resx index 181f258..d8a2011 100644 --- a/ProjectPolyclinic/ProjectPolyclinic/Properties/Resources.resx +++ b/ProjectPolyclinic/ProjectPolyclinic/Properties/Resources.resx @@ -121,16 +121,13 @@ ..\Resources\c516ff9163fefeaa5974fc7c8855cd02.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\unnamed1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Fairytale_button_add.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Fairytale_button_add.svg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\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 + + ..\Resources\trash-bin-circle-background-icon-free-vector.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\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 \ No newline at end of file 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 deleted file mode 100644 index 49d9526..0000000 Binary files a/ProjectPolyclinic/ProjectPolyclinic/Resources/195-1956806_abort-delete-cancel-icon-cross-no-access-denied.jpg and /dev/null 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 deleted file mode 100644 index 49d9526..0000000 Binary files a/ProjectPolyclinic/ProjectPolyclinic/Resources/195-1956806_abort-delete-cancel-icon-cross-no-access-denied.png and /dev/null differ diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.png b/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.png deleted file mode 100644 index e4d9850..0000000 Binary files a/ProjectPolyclinic/ProjectPolyclinic/Resources/Fairytale_button_add.svg.png and /dev/null differ diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/kisspng-computer-icons-transparency-image-editing-symbol-manage-svg-png-icon-free-download-171-77-onli-5d28d47b0152b7.3749987215629569230054.jpg b/ProjectPolyclinic/ProjectPolyclinic/Resources/kisspng-computer-icons-transparency-image-editing-symbol-manage-svg-png-icon-free-download-171-77-onli-5d28d47b0152b7.3749987215629569230054.jpg new file mode 100644 index 0000000..8daa09f Binary files /dev/null and b/ProjectPolyclinic/ProjectPolyclinic/Resources/kisspng-computer-icons-transparency-image-editing-symbol-manage-svg-png-icon-free-download-171-77-onli-5d28d47b0152b7.3749987215629569230054.jpg differ diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/trash-bin-circle-background-icon-free-vector.jpg b/ProjectPolyclinic/ProjectPolyclinic/Resources/trash-bin-circle-background-icon-free-vector.jpg new file mode 100644 index 0000000..9541914 Binary files /dev/null and b/ProjectPolyclinic/ProjectPolyclinic/Resources/trash-bin-circle-background-icon-free-vector.jpg differ diff --git a/ProjectPolyclinic/ProjectPolyclinic/Resources/unnamed1.jpg b/ProjectPolyclinic/ProjectPolyclinic/Resources/unnamed1.jpg deleted file mode 100644 index 9184f04..0000000 Binary files a/ProjectPolyclinic/ProjectPolyclinic/Resources/unnamed1.jpg and /dev/null differ