From 1f38d579edf45df35fc62dbf4f19a697df252bf1 Mon Sep 17 00:00:00 2001 From: Danil Markov Date: Tue, 2 May 2023 22:25:24 +0400 Subject: [PATCH] vrode rabotaet, hz pravil'no li --- .../DI/ServiceProviderLoader.cs | 21 +- .../LawFirmDatabase.cs | 2 +- .../LawFirmDatabaseImplement.csproj | 12 +- .../20230424222203_lab7fix.Designer.cs | 298 ------------------ .../Migrations/20230424222203_lab7fix.cs | 22 -- ...ner.cs => 20230502163218_lab8.Designer.cs} | 4 +- ...4220206_lab7.cs => 20230502163218_lab8.cs} | 2 +- .../LawFirmFileImplement.csproj | 4 + .../LawFirmListImplement.csproj | 4 + LawFirm/LawFirmView/FormDocument.cs | 32 +- LawFirm/LawFirmView/Program.cs | 1 + 11 files changed, 47 insertions(+), 355 deletions(-) delete mode 100644 LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.Designer.cs delete mode 100644 LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.cs rename LawFirm/LawFirmDatabaseImplement/Migrations/{20230424220206_lab7.Designer.cs => 20230502163218_lab8.Designer.cs} (99%) rename LawFirm/LawFirmDatabaseImplement/Migrations/{20230424220206_lab7.cs => 20230502163218_lab8.cs} (99%) diff --git a/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs b/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs index 9d08a84..6b200ad 100644 --- a/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs +++ b/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace LawFirmContracts.DI { - public static partial class ServiceProviderLoader + public class ServiceProviderLoader { /// /// Загрузка всех классов-реализаций IImplementationExtension @@ -36,8 +36,7 @@ namespace LawFirmContracts.DI { var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; - if (newSource.Priority > - source.Priority) + if (newSource.Priority > source.Priority) { source = newSource; } @@ -49,14 +48,16 @@ namespace LawFirmContracts.DI } private static string TryGetImplementationExtensionsFolder() { - var localAppDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); - var implementationExtensionsFolder = Path.Combine(localAppDataFolder, "ImplementationExtensions"); - - if (!Directory.Exists(implementationExtensionsFolder)) + var directory = new + DirectoryInfo(Directory.GetCurrentDirectory()); + while (directory != null && + !directory.GetDirectories("ImplementationExtensions", + SearchOption.AllDirectories) + .Any(x => x.Name == "ImplementationExtensions")) { - Directory.CreateDirectory(implementationExtensionsFolder); + directory = directory.Parent; } - - return implementationExtensionsFolder; + return $"{directory?.FullName}\\ImplementationExtensions"; } + } } diff --git a/LawFirm/LawFirmDatabaseImplement/LawFirmDatabase.cs b/LawFirm/LawFirmDatabaseImplement/LawFirmDatabase.cs index c4b183c..8e5655e 100644 --- a/LawFirm/LawFirmDatabaseImplement/LawFirmDatabase.cs +++ b/LawFirm/LawFirmDatabaseImplement/LawFirmDatabase.cs @@ -12,7 +12,7 @@ namespace LawFirmDatabaseImplement optionsBuilder.UseNpgsql(@" Host=localhost; Port=5432; - Database=RPPLab7OneMore; + Database=RPPLab8; Username=postgres; Password=123"); } diff --git a/LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj b/LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj index 8739fd2..e926876 100644 --- a/LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj +++ b/LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj @@ -7,13 +7,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -25,4 +25,8 @@ + + + + diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.Designer.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.Designer.cs deleted file mode 100644 index 4b50b7a..0000000 --- a/LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.Designer.cs +++ /dev/null @@ -1,298 +0,0 @@ -// -using System; -using LawFirmDatabaseImplement; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -#nullable disable - -namespace LawFirmDatabaseImplement.Migrations -{ - [DbContext(typeof(LawFirmDatabase))] - [Migration("20230424222203_lab7fix")] - partial class lab7fix - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.3") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Blank", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("BlankName") - .IsRequired() - .HasColumnType("text"); - - b.Property("Price") - .HasColumnType("double precision"); - - b.HasKey("Id"); - - b.ToTable("Blanks"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("ClientFIO") - .IsRequired() - .HasColumnType("text"); - - b.Property("Email") - .IsRequired() - .HasColumnType("text"); - - b.Property("Password") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Clients"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Document", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("DocumentName") - .IsRequired() - .HasColumnType("text"); - - b.Property("Price") - .HasColumnType("double precision"); - - b.HasKey("Id"); - - b.ToTable("Documents"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("BlankId") - .HasColumnType("integer"); - - b.Property("Count") - .HasColumnType("integer"); - - b.Property("DocumentId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("BlankId"); - - b.HasIndex("DocumentId"); - - b.ToTable("DocumentBlanks"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Implementer", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("ImplementerFIO") - .IsRequired() - .HasColumnType("text"); - - b.Property("Password") - .IsRequired() - .HasColumnType("text"); - - b.Property("Qualification") - .HasColumnType("integer"); - - b.Property("WorkExperience") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.ToTable("Implementers"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Message", b => - { - b.Property("MessageId") - .HasColumnType("text"); - - b.Property("Body") - .IsRequired() - .HasColumnType("text"); - - b.Property("ClientId") - .HasColumnType("integer"); - - b.Property("DateDelivery") - .HasColumnType("timestamp with time zone"); - - b.Property("SenderName") - .IsRequired() - .HasColumnType("text"); - - b.Property("Subject") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("MessageId"); - - b.HasIndex("ClientId"); - - b.ToTable("Messages"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("ClientId") - .HasColumnType("integer"); - - b.Property("Count") - .HasColumnType("integer"); - - b.Property("DateCreate") - .HasColumnType("timestamp with time zone"); - - b.Property("DateImplement") - .HasColumnType("timestamp with time zone"); - - b.Property("DocumentId") - .HasColumnType("integer"); - - b.Property("ImplementerId") - .HasColumnType("integer"); - - b.Property("Status") - .HasColumnType("integer"); - - b.Property("Sum") - .HasColumnType("double precision"); - - b.HasKey("Id"); - - b.HasIndex("ClientId"); - - b.HasIndex("DocumentId"); - - b.HasIndex("ImplementerId"); - - b.ToTable("Orders"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b => - { - b.HasOne("LawFirmDatabaseImplement.Models.Blank", "Blank") - .WithMany("DocumentBlanks") - .HasForeignKey("BlankId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document") - .WithMany("Blanks") - .HasForeignKey("DocumentId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Blank"); - - b.Navigation("Document"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Message", b => - { - b.HasOne("LawFirmDatabaseImplement.Models.Client", "Client") - .WithMany("Messages") - .HasForeignKey("ClientId"); - - b.Navigation("Client"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b => - { - b.HasOne("LawFirmDatabaseImplement.Models.Client", "Client") - .WithMany("Orders") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document") - .WithMany("Orders") - .HasForeignKey("DocumentId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("LawFirmDatabaseImplement.Models.Implementer", "Implementer") - .WithMany("Orders") - .HasForeignKey("ImplementerId"); - - b.Navigation("Client"); - - b.Navigation("Document"); - - b.Navigation("Implementer"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Blank", b => - { - b.Navigation("DocumentBlanks"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Client", b => - { - b.Navigation("Messages"); - - b.Navigation("Orders"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Document", b => - { - b.Navigation("Blanks"); - - b.Navigation("Orders"); - }); - - modelBuilder.Entity("LawFirmDatabaseImplement.Models.Implementer", b => - { - b.Navigation("Orders"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.cs deleted file mode 100644 index d480748..0000000 --- a/LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace LawFirmDatabaseImplement.Migrations -{ - /// - public partial class lab7fix : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - - } - } -} diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/20230424220206_lab7.Designer.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/20230502163218_lab8.Designer.cs similarity index 99% rename from LawFirm/LawFirmDatabaseImplement/Migrations/20230424220206_lab7.Designer.cs rename to LawFirm/LawFirmDatabaseImplement/Migrations/20230502163218_lab8.Designer.cs index b1141fd..d750a19 100644 --- a/LawFirm/LawFirmDatabaseImplement/Migrations/20230424220206_lab7.Designer.cs +++ b/LawFirm/LawFirmDatabaseImplement/Migrations/20230502163218_lab8.Designer.cs @@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace LawFirmDatabaseImplement.Migrations { [DbContext(typeof(LawFirmDatabase))] - [Migration("20230424220206_lab7")] - partial class lab7 + [Migration("20230502163218_lab8")] + partial class lab8 { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/LawFirm/LawFirmDatabaseImplement/Migrations/20230424220206_lab7.cs b/LawFirm/LawFirmDatabaseImplement/Migrations/20230502163218_lab8.cs similarity index 99% rename from LawFirm/LawFirmDatabaseImplement/Migrations/20230424220206_lab7.cs rename to LawFirm/LawFirmDatabaseImplement/Migrations/20230502163218_lab8.cs index 7c87588..837bdd0 100644 --- a/LawFirm/LawFirmDatabaseImplement/Migrations/20230424220206_lab7.cs +++ b/LawFirm/LawFirmDatabaseImplement/Migrations/20230502163218_lab8.cs @@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace LawFirmDatabaseImplement.Migrations { /// - public partial class lab7 : Migration + public partial class lab8 : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) diff --git a/LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj b/LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj index ae91b17..1b93552 100644 --- a/LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj +++ b/LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj b/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj index d14d455..3b7add3 100644 --- a/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj +++ b/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/LawFirm/LawFirmView/FormDocument.cs b/LawFirm/LawFirmView/FormDocument.cs index 2367847..3fd6501 100644 --- a/LawFirm/LawFirmView/FormDocument.cs +++ b/LawFirm/LawFirmView/FormDocument.cs @@ -78,24 +78,22 @@ namespace LawFirmView { if (form.BlankModel == null) { - if (form.BlankModel == null) - { - return; - } - _logger.LogInformation("Добавление нового бланка:{BlankName} - { Count}", - form.BlankModel.BlankName, form.Count); - if (_documentBlanks.ContainsKey(form.Id)) - { - _documentBlanks[form.Id] = (form.BlankModel, - form.Count); - } - else - { - _documentBlanks.Add(form.Id, (form.BlankModel, - form.Count)); - } - LoadData(); + return; } + _logger.LogInformation("Добавление нового бланка:{BlankName} - { Count}", + form.BlankModel.BlankName, form.Count); + if (_documentBlanks.ContainsKey(form.Id)) + { + _documentBlanks[form.Id] = (form.BlankModel, + form.Count); + } + else + { + _documentBlanks.Add(form.Id, (form.BlankModel, + form.Count)); + } + LoadData(); + } } private void ButtonUpd_Click(object sender, EventArgs e) diff --git a/LawFirm/LawFirmView/Program.cs b/LawFirm/LawFirmView/Program.cs index fa3b5b5..cba59b0 100644 --- a/LawFirm/LawFirmView/Program.cs +++ b/LawFirm/LawFirmView/Program.cs @@ -98,6 +98,7 @@ namespace LawFirmView BackUpLogic>(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType();