From 533d867f424928c5dc84af16ae1493e8102f9832 Mon Sep 17 00:00:00 2001 From: "nikbel2004@outlook.com" Date: Wed, 15 May 2024 20:37:33 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... 20240515163715_InitialCreate.Designer.cs} | 74 +++++++++---------- ...nit.cs => 20240515163715_InitialCreate.cs} | 2 +- .../FurnitureAssemblyDatabaseModelSnapshot.cs | 70 +++++++++--------- .../FurnitureAssemblyView/FormReportOrders.cs | 2 +- .../FormWorkPieces.Designer.cs | 24 +++--- .../FurnitureAssemblyView/FormWorkPieces.cs | 8 +- .../FurnitureAssemblyView.csproj | 15 ++++ 7 files changed, 105 insertions(+), 90 deletions(-) rename FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/{20240506003821_Init.Designer.cs => 20240515163715_InitialCreate.Designer.cs} (96%) rename FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/{20240506003821_Init.cs => 20240515163715_InitialCreate.cs} (99%) diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240506003821_Init.Designer.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240515163715_InitialCreate.Designer.cs similarity index 96% rename from FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240506003821_Init.Designer.cs rename to FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240515163715_InitialCreate.Designer.cs index 1cb2ad2..231e9c6 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240506003821_Init.Designer.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240515163715_InitialCreate.Designer.cs @@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace FurnitureAssemblyDatabaseImplement.Migrations { [DbContext(typeof(FurnitureAssemblyDatabase))] - [Migration("20240506003821_Init")] - partial class Init + [Migration("20240515163715_InitialCreate")] + partial class InitialCreate { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -25,33 +25,6 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Shop", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("Address") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("DateOpen") - .HasColumnType("datetime2"); - - b.Property("MaxCountFurnitures") - .HasColumnType("int"); - - b.Property("ShopName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Shops"); - }); - modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Client", b => { b.Property("Id") @@ -229,6 +202,33 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations b.ToTable("Orders"); }); + modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DateOpen") + .HasColumnType("datetime2"); + + b.Property("MaxCountFurnitures") + .HasColumnType("int"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.ShopFurniture", b => { b.Property("Id") @@ -297,7 +297,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.MessageInfo", b => { b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Client", "Client") - .WithMany("MessageInfos") + .WithMany("Messages") .HasForeignKey("ClientId"); b.Navigation("Client"); @@ -336,7 +336,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Shop", "Shop") + b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Shop", "Shop") .WithMany("Furnitures") .HasForeignKey("ShopId") .OnDelete(DeleteBehavior.Cascade) @@ -347,14 +347,9 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations b.Navigation("Shop"); }); - modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Shop", b => - { - b.Navigation("Furnitures"); - }); - modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Client", b => { - b.Navigation("MessageInfos"); + b.Navigation("Messages"); b.Navigation("Orders"); }); @@ -373,6 +368,11 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations b.Navigation("Orders"); }); + modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Shop", b => + { + b.Navigation("Furnitures"); + }); + modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.WorkPiece", b => { b.Navigation("FurnitureWorkPieces"); diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240506003821_Init.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240515163715_InitialCreate.cs similarity index 99% rename from FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240506003821_Init.cs rename to FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240515163715_InitialCreate.cs index 1421e5a..2a41785 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240506003821_Init.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/20240515163715_InitialCreate.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace FurnitureAssemblyDatabaseImplement.Migrations { /// - public partial class Init : Migration + public partial class InitialCreate : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs index 4b40822..8819f3d 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Migrations/FurnitureAssemblyDatabaseModelSnapshot.cs @@ -22,33 +22,6 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Shop", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("Address") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("DateOpen") - .HasColumnType("datetime2"); - - b.Property("MaxCountFurnitures") - .HasColumnType("int"); - - b.Property("ShopName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Shops"); - }); - modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Client", b => { b.Property("Id") @@ -226,6 +199,33 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations b.ToTable("Orders"); }); + modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DateOpen") + .HasColumnType("datetime2"); + + b.Property("MaxCountFurnitures") + .HasColumnType("int"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.ShopFurniture", b => { b.Property("Id") @@ -294,7 +294,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.MessageInfo", b => { b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Client", "Client") - .WithMany("MessageInfos") + .WithMany("Messages") .HasForeignKey("ClientId"); b.Navigation("Client"); @@ -333,7 +333,7 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("BlacksmithWorkshopDatabaseImplement.Models.Shop", "Shop") + b.HasOne("FurnitureAssemblyDatabaseImplement.Models.Shop", "Shop") .WithMany("Furnitures") .HasForeignKey("ShopId") .OnDelete(DeleteBehavior.Cascade) @@ -344,14 +344,9 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations b.Navigation("Shop"); }); - modelBuilder.Entity("BlacksmithWorkshopDatabaseImplement.Models.Shop", b => - { - b.Navigation("Furnitures"); - }); - modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Client", b => { - b.Navigation("MessageInfos"); + b.Navigation("Messages"); b.Navigation("Orders"); }); @@ -370,6 +365,11 @@ namespace FurnitureAssemblyDatabaseImplement.Migrations b.Navigation("Orders"); }); + modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.Shop", b => + { + b.Navigation("Furnitures"); + }); + modelBuilder.Entity("FurnitureAssemblyDatabaseImplement.Models.WorkPiece", b => { b.Navigation("FurnitureWorkPieces"); diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs b/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs index 0082957..dcb09a7 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs @@ -35,7 +35,7 @@ namespace FurnitureAssemblyView Dock = DockStyle.Fill }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\NikBe\\source\\repos\\TP\\Hard\\Lab4\\FurnitureAssembly\\FurnitureAssemblyView\\ReportOrders.rdlc", FileMode.Open)); + reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); Controls.Clear(); Controls.Add(reportViewer); diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs b/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs index c86e8d4..a1e97ce 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs @@ -31,7 +31,7 @@ buttonAdd = new Button(); buttonUpdate = new Button(); buttonDelete = new Button(); - buttonRef = new Button(); + buttonRefresh = new Button(); dataGridView = new DataGridView(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -69,16 +69,16 @@ buttonDelete.UseVisualStyleBackColor = true; buttonDelete.Click += ButtonDelete_Click; // - // buttonRef + // buttonRefresh // - buttonRef.Location = new Point(561, 197); - buttonRef.Margin = new Padding(3, 2, 3, 2); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(100, 34); - buttonRef.TabIndex = 3; - buttonRef.Text = "Обновить"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; + buttonRefresh.Location = new Point(561, 197); + buttonRefresh.Margin = new Padding(3, 2, 3, 2); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(100, 34); + buttonRefresh.TabIndex = 3; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; // // dataGridView // @@ -97,7 +97,7 @@ AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(683, 338); Controls.Add(dataGridView); - Controls.Add(buttonRef); + Controls.Add(buttonRefresh); Controls.Add(buttonDelete); Controls.Add(buttonUpdate); Controls.Add(buttonAdd); @@ -114,7 +114,7 @@ private Button buttonAdd; private Button buttonUpdate; private Button buttonDelete; - private Button buttonRef; + private Button buttonRefresh; private DataGridView dataGridView; } } \ No newline at end of file diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs b/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs index 86bf4b4..2b748ff 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs @@ -40,7 +40,7 @@ namespace FurnitureAssemblyView var list = _logic.ReadList(null); // Растягиваем колонку Название на всю ширину, колонку Id скрываем - if(list != null) + if (list != null) { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; @@ -49,7 +49,7 @@ namespace FurnitureAssemblyView _logger.LogInformation("Загрузка заготовок"); } - catch(Exception ex) + catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки заготовок"); @@ -60,7 +60,7 @@ namespace FurnitureAssemblyView private void ButtonAdd_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormWorkPiece)); - + if (service is FormWorkPiece form) { if (form.ShowDialog() == DialogResult.OK) @@ -120,7 +120,7 @@ namespace FurnitureAssemblyView } } - private void ButtonRef_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { LoadData(); } diff --git a/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj b/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj index 1a4a110..2b32f11 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj +++ b/FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj @@ -26,6 +26,15 @@ Always + + Always + + + Always + + + Always + @@ -36,4 +45,10 @@ + + + Always + + + \ No newline at end of file