AnnaLioness/PIbd31.Lyovushkina_COP32_2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

почти почти уже почтииии

Browse Source
This commit is contained in:
annalyovushkina@yandex.ru 2024-10-23 13:59:04 +04:00
parent dcd9929b9c
commit 102ed1f1ac
10 changed files with 293 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.Designer.cs generated Normal file
View File

@ -0,0 +1,75 @@
// <auto-generated />
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
{
/// <inheritdoc />
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<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<string>("FIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("Checkers");
});
modelBuilder.Entity("UchetLabDatabaseImplement.Models.Lab", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<DateTime>("CheckDate")
.HasColumnType("datetime2");
b.Property<string>("Checker")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("LabTask")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("TaskImage")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("Labs");
});
#pragma warning restore 612, 618
}
}
}

44
WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023081115_InitialCreate2.cs Normal file
View File

@ -0,0 +1,44 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace UchetLabDatabaseImplement.Migrations
{
/// <inheritdoc />
public partial class InitialCreate2 : Migration
{
/// <inheritdoc />
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");
}
/// <inheritdoc />
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");
}
}
}

75
WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.Designer.cs generated Normal file
View File

@ -0,0 +1,75 @@
// <auto-generated />
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
{
/// <inheritdoc />
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<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<string>("FIO")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("Checkers");
});
modelBuilder.Entity("UchetLabDatabaseImplement.Models.Lab", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<DateTime>("CheckDate")
.HasColumnType("datetime2");
b.Property<string>("Checker")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("LabTask")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("TaskImage")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("Labs");
});
#pragma warning restore 612, 618
}
}
}

22
WinFormUchetLab/UchetLabDatabaseImplement/Migrations/20241023083750_InitialCreate3.cs Normal file
View File

@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace UchetLabDatabaseImplement.Migrations
{
/// <inheritdoc />
public partial class InitialCreate3 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

2
WinFormUchetLab/UchetLabDatabaseImplement/Migrations/UchetLabDataBaseModelSnapshot.cs
View File

@ -36,7 +36,7 @@ namespace UchetLabDatabaseImplement.Migrations
b.HasKey("Id");
b.ToTable("Checker");
b.ToTable("Checkers");
});
modelBuilder.Entity("UchetLabDatabaseImplement.Models.Lab", b =>

5
WinFormUchetLab/WinFormUchetLab/FormChecker.Designer.cs generated
View File

@ -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;

4
WinFormUchetLab/WinFormUchetLab/FormChecker.cs
View File

@ -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)

8
WinFormUchetLab/WinFormUchetLab/FormLab.Designer.cs generated
View File

@ -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";

35
WinFormUchetLab/WinFormUchetLab/FormMain.Designer.cs generated
View File

@ -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;

42
WinFormUchetLab/WinFormUchetLab/FormMain.cs
View File

@ -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;
}
}
}
}
}