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 @@
+
+
+
+ WinExe
+ net6.0-windows
+ enable
+ true
+ enable
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PreserveNewest
+
+
+ Always
+
+
+
+
\ 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 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
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 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
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 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
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 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
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 @@
+
+
+
+ WinExe
+ net6.0-windows
+ enable
+ true
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file