From f26446748bc2f558645e6f1a8780e906e73684f8 Mon Sep 17 00:00:00 2001
From: AnnZhimol <ankavanka731@gmail.com>
Date: Fri, 19 May 2023 16:59:42 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D0=B2=D0=BE=D0=B4=D0=B8=D0=BC=20?=
 =?UTF-8?q?=D0=BA=D1=80=D0=B0=D1=81=D0=BE=D1=82=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessLogics/ReportLogicOrganiser.cs       |  2 --
 .../OfficePackage/AbstractSaveToPdfOrganiser.cs  | 12 +++++++++++-
 Hotel/HotelDataBaseImplement/HotelDataBase.cs    |  2 +-
 .../Controllers/HomeController.cs                | 16 ++++++++++++++--
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicOrganiser.cs b/Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicOrganiser.cs
index bd2c6a0..2a9d0c4 100644
--- a/Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicOrganiser.cs
+++ b/Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicOrganiser.cs
@@ -92,8 +92,6 @@ namespace HotelBusinessLogic.BusinessLogics
                 OrganiserId = model.OrganiserId,
             });
 
-            double sum = 0;
-
             foreach (var mealPlan in listMealPlans)
             {
                 foreach (var mp in mealPlan.MealPlanMembers.Values)
diff --git a/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfOrganiser.cs b/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfOrganiser.cs
index 4fd3871..423577e 100644
--- a/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfOrganiser.cs
+++ b/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfOrganiser.cs
@@ -29,9 +29,19 @@ namespace HotelBusinessLogic.OfficePackage
             });
             foreach (var member in info.Members)
             {
+                bool IsDate = true;
+                if (member.StartDate.ToShortDateString() == "01.01.0001")
+                {
+                    IsDate = false;
+                }
+                bool IsCost = true;
+                if (member.MealPlanPrice.ToString() == "0")
+                {
+                    IsCost = false;
+                }
                 CreateRow(new PdfRowParameters
                 {
-                    Texts = new List<string> { member.MemberFIO, member.ConferenceName, member.StartDate.ToShortDateString(), member.MealPlanName, member.MealPlanPrice.ToString() },
+                    Texts = new List<string> { member.MemberFIO, member.ConferenceName, IsDate is true ? member.StartDate.ToShortDateString() : string.Empty, member.MealPlanName, IsCost is true ? member.MealPlanPrice.ToString() : string.Empty },
                     Style = "Normal",
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
diff --git a/Hotel/HotelDataBaseImplement/HotelDataBase.cs b/Hotel/HotelDataBaseImplement/HotelDataBase.cs
index 7141379..6d7ccea 100644
--- a/Hotel/HotelDataBaseImplement/HotelDataBase.cs
+++ b/Hotel/HotelDataBaseImplement/HotelDataBase.cs
@@ -9,7 +9,7 @@ namespace HotelDataBaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-V0ON61E\SQLEXPRESS;Initial Catalog=HotelDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-VG5USAH\SQLEXPRESS;Initial Catalog=HotelDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }
diff --git a/Hotel/HotelOrganiserApp/Controllers/HomeController.cs b/Hotel/HotelOrganiserApp/Controllers/HomeController.cs
index 1f354af..a825f25 100644
--- a/Hotel/HotelOrganiserApp/Controllers/HomeController.cs
+++ b/Hotel/HotelOrganiserApp/Controllers/HomeController.cs
@@ -11,6 +11,7 @@ using HotelBusinessLogic.BusinessLogics;
 using HotelContracts.BusinessLogicsContracts;
 using System.Linq;
 using DocumentFormat.OpenXml.Wordprocessing;
+using DocumentFormat.OpenXml.Bibliography;
 
 namespace HotelOrganiserApp.Controllers
 {
@@ -154,6 +155,7 @@ namespace HotelOrganiserApp.Controllers
                 _logger.LogError(ex, "Ошибка создания отчета");
                 throw;
             }
+            
             double sum = 0;
             string table = "";
             table += $"<h2 class=\"u-text u-text-custom-color-1 u-text-default u-text-1\">Предварительный отчет</h2>";
@@ -176,13 +178,23 @@ namespace HotelOrganiserApp.Controllers
             table += "</thead>";
             foreach (var report in result)
             {
+                bool IsDate = true;
+                if (report.StartDate.ToShortDateString() == "01.01.0001")
+                {
+                    IsDate = false;
+                }
+                bool IsCost = true;
+                if (report.MealPlanPrice.ToString() == "0")
+                {
+                    IsCost = false;
+                }
                 table += "<tbody class=\"u-table-body\">";
                 table += "<tr style=\"height: 75px\">";
                 table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.MemberFIO}</td>";
                 table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.ConferenceName}</td>";
-                table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.StartDate}</td>";
+                table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{(IsDate is true ? report.StartDate.ToShortDateString() : string.Empty)}</td>";
                 table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.MealPlanName}</td>";
-                table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.MealPlanPrice}</td>";
+                table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{(IsCost is true ? report.MealPlanPrice.ToString(): string.Empty)}</td>";
                 table += "</tr>";
                 table += "</tbody>";
                 sum+= report.MealPlanPrice;