diff --git a/Medical/MedicalView/Diagnoses/FormDiagnose.Designer.cs b/Medical/MedicalView/Diagnoses/FormDiagnose.Designer.cs index 0f9b45d..5434abb 100644 --- a/Medical/MedicalView/Diagnoses/FormDiagnose.Designer.cs +++ b/Medical/MedicalView/Diagnoses/FormDiagnose.Designer.cs @@ -97,7 +97,6 @@ private TextBox textBoxPhoneNumber; private TextBox textBoxPatronymic; private TextBox textBoxName; - private TextBox textBoxName; private Label label4; private Label label3; private Label label1; diff --git a/Medical/MedicalView/FormAbstractList.cs b/Medical/MedicalView/FormAbstractList.cs index 211f535..b212667 100644 --- a/Medical/MedicalView/FormAbstractList.cs +++ b/Medical/MedicalView/FormAbstractList.cs @@ -2,6 +2,8 @@ using MedicalDatabaseContracts.Models; using MedicalDatabaseContracts.SearchModels; using MedicalDatabaseContracts.ViewModels; +using MedicalView.Diagnoses; +using MedicalView.Visits; using Microsoft.Extensions.Logging; namespace MedicalView @@ -30,17 +32,17 @@ namespace MedicalView LoadData(); } - private void AddItemToolStripMenuItem_Click(object sender, EventArgs e) + protected virtual void AddItemToolStripMenuItem_Click(object sender, EventArgs e) { // code } - private void EsitItemToolStripMenuItem_Click(object sender, EventArgs e) + protected virtual void EsitItemToolStripMenuItem_Click(object sender, EventArgs e) { // code } - private void DeleteItemToolStripMenuItem_Click(object sender, EventArgs e) + protected virtual void DeleteItemToolStripMenuItem_Click(object sender, EventArgs e) { // code } diff --git a/Medical/MedicalView/FormMain.Designer.cs b/Medical/MedicalView/FormMain.Designer.cs index 34c3c03..d5bd6fb 100644 --- a/Medical/MedicalView/FormMain.Designer.cs +++ b/Medical/MedicalView/FormMain.Designer.cs @@ -136,6 +136,7 @@ buttonEdit.TabIndex = 4; buttonEdit.Text = "Изменить"; buttonEdit.UseVisualStyleBackColor = true; + buttonEdit.Click += buttonEdit_Click; // // buttonDelete // @@ -158,6 +159,7 @@ buttonAdd.TabIndex = 2; buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; // // dateTimePicker1 // diff --git a/Medical/MedicalView/FormMain.cs b/Medical/MedicalView/FormMain.cs index 4c2bcc4..4277217 100644 --- a/Medical/MedicalView/FormMain.cs +++ b/Medical/MedicalView/FormMain.cs @@ -95,5 +95,23 @@ namespace MedicalView.Visits { toolStripStatusLabel.Text = text; } + + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormVisit)); + if (service is FormVisit form) + { + form.ShowDialog(); + } + } + + private void buttonEdit_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormVisit)); + if (service is FormVisit form) + { + form.ShowDialog(); + } + } } } diff --git a/Medical/MedicalView/Program.cs b/Medical/MedicalView/Program.cs index ed82f4d..b0657ff 100644 --- a/Medical/MedicalView/Program.cs +++ b/Medical/MedicalView/Program.cs @@ -59,6 +59,12 @@ namespace MedicalView services.AddTransient(); services.AddTransient(); services.AddTransient(); + + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/Medical/MedicalView/Specializations/FormSpecialization.Designer.cs b/Medical/MedicalView/Specializations/FormSpecialization.Designer.cs index 48dd473..3fd35d3 100644 --- a/Medical/MedicalView/Specializations/FormSpecialization.Designer.cs +++ b/Medical/MedicalView/Specializations/FormSpecialization.Designer.cs @@ -33,8 +33,8 @@ CancelToolStripMenuItem = new ToolStripMenuItem(); textBoxName = new TextBox(); label1 = new Label(); - checkBoxPediatric = new CheckBox(); - checkBoxTherapeutic = new CheckBox(); + checkBoxIsPediatric = new CheckBox(); + checkBoxIsTherapeutic = new CheckBox(); menuStrip.SuspendLayout(); SuspendLayout(); // @@ -77,33 +77,33 @@ label1.TabIndex = 18; label1.Text = "Название"; // - // checkBoxPediatric + // checkBoxIsPediatric // - checkBoxPediatric.AutoSize = true; - checkBoxPediatric.Location = new Point(12, 76); - checkBoxPediatric.Name = "checkBoxPediatric"; - checkBoxPediatric.Size = new Size(145, 24); - checkBoxPediatric.TabIndex = 21; - checkBoxPediatric.Text = "Педиатрическая"; - checkBoxPediatric.UseVisualStyleBackColor = true; + checkBoxIsPediatric.AutoSize = true; + checkBoxIsPediatric.Location = new Point(12, 76); + checkBoxIsPediatric.Name = "checkBoxIsPediatric"; + checkBoxIsPediatric.Size = new Size(145, 24); + checkBoxIsPediatric.TabIndex = 21; + checkBoxIsPediatric.Text = "Педиатрическая"; + checkBoxIsPediatric.UseVisualStyleBackColor = true; // - // checkBoxTherapeutic + // checkBoxIsTherapeutic // - checkBoxTherapeutic.AutoSize = true; - checkBoxTherapeutic.Location = new Point(183, 76); - checkBoxTherapeutic.Name = "checkBoxTherapeutic"; - checkBoxTherapeutic.Size = new Size(150, 24); - checkBoxTherapeutic.TabIndex = 22; - checkBoxTherapeutic.Text = "Терапевтическая"; - checkBoxTherapeutic.UseVisualStyleBackColor = true; + checkBoxIsTherapeutic.AutoSize = true; + checkBoxIsTherapeutic.Location = new Point(183, 76); + checkBoxIsTherapeutic.Name = "checkBoxIsTherapeutic"; + checkBoxIsTherapeutic.Size = new Size(150, 24); + checkBoxIsTherapeutic.TabIndex = 22; + checkBoxIsTherapeutic.Text = "Терапевтическая"; + checkBoxIsTherapeutic.UseVisualStyleBackColor = true; // // FormSpecialization // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(489, 108); - Controls.Add(checkBoxTherapeutic); - Controls.Add(checkBoxPediatric); + Controls.Add(checkBoxIsTherapeutic); + Controls.Add(checkBoxIsPediatric); Controls.Add(menuStrip); Controls.Add(textBoxName); Controls.Add(label1); @@ -123,7 +123,7 @@ private ToolStripMenuItem CancelToolStripMenuItem; private TextBox textBoxName; private Label label1; - private CheckBox checkBoxPediatric; - private CheckBox checkBoxTherapeutic; + private CheckBox checkBoxIsPediatric; + private CheckBox checkBoxIsTherapeutic; } } \ No newline at end of file diff --git a/Medical/MedicalView/Visits/FormVisit.Designer.cs b/Medical/MedicalView/Visits/FormVisit.Designer.cs index 79f0612..ea92b77 100644 --- a/Medical/MedicalView/Visits/FormVisit.Designer.cs +++ b/Medical/MedicalView/Visits/FormVisit.Designer.cs @@ -28,18 +28,198 @@ /// private void InitializeComponent() { + menuStrip = new MenuStrip(); + ApplyToolStripMenuItem = new ToolStripMenuItem(); + CancelToolStripMenuItem = new ToolStripMenuItem(); + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + label4 = new Label(); + label5 = new Label(); + label6 = new Label(); + comboBoxPatient = new ComboBox(); + comboBoxDoctor = new ComboBox(); + comboBoxDiagnose = new ComboBox(); + textBoxComment = new TextBox(); + datePicker = new DateTimePicker(); + timePicker = new DateTimePicker(); + menuStrip.SuspendLayout(); SuspendLayout(); // + // menuStrip + // + menuStrip.ImageScalingSize = new Size(20, 20); + menuStrip.Items.AddRange(new ToolStripItem[] { ApplyToolStripMenuItem, CancelToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(466, 28); + menuStrip.TabIndex = 21; + menuStrip.Text = "menuStrip1"; + // + // ApplyToolStripMenuItem + // + ApplyToolStripMenuItem.Name = "ApplyToolStripMenuItem"; + ApplyToolStripMenuItem.Size = new Size(97, 24); + ApplyToolStripMenuItem.Text = "Сохранить"; + // + // CancelToolStripMenuItem + // + CancelToolStripMenuItem.Name = "CancelToolStripMenuItem"; + CancelToolStripMenuItem.Size = new Size(76, 24); + CancelToolStripMenuItem.Text = "Отмена"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(12, 80); + label1.Name = "label1"; + label1.Size = new Size(69, 20); + label1.TabIndex = 22; + label1.Text = "Пациент"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(12, 115); + label2.Name = "label2"; + label2.Size = new Size(43, 20); + label2.TabIndex = 23; + label2.Text = "Врач"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(12, 153); + label3.Name = "label3"; + label3.Size = new Size(67, 20); + label3.TabIndex = 24; + label3.Text = "Диагноз"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(12, 42); + label4.Name = "label4"; + label4.Size = new Size(41, 20); + label4.TabIndex = 25; + label4.Text = "Дата"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new Point(213, 42); + label5.Name = "label5"; + label5.Size = new Size(54, 20); + label5.TabIndex = 26; + label5.Text = "Время"; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new Point(12, 193); + label6.Name = "label6"; + label6.Size = new Size(107, 20); + label6.TabIndex = 27; + label6.Text = "Комментарий"; + // + // comboBoxPatient + // + comboBoxPatient.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + comboBoxPatient.FormattingEnabled = true; + comboBoxPatient.Location = new Point(87, 77); + comboBoxPatient.Name = "comboBoxPatient"; + comboBoxPatient.Size = new Size(367, 28); + comboBoxPatient.TabIndex = 28; + // + // comboBoxDoctor + // + comboBoxDoctor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + comboBoxDoctor.FormattingEnabled = true; + comboBoxDoctor.Location = new Point(87, 112); + comboBoxDoctor.Name = "comboBoxDoctor"; + comboBoxDoctor.Size = new Size(367, 28); + comboBoxDoctor.TabIndex = 29; + // + // comboBoxDiagnose + // + comboBoxDiagnose.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + comboBoxDiagnose.FormattingEnabled = true; + comboBoxDiagnose.Location = new Point(87, 150); + comboBoxDiagnose.Name = "comboBoxDiagnose"; + comboBoxDiagnose.Size = new Size(367, 28); + comboBoxDiagnose.TabIndex = 30; + // + // textBoxComment + // + textBoxComment.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + textBoxComment.Location = new Point(12, 216); + textBoxComment.Multiline = true; + textBoxComment.Name = "textBoxComment"; + textBoxComment.Size = new Size(442, 225); + textBoxComment.TabIndex = 31; + // + // datePicker + // + datePicker.Format = DateTimePickerFormat.Short; + datePicker.Location = new Point(59, 37); + datePicker.Name = "datePicker"; + datePicker.Size = new Size(123, 27); + datePicker.TabIndex = 32; + // + // timePicker + // + timePicker.CustomFormat = "HH:mm"; + timePicker.Format = DateTimePickerFormat.Custom; + timePicker.Location = new Point(273, 37); + timePicker.Name = "timePicker"; + timePicker.ShowUpDown = true; + timePicker.Size = new Size(86, 27); + timePicker.TabIndex = 33; + timePicker.Value = new DateTime(2024, 5, 15, 12, 30, 0, 0); + // // FormVisit // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(466, 453); + Controls.Add(timePicker); + Controls.Add(datePicker); + Controls.Add(textBoxComment); + Controls.Add(comboBoxDiagnose); + Controls.Add(comboBoxDoctor); + Controls.Add(comboBoxPatient); + Controls.Add(label6); + Controls.Add(label5); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(menuStrip); + MinimumSize = new Size(484, 500); Name = "FormVisit"; Text = "Редактировать прием"; + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion + + private MenuStrip menuStrip; + private ToolStripMenuItem ApplyToolStripMenuItem; + private ToolStripMenuItem CancelToolStripMenuItem; + private Label label1; + private Label label2; + private Label label3; + private Label label4; + private Label label5; + private Label label6; + private ComboBox comboBoxPatient; + private ComboBox comboBoxDoctor; + private ComboBox comboBoxDiagnose; + private TextBox textBoxComment; + private DateTimePicker datePicker; + private DateTimePicker timePicker; } } \ No newline at end of file diff --git a/Medical/MedicalView/Visits/FormVisit.resx b/Medical/MedicalView/Visits/FormVisit.resx index af32865..6c82d08 100644 --- a/Medical/MedicalView/Visits/FormVisit.resx +++ b/Medical/MedicalView/Visits/FormVisit.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file