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 { member.MemberFIO, member.ConferenceName, member.StartDate.ToShortDateString(), member.MealPlanName, member.MealPlanPrice.ToString() }, + Texts = new List { 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 += $"

Предварительный отчет

"; @@ -176,13 +178,23 @@ namespace HotelOrganiserApp.Controllers table += ""; 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 += ""; table += ""; table += $"{report.MemberFIO}"; table += $"{report.ConferenceName}"; - table += $"{report.StartDate}"; + table += $"{(IsDate is true ? report.StartDate.ToShortDateString() : string.Empty)}"; table += $"{report.MealPlanName}"; - table += $"{report.MealPlanPrice}"; + table += $"{(IsCost is true ? report.MealPlanPrice.ToString(): string.Empty)}"; table += ""; table += ""; sum+= report.MealPlanPrice;