vrode rabotaet, hz pravil'no li

LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace LawFirmContracts.DI
 {
-	public static partial class ServiceProviderLoader
+	public class ServiceProviderLoader
 	{
 		/// <summary>
 		/// Загрузка всех классов-реализаций IImplementationExtension
@@ -36,8 +36,7 @@ namespace LawFirmContracts.DI
 						{
 							var newSource =
 							(IImplementationExtension)Activator.CreateInstance(t)!;
-							if (newSource.Priority >
+							if (newSource.Priority > source.Priority)
-							source.Priority)
 							{
 								source = newSource;
 							}
@@ -49,14 +48,16 @@ namespace LawFirmContracts.DI
 		}
 		private static string TryGetImplementationExtensionsFolder()
 		{
-			var localAppDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+			var directory = new
-			var implementationExtensionsFolder = Path.Combine(localAppDataFolder, "ImplementationExtensions");
+			DirectoryInfo(Directory.GetCurrentDirectory());
-
+			while (directory != null &&
-			if (!Directory.Exists(implementationExtensionsFolder))
+			!directory.GetDirectories("ImplementationExtensions",
+			SearchOption.AllDirectories)
+			.Any(x => x.Name == "ImplementationExtensions"))
 			{
-				Directory.CreateDirectory(implementationExtensionsFolder);
+				directory = directory.Parent;
 			}
-
+			return $"{directory?.FullName}\\ImplementationExtensions";
-			return implementationExtensionsFolder;
 		}
+	}
 }

LawFirm/LawFirmDatabaseImplement/LawFirmDatabase.cs

@@ -12,7 +12,7 @@ namespace LawFirmDatabaseImplement
                 optionsBuilder.UseNpgsql(@"
                     Host=localhost;
                     Port=5432;
-                    Database=RPPLab7OneMore;
+                    Database=RPPLab8;
                     Username=postgres;
                     Password=123");
             }

LawFirm/LawFirmDatabaseImplement/LawFirmDatabaseImplement.csproj

@@ -7,13 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,4 +25,8 @@
     <Folder Include="Migrations\" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+  </Target>
+
 </Project>

LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.Designer.cs

@@ -1,298 +0,0 @@
-// <auto-generated />
-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
-    {
-        /// <inheritdoc />
-        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<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("BlankName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Blanks");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Document", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("DocumentName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Documents");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("BlankId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("DocumentId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BlankId");
-
-                    b.HasIndex("DocumentId");
-
-                    b.ToTable("DocumentBlanks");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Message", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Messages");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("timestamp with time zone");
-
-                    b.Property<int>("DocumentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<double>("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
-        }
-    }
-}

LawFirm/LawFirmDatabaseImplement/Migrations/20230424222203_lab7fix.cs

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

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")]
+    [Migration("20230502163218_lab8")]
-    partial class lab7
+    partial class lab8
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

LawFirm/LawFirmDatabaseImplement/Migrations/20230502163218_lab8.cs

@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace LawFirmDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class lab7 : Migration
+    public partial class lab8 : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)

LawFirm/LawFirmFileImplement/LawFirmFileImplement.csproj

@@ -11,4 +11,8 @@
     <ProjectReference Include="..\LawFirmDataModel\LawFirmDataModel.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+  </Target>
+
 </Project>

LawFirm/LawFirmListImplement/LawFirmListImplement.csproj

@@ -11,4 +11,8 @@
     <ProjectReference Include="..\LawFirmDataModel\LawFirmDataModel.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
+  </Target>
+
 </Project>

LawFirm/LawFirmView/FormDocument.cs

@@ -78,24 +78,22 @@ namespace LawFirmView
 			{
                 if (form.BlankModel == null)
                 {
-                    if (form.BlankModel == null)
+                    return;
-                    {
-                        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();
                 }
+                _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)

LawFirm/LawFirmView/Program.cs

@@ -98,6 +98,7 @@ namespace LawFirmView
 			BackUpLogic>();
 			DependencyManager.Instance.RegisterType<FormMain>();
 			DependencyManager.Instance.RegisterType<FormBlank>();
+			DependencyManager.Instance.RegisterType<FormBlanks>();
 			DependencyManager.Instance.RegisterType<FormDocuments>();
 			DependencyManager.Instance.RegisterType<FormCreateOrder>();
 			DependencyManager.Instance.RegisterType<FormDocument>();