From 47d1f3762b9afcf66f7eb03e2ab252d05dc4ca83 Mon Sep 17 00:00:00 2001 From: AnnaLioness Date: Tue, 23 Apr 2024 20:52:46 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExamTimetable/FormComission.Designer.cs | 1 + .../ExamTimetable/FormExam.Designer.cs | 1 + .../ExamTimetable/FormFaculty.Designer.cs | 207 +++++++++--------- ExamTimetable/ExamTimetable/FormMain.cs | 40 +++- .../FormSpecialization.Designer.cs | 1 + .../ExamTimetable/FormUniversity.Designer.cs | 1 + .../ExamTimetable_Database/Implementation.cs | 16 +- 7 files changed, 157 insertions(+), 110 deletions(-) diff --git a/ExamTimetable/ExamTimetable/FormComission.Designer.cs b/ExamTimetable/ExamTimetable/FormComission.Designer.cs index cd6aa84..97136c6 100644 --- a/ExamTimetable/ExamTimetable/FormComission.Designer.cs +++ b/ExamTimetable/ExamTimetable/FormComission.Designer.cs @@ -43,6 +43,7 @@ // this.dataGridView.AllowUserToAddRows = false; this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Location = new System.Drawing.Point(12, 12); this.dataGridView.Name = "dataGridView"; diff --git a/ExamTimetable/ExamTimetable/FormExam.Designer.cs b/ExamTimetable/ExamTimetable/FormExam.Designer.cs index e6ba65b..2c770c7 100644 --- a/ExamTimetable/ExamTimetable/FormExam.Designer.cs +++ b/ExamTimetable/ExamTimetable/FormExam.Designer.cs @@ -49,6 +49,7 @@ // this.dataGridView.AllowUserToAddRows = false; this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Location = new System.Drawing.Point(12, 12); this.dataGridView.Name = "dataGridView"; diff --git a/ExamTimetable/ExamTimetable/FormFaculty.Designer.cs b/ExamTimetable/ExamTimetable/FormFaculty.Designer.cs index 8063b70..714ed27 100644 --- a/ExamTimetable/ExamTimetable/FormFaculty.Designer.cs +++ b/ExamTimetable/ExamTimetable/FormFaculty.Designer.cs @@ -28,109 +28,110 @@ /// private void InitializeComponent() { - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.textBoxName = new System.Windows.Forms.TextBox(); - this.comboBoxUni = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.buttonCreate = new System.Windows.Forms.Button(); - this.buttonUpdate = new System.Windows.Forms.Button(); - this.buttonDelete = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); - // - // dataGridView - // - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(12, 12); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowTemplate.Height = 25; - this.dataGridView.Size = new System.Drawing.Size(514, 333); - this.dataGridView.TabIndex = 0; - this.dataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellClick); - // - // textBoxName - // - this.textBoxName.Location = new System.Drawing.Point(638, 25); - this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(150, 23); - this.textBoxName.TabIndex = 1; - // - // comboBoxUni - // - this.comboBoxUni.FormattingEnabled = true; - this.comboBoxUni.Location = new System.Drawing.Point(638, 65); - this.comboBoxUni.Name = "comboBoxUni"; - this.comboBoxUni.Size = new System.Drawing.Size(150, 23); - this.comboBoxUni.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(570, 28); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(62, 15); - this.label1.TabIndex = 3; - this.label1.Text = "Название:"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(553, 68); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(79, 15); - this.label2.TabIndex = 4; - this.label2.Text = "Университет:"; - // - // buttonCreate - // - this.buttonCreate.Location = new System.Drawing.Point(713, 110); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(75, 23); - this.buttonCreate.TabIndex = 5; - this.buttonCreate.Text = "Создать"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); - // - // buttonUpdate - // - this.buttonUpdate.Location = new System.Drawing.Point(713, 150); - this.buttonUpdate.Name = "buttonUpdate"; - this.buttonUpdate.Size = new System.Drawing.Size(75, 23); - this.buttonUpdate.TabIndex = 6; - this.buttonUpdate.Text = "Изменить"; - this.buttonUpdate.UseVisualStyleBackColor = true; - this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click); - // - // buttonDelete - // - this.buttonDelete.Location = new System.Drawing.Point(713, 193); - this.buttonDelete.Name = "buttonDelete"; - this.buttonDelete.Size = new System.Drawing.Size(75, 23); - this.buttonDelete.TabIndex = 7; - this.buttonDelete.Text = "Удалить"; - this.buttonDelete.UseVisualStyleBackColor = true; - this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); - // - // FormFaculty - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 357); - this.Controls.Add(this.buttonDelete); - this.Controls.Add(this.buttonUpdate); - this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.comboBoxUni); - this.Controls.Add(this.textBoxName); - this.Controls.Add(this.dataGridView); - this.Name = "FormFaculty"; - this.Text = "FormFaculty"; - this.Load += new System.EventHandler(this.FormFaculty_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.comboBoxUni = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.buttonCreate = new System.Windows.Forms.Button(); + this.buttonUpdate = new System.Windows.Forms.Button(); + this.buttonDelete = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // dataGridView + // + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(12, 12); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(514, 333); + this.dataGridView.TabIndex = 0; + this.dataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellClick); + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(638, 25); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(150, 23); + this.textBoxName.TabIndex = 1; + // + // comboBoxUni + // + this.comboBoxUni.FormattingEnabled = true; + this.comboBoxUni.Location = new System.Drawing.Point(638, 65); + this.comboBoxUni.Name = "comboBoxUni"; + this.comboBoxUni.Size = new System.Drawing.Size(150, 23); + this.comboBoxUni.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(570, 28); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(62, 15); + this.label1.TabIndex = 3; + this.label1.Text = "Название:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(553, 68); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(79, 15); + this.label2.TabIndex = 4; + this.label2.Text = "Университет:"; + // + // buttonCreate + // + this.buttonCreate.Location = new System.Drawing.Point(713, 110); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(75, 23); + this.buttonCreate.TabIndex = 5; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); + // + // buttonUpdate + // + this.buttonUpdate.Location = new System.Drawing.Point(713, 150); + this.buttonUpdate.Name = "buttonUpdate"; + this.buttonUpdate.Size = new System.Drawing.Size(75, 23); + this.buttonUpdate.TabIndex = 6; + this.buttonUpdate.Text = "Изменить"; + this.buttonUpdate.UseVisualStyleBackColor = true; + this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click); + // + // buttonDelete + // + this.buttonDelete.Location = new System.Drawing.Point(713, 193); + this.buttonDelete.Name = "buttonDelete"; + this.buttonDelete.Size = new System.Drawing.Size(75, 23); + this.buttonDelete.TabIndex = 7; + this.buttonDelete.Text = "Удалить"; + this.buttonDelete.UseVisualStyleBackColor = true; + this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click); + // + // FormFaculty + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 357); + this.Controls.Add(this.buttonDelete); + this.Controls.Add(this.buttonUpdate); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.comboBoxUni); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.dataGridView); + this.Name = "FormFaculty"; + this.Text = "FormFaculty"; + this.Load += new System.EventHandler(this.FormFaculty_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/ExamTimetable/ExamTimetable/FormMain.cs b/ExamTimetable/ExamTimetable/FormMain.cs index 780f73e..aca21c9 100644 --- a/ExamTimetable/ExamTimetable/FormMain.cs +++ b/ExamTimetable/ExamTimetable/FormMain.cs @@ -1,6 +1,7 @@ using ExamTimetable_Database; using ExamTimetable_Forms; using Microsoft.Extensions.DependencyInjection; +using System.Windows.Forms; namespace ExamTimetable { @@ -61,10 +62,41 @@ namespace ExamTimetable var service = Program.ServiceProvider?.GetService(typeof(Abstractions)); if (service is Abstractions bd) { - // "GetCars" , - DateTime startTime = DateTime.Now; - var result = bd.GetExams(); // - DateTime endTime = DateTime.Now; + /*var exams = bd.GetExams(); + int id = exams.Last().exam_id; + var exam = exams.Last();*/ + string test = "test"; + var faculties = bd.GetFaculties(); + int id = faculties.Last().faculty_id; + var faculty = faculties.Last(); + + DateTime startTime = DateTime.Now; + /*Exam updatedExam = new Exam + { + exam_id = id, + exam_date = exam.exam_date, + exam_place = exam.exam_place, + exam_subject = test, + com_id = exam.com_id, + exam_time = exam.exam_time + };*/ + Faculty updatedFaculty = new Faculty + { + faculty_id = id, + faculty_name = test, + uni_id = faculty.uni_id + }; + //var result = bd.GetExams(); // + //var result = bd.GetExamById(id); + //bd.AddExam(exam); + //bd.UpdateExam(updatedExam); + //bd.DeleteExam(id); + //var result = bd.GetFaculties(); + //var result = bd.GetFacultyById(id); + //bd.AddFaculty(faculty); + bd.UpdateFaculty(updatedFaculty); + //bd.DeleteFaculty(id); + DateTime endTime = DateTime.Now; // textBoxTest.Text = $" : {(endTime - startTime).TotalMilliseconds} "; diff --git a/ExamTimetable/ExamTimetable/FormSpecialization.Designer.cs b/ExamTimetable/ExamTimetable/FormSpecialization.Designer.cs index 6e84b3b..aa4b055 100644 --- a/ExamTimetable/ExamTimetable/FormSpecialization.Designer.cs +++ b/ExamTimetable/ExamTimetable/FormSpecialization.Designer.cs @@ -43,6 +43,7 @@ // this.dataGridView.AllowUserToAddRows = false; this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Location = new System.Drawing.Point(12, 12); this.dataGridView.Name = "dataGridView"; diff --git a/ExamTimetable/ExamTimetable/FormUniversity.Designer.cs b/ExamTimetable/ExamTimetable/FormUniversity.Designer.cs index 5c709b2..2ca61b4 100644 --- a/ExamTimetable/ExamTimetable/FormUniversity.Designer.cs +++ b/ExamTimetable/ExamTimetable/FormUniversity.Designer.cs @@ -47,6 +47,7 @@ // this.dataGridView.AllowUserToAddRows = false; this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Location = new System.Drawing.Point(12, 12); this.dataGridView.Name = "dataGridView"; diff --git a/ExamTimetable/ExamTimetable_Database/Implementation.cs b/ExamTimetable/ExamTimetable_Database/Implementation.cs index bc73022..c43a6e1 100644 --- a/ExamTimetable/ExamTimetable_Database/Implementation.cs +++ b/ExamTimetable/ExamTimetable_Database/Implementation.cs @@ -128,7 +128,10 @@ namespace ExamTimetable_Database { using var conn = GetConnection(); conn.Open(); - using var cmd = new NpgsqlCommand($"UPDATE faculty SET faculty_name = {faculty.faculty_name}, uni_id = {faculty.uni_id} WHERE faculty_id = {faculty.faculty_id}", conn); + using var cmd = new NpgsqlCommand($"UPDATE faculty SET faculty_name = @faculty_name, uni_id = @uni_id WHERE faculty_id = @faculty_id", conn); + cmd.Parameters.AddWithValue("@faculty_id", faculty.faculty_id); + cmd.Parameters.AddWithValue("@faculty_name", faculty.faculty_name); + cmd.Parameters.AddWithValue("@uni_id", faculty.uni_id); cmd.ExecuteNonQuery(); } public override void DeleteFaculty(int id) @@ -315,8 +318,15 @@ namespace ExamTimetable_Database { using var conn = GetConnection(); conn.Open(); - using var cmd = new NpgsqlCommand($"UPDATE exam SET exam_date = {exam.exam_date}, exam_place = {exam.exam_place}, exam_subject = {exam.exam_subject}, com_id = {exam.com_id}, exam_time= {exam.exam_time} WHERE exam_id = {exam.exam_id}", conn); - cmd.ExecuteNonQuery(); + //using var cmd = new NpgsqlCommand($"UPDATE exam SET exam_date = {exam.exam_date}, exam_place = {exam.exam_place}, exam_subject = {exam.exam_subject}, com_id = {exam.com_id}, exam_time= {exam.exam_time} WHERE exam_id = {exam.exam_id}", conn); + using var cmd = new NpgsqlCommand($"UPDATE exam SET exam_date = @exam_date, exam_place = @exam_place, exam_subject = @exam_subject, com_id = @com_id, exam_time= @exam_time WHERE exam_id = @exam_id", conn); + cmd.Parameters.AddWithValue("@exam_id", exam.exam_id); + cmd.Parameters.AddWithValue("@exam_date", exam.exam_date); + cmd.Parameters.AddWithValue("@exam_place", exam.exam_place); + cmd.Parameters.AddWithValue("@exam_subject", exam.exam_subject); + cmd.Parameters.AddWithValue("@com_id", exam.com_id); + cmd.Parameters.AddWithValue("@exam_time", exam.exam_time); + cmd.ExecuteNonQuery(); } public override void DeleteExam(int id) {