From e140add5e67f4ca62e0a489b8948051d2fa83feb Mon Sep 17 00:00:00 2001
From: bekodeg <andermag102@yandex.ru>
Date: Thu, 25 Apr 2024 22:54:59 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B2=203=20=D0=BE=D1=82=D1=87=D1=91=D1=82?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  4 +-
 SushiBar/SushiBar/SushiBar.csproj             | 40 +++++++++++++++++++
 .../SushiBarBusinessLogic.csproj              | 19 +++++++++
 .../SushiBarContracts.csproj                  | 13 ++++++
 .../SushiBarDataModels.csproj                 |  9 +++++
 .../Implements/OrderStorage.cs                |  3 +-
 .../SushiBarDatabaseImplement.csproj          | 29 ++++++++++++++
 .../SushiBarFileImplement.csproj              | 14 +++++++
 .../SushiBarListImplement.csproj              | 14 +++++++
 SushiBar/SushiBarView/SushiBarView.csproj     | 22 ++++++++++
 10 files changed, 163 insertions(+), 4 deletions(-)
 create mode 100644 SushiBar/SushiBar/SushiBar.csproj
 create mode 100644 SushiBar/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj
 create mode 100644 SushiBar/SushiBarContracts/SushiBarContracts.csproj
 create mode 100644 SushiBar/SushiBarDataModels/SushiBarDataModels.csproj
 create mode 100644 SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj
 create mode 100644 SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj
 create mode 100644 SushiBar/SushiBarListImplement/SushiBarListImplement.csproj
 create mode 100644 SushiBar/SushiBarView/SushiBarView.csproj

diff --git a/.gitignore b/.gitignore
index 3d05129..5945aca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -396,6 +396,4 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
-
-*.csproj
+*.sln.iml
\ No newline at end of file
diff --git a/SushiBar/SushiBar/SushiBar.csproj b/SushiBar/SushiBar/SushiBar.csproj
new file mode 100644
index 0000000..dfe9d68
--- /dev/null
+++ b/SushiBar/SushiBar/SushiBar.csproj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.16">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="NLog" Version="5.2.8" />
+    <PackageReference Include="NLog.Config" Version="4.7.15" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+    <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.19" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarBusinessLogic\SushiBarBusinessLogic.csproj" />
+    <ProjectReference Include="..\SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj" />
+    <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
+    <ProjectReference Include="..\SushiBarListImplement\SushiBarListImplement.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Report\ReportOrders.rdlc">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SushiBar/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj b/SushiBar/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj
new file mode 100644
index 0000000..2d6f82b
--- /dev/null
+++ b/SushiBar/SushiBarBusinessLogic/SushiBarBusinessLogic.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="MigraDoc.Rendering.Standard" Version="1.0.10" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/SushiBar/SushiBarContracts/SushiBarContracts.csproj b/SushiBar/SushiBarContracts/SushiBarContracts.csproj
new file mode 100644
index 0000000..ef52534
--- /dev/null
+++ b/SushiBar/SushiBarContracts/SushiBarContracts.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/SushiBar/SushiBarDataModels/SushiBarDataModels.csproj b/SushiBar/SushiBarDataModels/SushiBarDataModels.csproj
new file mode 100644
index 0000000..132c02c
--- /dev/null
+++ b/SushiBar/SushiBarDataModels/SushiBarDataModels.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs b/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs
index ff705a5..aaa3770 100644
--- a/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs
+++ b/SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs
@@ -24,7 +24,8 @@ namespace SushiBarDatabaseImplement.Implements
             return context.Orders
                     .Include(o => o.Sushi)
                     .Where(o => 
-                    (model.Id.HasValue && o.Id == model.Id))
+                    (model.Id.HasValue && o.Id == model.Id) || 
+                    (model.DateFrom.HasValue && model.DateTo.HasValue && model.DateFrom < o.DateCreate && o.DateCreate < model.DateTo))
                     .Select(o => o.GetViewModel)
                     .ToList();
         }
diff --git a/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj b/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj
new file mode 100644
index 0000000..2af36de
--- /dev/null
+++ b/SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Migrations - Копировать\**" />
+    <EmbeddedResource Remove="Migrations - Копировать\**" />
+    <None Remove="Migrations - Копировать\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj b/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj
new file mode 100644
index 0000000..00e2c96
--- /dev/null
+++ b/SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj b/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj
new file mode 100644
index 0000000..00e2c96
--- /dev/null
+++ b/SushiBar/SushiBarListImplement/SushiBarListImplement.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/SushiBar/SushiBarView/SushiBarView.csproj b/SushiBar/SushiBarView/SushiBarView.csproj
new file mode 100644
index 0000000..f855409
--- /dev/null
+++ b/SushiBar/SushiBarView/SushiBarView.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SushiBarBusinessLogic\SushiBarBusinessLogic.csproj" />
+    <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarListImplement\SushiBarListImplement.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file