From 102ed1f1ac64002b7308bb3c59b78ee104b353b9 Mon Sep 17 00:00:00 2001 From: "annalyovushkina@yandex.ru" Date: Wed, 23 Oct 2024 13:59:04 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D1=82=D0=B8=20=D1=83=D0=B6=D0=B5=20=D0=BF=D0=BE=D1=87?= =?UTF-8?q?=D1=82=D0=B8=D0=B8=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20241023081115_InitialCreate2.Designer.cs | 75 +++++++++++++++++++ .../20241023081115_InitialCreate2.cs | 44 +++++++++++ .../20241023083750_InitialCreate3.Designer.cs | 75 +++++++++++++++++++ .../20241023083750_InitialCreate3.cs | 22 ++++++ .../UchetLabDataBaseModelSnapshot.cs | 2 +- .../WinFormUchetLab/FormChecker.Designer.cs | 5 ++ .../WinFormUchetLab/FormChecker.cs | 4 +- .../WinFormUchetLab/FormLab.Designer.cs | 8 ++ .../WinFormUchetLab/FormMain.Designer.cs | 35 +++++---- WinFormUchetLab/WinFormUchetLab/FormMain.cs | 42 +++++++++++ 10 files changed, 293 insertions(+), 19 deletions(-) create mode 100644 WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.Designer.cs create mode 100644 WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.cs create mode 100644 WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.Designer.cs create mode 100644 WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.cs diff --git a/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.Designer.cs b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.Designer.cs new file mode 100644 index 0000000..54bec1f --- /dev/null +++ b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.Designer.cs @@ -0,0 +1,75 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using UchetLabDatabaseImplement; + +#nullable disable + +namespace UchetLabDatabaseImplement.Migrations +{ + [DbContext(typeof(UchetLabDataBase))] + [Migration("20241023081115_InitialCreate2")] + partial class InitialCreate2 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.16") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("UchetLabDatabaseImplement.Models.Checker", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("FIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Checkers"); + }); + + modelBuilder.Entity("UchetLabDatabaseImplement.Models.Lab", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CheckDate") + .HasColumnType("datetime2"); + + b.Property("Checker") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("LabTask") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("TaskImage") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Labs"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.cs b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.cs new file mode 100644 index 0000000..ea2d128 --- /dev/null +++ b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.cs @@ -0,0 +1,44 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace UchetLabDatabaseImplement.Migrations +{ + /// + public partial class InitialCreate2 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropPrimaryKey( + name: "PK_Checker", + table: "Checker"); + + migrationBuilder.RenameTable( + name: "Checker", + newName: "Checkers"); + + migrationBuilder.AddPrimaryKey( + name: "PK_Checkers", + table: "Checkers", + column: "Id"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropPrimaryKey( + name: "PK_Checkers", + table: "Checkers"); + + migrationBuilder.RenameTable( + name: "Checkers", + newName: "Checker"); + + migrationBuilder.AddPrimaryKey( + name: "PK_Checker", + table: "Checker", + column: "Id"); + } + } +} diff --git a/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.Designer.cs b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.Designer.cs new file mode 100644 index 0000000..a1f48bf --- /dev/null +++ b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.Designer.cs @@ -0,0 +1,75 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using UchetLabDatabaseImplement; + +#nullable disable + +namespace UchetLabDatabaseImplement.Migrations +{ + [DbContext(typeof(UchetLabDataBase))] + [Migration("20241023083750_InitialCreate3")] + partial class InitialCreate3 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.16") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("UchetLabDatabaseImplement.Models.Checker", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("FIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Checkers"); + }); + + modelBuilder.Entity("UchetLabDatabaseImplement.Models.Lab", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CheckDate") + .HasColumnType("datetime2"); + + b.Property("Checker") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("LabTask") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("TaskImage") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Labs"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.cs b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.cs new file mode 100644 index 0000000..2ba6f99 --- /dev/null +++ b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace UchetLabDatabaseImplement.Migrations +{ + /// + public partial class InitialCreate3 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + + } + } +} diff --git a/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/UchetLabDataBaseModelSnapshot.cs b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/UchetLabDataBaseModelSnapshot.cs index 35adead..5176f41 100644 --- a/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/UchetLabDataBaseModelSnapshot.cs +++ b/WinFormUchetLab/UchetLabDatabaseImplement/Migrations/UchetLabDataBaseModelSnapshot.cs @@ -36,7 +36,7 @@ namespace UchetLabDatabaseImplement.Migrations b.HasKey("Id"); - b.ToTable("Checker"); + b.ToTable("Checkers"); }); modelBuilder.Entity("UchetLabDatabaseImplement.Models.Lab", b => diff --git a/WinFormUchetLab/WinFormUchetLab/FormChecker.Designer.cs b/WinFormUchetLab/WinFormUchetLab/FormChecker.Designer.cs index 2eee771..355429f 100644 --- a/WinFormUchetLab/WinFormUchetLab/FormChecker.Designer.cs +++ b/WinFormUchetLab/WinFormUchetLab/FormChecker.Designer.cs @@ -36,6 +36,11 @@ // // dataGridView1 // + dataGridView1.AllowUserToAddRows = false; + dataGridView1.AllowUserToDeleteRows = false; + dataGridView1.AllowUserToResizeColumns = false; + dataGridView1.AllowUserToResizeRows = false; + dataGridView1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView1.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells; dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; diff --git a/WinFormUchetLab/WinFormUchetLab/FormChecker.cs b/WinFormUchetLab/WinFormUchetLab/FormChecker.cs index 0a1b8e5..849844c 100644 --- a/WinFormUchetLab/WinFormUchetLab/FormChecker.cs +++ b/WinFormUchetLab/WinFormUchetLab/FormChecker.cs @@ -42,7 +42,7 @@ namespace WinFormUchetLab { dataGridView1.Rows.Add(); dataGridView1.Rows[dataGridView1.Rows.Count - 1].Cells["Id"].Value = difficulty.Id; - dataGridView1.Rows[dataGridView1.Rows.Count - 1].Cells["Проверяющий"].Value = difficulty.FIO; + dataGridView1.Rows[dataGridView1.Rows.Count - 1].Cells["FIO"].Value = difficulty.FIO; } } catch (Exception ex) @@ -95,7 +95,7 @@ namespace WinFormUchetLab { // Добавляем новую строку dataGridView1.Rows.Add(); - dataGridView1.CurrentCell = dataGridView1.Rows[dataGridView1.Rows.Count - 1].Cells["Проверяющий"]; // Ставим фокус на новую строку + dataGridView1.CurrentCell = dataGridView1.Rows[dataGridView1.Rows.Count - 1].Cells["FIO"]; // Ставим фокус на новую строку e.Handled = true; } else if (e.KeyCode == Keys.Delete && dataGridView1.SelectedRows.Count > 0) diff --git a/WinFormUchetLab/WinFormUchetLab/FormLab.Designer.cs b/WinFormUchetLab/WinFormUchetLab/FormLab.Designer.cs index 232b993..44464ed 100644 --- a/WinFormUchetLab/WinFormUchetLab/FormLab.Designer.cs +++ b/WinFormUchetLab/WinFormUchetLab/FormLab.Designer.cs @@ -42,14 +42,18 @@ // // textBoxTask // + textBoxTask.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; textBoxTask.Location = new Point(13, 32); + textBoxTask.Multiline = true; textBoxTask.Name = "textBoxTask"; textBoxTask.Size = new Size(468, 27); textBoxTask.TabIndex = 0; // // textBoxImage // + textBoxImage.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; textBoxImage.Location = new Point(13, 85); + textBoxImage.Multiline = true; textBoxImage.Name = "textBoxImage"; textBoxImage.Size = new Size(468, 27); textBoxImage.TabIndex = 1; @@ -57,6 +61,7 @@ // // customTextBox4Date1 // + customTextBox4Date1.Anchor = AnchorStyles.Left | AnchorStyles.Right; customTextBox4Date1.Location = new Point(15, 285); customTextBox4Date1.Margin = new Padding(3, 4, 3, 4); customTextBox4Date1.Name = "customTextBox4Date1"; @@ -66,6 +71,7 @@ // // buttonSave // + buttonSave.Anchor = AnchorStyles.Left; buttonSave.Location = new Point(13, 351); buttonSave.Name = "buttonSave"; buttonSave.Size = new Size(94, 29); @@ -76,6 +82,7 @@ // // buttonCancel // + buttonCancel.Anchor = AnchorStyles.Right; buttonCancel.Location = new Point(387, 351); buttonCancel.Name = "buttonCancel"; buttonCancel.Size = new Size(94, 29); @@ -122,6 +129,7 @@ // // controlSelectedListBoxSingle1 // + controlSelectedListBoxSingle1.Anchor = AnchorStyles.Left | AnchorStyles.Right; controlSelectedListBoxSingle1.Location = new Point(12, 140); controlSelectedListBoxSingle1.Margin = new Padding(4, 5, 4, 5); controlSelectedListBoxSingle1.Name = "controlSelectedListBoxSingle1"; diff --git a/WinFormUchetLab/WinFormUchetLab/FormMain.Designer.cs b/WinFormUchetLab/WinFormUchetLab/FormMain.Designer.cs index 30cce7c..16181ba 100644 --- a/WinFormUchetLab/WinFormUchetLab/FormMain.Designer.cs +++ b/WinFormUchetLab/WinFormUchetLab/FormMain.Designer.cs @@ -37,7 +37,7 @@ wordToolStripMenuItem = new ToolStripMenuItem(); excelToolStripMenuItem = new ToolStripMenuItem(); pdfToolStripMenuItem = new ToolStripMenuItem(); - лабаToolStripMenuItem = new ToolStripMenuItem(); + проверяющийToolStripMenuItem = new ToolStripMenuItem(); pdfImage = new CustomComponents.NonVisualComponents.PdfImage(components); customExcelTable = new Non_visual_components_Kouvshinoff.CustomComponentExcelTableWithHeader(components); componentDocumentWithChartBarWord1 = new ComponentsLibraryNet60.DocumentWithChart.ComponentDocumentWithChartBarWord(components); @@ -46,12 +46,13 @@ // // controlDataTableRow1 // - controlDataTableRow1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + controlDataTableRow1.Anchor = AnchorStyles.Left | AnchorStyles.Right; controlDataTableRow1.AutoSize = true; controlDataTableRow1.ContextMenuStrip = contextMenuStrip1; controlDataTableRow1.Location = new Point(13, 65); controlDataTableRow1.Margin = new Padding(4, 5, 4, 5); controlDataTableRow1.Name = "controlDataTableRow1"; + controlDataTableRow1.RightToLeft = RightToLeft.No; controlDataTableRow1.SelectedRowIndex = -1; controlDataTableRow1.Size = new Size(774, 371); controlDataTableRow1.TabIndex = 1; @@ -59,59 +60,59 @@ // contextMenuStrip1 // contextMenuStrip1.ImageScalingSize = new Size(20, 20); - contextMenuStrip1.Items.AddRange(new ToolStripItem[] { создатьToolStripMenuItem, изменитьToolStripMenuItem, удалитьToolStripMenuItem, wordToolStripMenuItem, excelToolStripMenuItem, pdfToolStripMenuItem, лабаToolStripMenuItem }); + contextMenuStrip1.Items.AddRange(new ToolStripItem[] { создатьToolStripMenuItem, изменитьToolStripMenuItem, удалитьToolStripMenuItem, wordToolStripMenuItem, excelToolStripMenuItem, pdfToolStripMenuItem, проверяющийToolStripMenuItem }); contextMenuStrip1.Name = "contextMenuStrip1"; contextMenuStrip1.ShowImageMargin = false; - contextMenuStrip1.Size = new Size(121, 172); + contextMenuStrip1.Size = new Size(156, 172); // // создатьToolStripMenuItem // создатьToolStripMenuItem.Name = "создатьToolStripMenuItem"; - создатьToolStripMenuItem.Size = new Size(120, 24); + создатьToolStripMenuItem.Size = new Size(155, 24); создатьToolStripMenuItem.Text = "создать"; создатьToolStripMenuItem.Click += создатьToolStripMenuItem_Click; // // изменитьToolStripMenuItem // изменитьToolStripMenuItem.Name = "изменитьToolStripMenuItem"; - изменитьToolStripMenuItem.Size = new Size(120, 24); + изменитьToolStripMenuItem.Size = new Size(155, 24); изменитьToolStripMenuItem.Text = "изменить"; изменитьToolStripMenuItem.Click += изменитьToolStripMenuItem_Click; // // удалитьToolStripMenuItem // удалитьToolStripMenuItem.Name = "удалитьToolStripMenuItem"; - удалитьToolStripMenuItem.Size = new Size(120, 24); + удалитьToolStripMenuItem.Size = new Size(155, 24); удалитьToolStripMenuItem.Text = "удалить"; удалитьToolStripMenuItem.Click += удалитьToolStripMenuItem_Click; // // wordToolStripMenuItem // wordToolStripMenuItem.Name = "wordToolStripMenuItem"; - wordToolStripMenuItem.Size = new Size(120, 24); + wordToolStripMenuItem.Size = new Size(155, 24); wordToolStripMenuItem.Text = "word"; wordToolStripMenuItem.Click += wordToolStripMenuItem_Click; // // excelToolStripMenuItem // excelToolStripMenuItem.Name = "excelToolStripMenuItem"; - excelToolStripMenuItem.Size = new Size(120, 24); + excelToolStripMenuItem.Size = new Size(155, 24); excelToolStripMenuItem.Text = "excel"; excelToolStripMenuItem.Click += excelToolStripMenuItem_Click; // // pdfToolStripMenuItem // pdfToolStripMenuItem.Name = "pdfToolStripMenuItem"; - pdfToolStripMenuItem.Size = new Size(120, 24); + pdfToolStripMenuItem.Size = new Size(155, 24); pdfToolStripMenuItem.Text = "pdf"; pdfToolStripMenuItem.Click += pdfToolStripMenuItem_Click; // - // лабаToolStripMenuItem + // проверяющийToolStripMenuItem // - лабаToolStripMenuItem.Name = "лабаToolStripMenuItem"; - лабаToolStripMenuItem.Size = new Size(120, 24); - лабаToolStripMenuItem.Text = "лаба"; - лабаToolStripMenuItem.Click += лабаToolStripMenuItem_Click; + проверяющийToolStripMenuItem.Name = "проверяющийToolStripMenuItem"; + проверяющийToolStripMenuItem.Size = new Size(155, 24); + проверяющийToolStripMenuItem.Text = "проверяющий"; + проверяющийToolStripMenuItem.Click += лабаToolStripMenuItem_Click; // // FormMain // @@ -119,9 +120,11 @@ AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); Controls.Add(controlDataTableRow1); + KeyPreview = true; Name = "FormMain"; Text = "FormMain"; Load += Form1_Load; + KeyDown += MainForm_KeyDown; contextMenuStrip1.ResumeLayout(false); ResumeLayout(false); PerformLayout(); @@ -136,7 +139,7 @@ private ToolStripMenuItem wordToolStripMenuItem; private ToolStripMenuItem excelToolStripMenuItem; private ToolStripMenuItem pdfToolStripMenuItem; - private ToolStripMenuItem лабаToolStripMenuItem; + private ToolStripMenuItem проверяющийToolStripMenuItem; private CustomComponents.NonVisualComponents.PdfImage pdfImage; private Non_visual_components_Kouvshinoff.CustomComponentExcelTableWithHeader customExcelTable; private ComponentsLibraryNet60.DocumentWithChart.ComponentDocumentWithChartBarWord componentDocumentWithChartBarWord1; diff --git a/WinFormUchetLab/WinFormUchetLab/FormMain.cs b/WinFormUchetLab/WinFormUchetLab/FormMain.cs index 415d766..4d9c37f 100644 --- a/WinFormUchetLab/WinFormUchetLab/FormMain.cs +++ b/WinFormUchetLab/WinFormUchetLab/FormMain.cs @@ -310,5 +310,47 @@ namespace WinFormUchetLab { ShowFormChecker(); } + private void MainForm_KeyDown(object sender, KeyEventArgs e) + { + if (e.Control) + { + switch (e.KeyCode) + { + case Keys.A: + AddElement(); // Ctrl+A - + e.SuppressKeyPress = true; // + break; + + case Keys.U: + UpdateElement(); // Ctrl+U - + e.SuppressKeyPress = true; + break; + + case Keys.D: + DeleteElement(); // Ctrl+D - + e.SuppressKeyPress = true; + break; + + case Keys.S: + CreatePdf(); // Ctrl+S - + e.SuppressKeyPress = true; + break; + + case Keys.T: + CreateExcel(); // Ctrl+T - + e.SuppressKeyPress = true; + break; + + case Keys.C: + CreateWord(); // Ctrl+C - + e.SuppressKeyPress = true; + break; + case Keys.M: + ShowFormChecker(); + e.SuppressKeyPress = true; + break; + } + } + } } }