diff --git a/CarCenter/CarCenterBusinessLogic/CarCenterBusinessLogic.csproj b/CarCenter/CarCenterBusinessLogic/CarCenterBusinessLogic.csproj index 2f2461b..ece1760 100644 --- a/CarCenter/CarCenterBusinessLogic/CarCenterBusinessLogic.csproj +++ b/CarCenter/CarCenterBusinessLogic/CarCenterBusinessLogic.csproj @@ -7,7 +7,10 @@ + + + diff --git a/CarCenter/CarCenterBusinessLogic/MailWorker/AbstractMailWorker.cs b/CarCenter/CarCenterBusinessLogic/MailWorker/AbstractMailWorker.cs new file mode 100644 index 0000000..9009356 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -0,0 +1,53 @@ +using CarCenterContracts.BindingModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.MailWorker +{ + public abstract class AbstractMailWorker + { + protected string _mailLogin = string.Empty; + protected string _mailPassword = string.Empty; + protected string _smtpClientHost = string.Empty; + protected int _smtpClientPort; + protected string _popHost = string.Empty; + protected int _popPort; + private readonly ILogger _logger; + public AbstractMailWorker(ILogger logger) + { + _logger = logger; + } + public void MailConfig(MailConfigModel config) + { + _mailLogin = config.MailLogin; + _mailPassword = config.MailPassword; + _smtpClientHost = config.SmtpClientHost; + _smtpClientPort = config.SmtpClientPort; + _popHost = config.PopHost; + _popPort = config.PopPort; + _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPort}, {popHost}, {popPort} ", _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort); + } + public async void MailSendAsync(MailSendInfoModel info) + { + if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword)) + { + return; + } + if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0) + { + return; + } + if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || (string.IsNullOrEmpty(info.Text) && info.Pdf == null)) + { + return; + } + _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject); + await SendMailAsync(info); + } + protected abstract Task SendMailAsync(MailSendInfoModel info); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/MailWorker/MailKitWorker.cs b/CarCenter/CarCenterBusinessLogic/MailWorker/MailKitWorker.cs new file mode 100644 index 0000000..69c6ddb --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/MailWorker/MailKitWorker.cs @@ -0,0 +1,48 @@ +using CarCenterContracts.BindingModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Mail; +using System.Net; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.MailWorker +{ + public class MailKitWorker : AbstractMailWorker + { + public MailKitWorker(ILogger logger) : base(logger) { } + protected override async Task SendMailAsync(MailSendInfoModel info) + { + using var objMailMessage = new MailMessage(); + using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort); + try + { + objMailMessage.From = new MailAddress(_mailLogin); + objMailMessage.To.Add(new MailAddress(info.MailAddress)); + objMailMessage.Subject = info.Subject; + objMailMessage.SubjectEncoding = Encoding.UTF8; + objMailMessage.BodyEncoding = Encoding.UTF8; + if (info.Text != null) + { + objMailMessage.Body = info.Text; + } + if (info.Pdf != null) + { + var attachment = new Attachment(new MemoryStream(info.Pdf), info.FileName); + objMailMessage.Attachments.Add(attachment); + } + objSmtpClient.UseDefaultCredentials = false; + objSmtpClient.EnableSsl = true; + objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network; + objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword); + await Task.Run(() => objSmtpClient.Send(objMailMessage)); + } + catch (Exception ex) + { + throw; + } + } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcel.cs new file mode 100644 index 0000000..6b22082 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -0,0 +1,17 @@ +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToExcel + { + protected abstract void CreateExcel(ExcelInfo info); + protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams); + protected abstract void MergeCells(ExcelMergeParameters excelParams); + protected abstract void SaveExcel(ExcelInfo info); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcelStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcelStorekeeper.cs new file mode 100644 index 0000000..5ad1155 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcelStorekeeper.cs @@ -0,0 +1,99 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToExcelStorekeeper + { + public void CreateReport(ExcelInfoStorekeeper info) + { + CreateExcel(info); + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = 1, + Text = info.Title, + StyleInfo = ExcelStyleInfoType.Title + }); + + MergeCells(new ExcelMergeParameters + { + CellFromName = "A1", + CellToName = "C1" + }); + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = 2, + Text = "Автомобили", + StyleInfo = ExcelStyleInfoType.Title + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = 2, + Text = "Предпродажные", + StyleInfo = ExcelStyleInfoType.Title + }); + + MergeCells(new ExcelMergeParameters + { + CellFromName = "B2", + CellToName = ColumnLetter(info.maxleng + 1) + "2" + }); + uint rowIndex = 3; + foreach (var pc in info.carPresalesReport) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = pc.CarId.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + int place = 2; + foreach (var workshop in pc.Presales) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = ColumnLetter(place), + RowIndex = rowIndex, + Text = workshop, + StyleInfo = ExcelStyleInfoType.TextWithBorder + }); + + place++; + } + rowIndex++; + } + + SaveExcel(info); + } + private static string ColumnLetter(int columnIndex) + { + int dividend = columnIndex; + string columnName = String.Empty; + int modulo; + + while (dividend > 0) + { + modulo = (dividend - 1) % 26; + columnName = Convert.ToChar(65 + modulo).ToString() + columnName; + dividend = (dividend - modulo) / 26; + } + + return columnName; + } + protected abstract void CreateExcel(ExcelInfoStorekeeper info); + protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams); + protected abstract void MergeCells(ExcelMergeParameters excelParams); + protected abstract void SaveExcel(ExcelInfoStorekeeper info); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdf.cs new file mode 100644 index 0000000..e28e1ec --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -0,0 +1,22 @@ +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToPdf + { + protected abstract void CreatePdf(PdfInfo info); + + protected abstract void CreateParagraph(PdfParagraph paragraph); + + protected abstract void CreateTable(List columns); + + protected abstract void CreateRow(PdfRowParameters rowParameters); + + protected abstract void SavePdf(PdfInfo info); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs new file mode 100644 index 0000000..2c386e7 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs @@ -0,0 +1,68 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToPdfStorekeeper + { + public void CreateDoc(PdfInfoStorekeeper info) + { + CreatePdf(info); + CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); + CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center }); + + CreateTable(new List { "5cm", "10cm" }); + + foreach (var report in info.reportBundling) + { + CreateRow(new PdfRowParameters + { + Texts = new List { "Номер комплектации", "Покупка" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + CreateRow(new PdfRowParameters + { + Texts = new List { report.BundlingId.ToString(), "" }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + foreach (var product in report.Orders) + CreateRow(new PdfRowParameters + { + Texts = new List { "", product }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + CreateRow(new PdfRowParameters + { + Texts = new List { "", "Особенности" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + foreach (var production in report.Features) + CreateRow(new PdfRowParameters + { + Texts = new List { "", production }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + SavePdf(info); + } + protected abstract void CreatePdf(PdfInfoStorekeeper info); + + protected abstract void CreateParagraph(PdfParagraph paragraph); + + protected abstract void CreateTable(List columns); + + protected abstract void CreateRow(PdfRowParameters rowParameters); + + protected abstract void SavePdf(PdfInfoStorekeeper info); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWord.cs new file mode 100644 index 0000000..11fa502 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -0,0 +1,16 @@ +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToWord + { + protected abstract void CreateWord(WordInfo info); + protected abstract void CreateParagraph(WordParagraph paragraph); + protected abstract void SaveWord(WordInfo info); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWordStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWordStorekeeper.cs new file mode 100644 index 0000000..2447c06 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWordStorekeeper.cs @@ -0,0 +1,45 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToWordStorekeeper + { + public void CreateDoc(WordInfoStorekeeper info) + { + CreateWord(info); + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> + { + (info.Title, new WordTextProperties { Bold = true, Size = "24", }) + }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + foreach (var report in info.carPresalesReport) + { + CreateNumberedParagraph(1, 0, report.CarId.ToString()); + foreach (var workshop in report.Presales) + { + CreateNumberedParagraph(1, 1, workshop); + } + + } + + SaveWord(info); + } + protected abstract void CreateWord(WordInfoStorekeeper info); + protected abstract void CreateParagraph(WordParagraph paragraph); + protected abstract void CreateNumberedParagraph(int numId, int ilvl, string text); + protected abstract void SaveWord(WordInfoStorekeeper info); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs new file mode 100644 index 0000000..4881403 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperEnums +{ + public enum ExcelStyleInfoType + { + Title, + Text, + TextWithBorder + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs new file mode 100644 index 0000000..0f89ae5 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperEnums +{ + public enum PdfParagraphAlignmentType + { + Center, + Left, + Right + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs new file mode 100644 index 0000000..121083d --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperEnums +{ + public enum WordJustificationType + { + Center, + Both + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs new file mode 100644 index 0000000..b1308db --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs @@ -0,0 +1,18 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelCellParameters + { + public string ColumnName { get; set; } = string.Empty; + public uint RowIndex { get; set; } + public string Text { get; set; } = string.Empty; + public string CellReference => $"{ColumnName}{RowIndex}"; + public ExcelStyleInfoType StyleInfo { get; set; } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs new file mode 100644 index 0000000..d1cf381 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfoStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfoStorekeeper.cs new file mode 100644 index 0000000..daceb33 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfoStorekeeper.cs @@ -0,0 +1,17 @@ +using CarCenterContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelInfoStorekeeper + { + public MemoryStream memoryStream { get; set; } = new MemoryStream(); + public string Title { get; set; } = string.Empty; + public List carPresalesReport { get; set; } = new(); + public int maxleng { get; set; } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs new file mode 100644 index 0000000..06b0bb2 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelMergeParameters + { + public string CellFromName { get; set; } = string.Empty; + public string CellToName { get; set; } = string.Empty; + public string Merge => $"{CellFromName}:{CellToName}"; + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs new file mode 100644 index 0000000..dcef669 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class PdfInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public DateTime DateFrom { get; set; } + public DateTime DateTo { get; set; } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfoStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfoStorekeeper.cs new file mode 100644 index 0000000..f220739 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfoStorekeeper.cs @@ -0,0 +1,18 @@ +using CarCenterContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class PdfInfoStorekeeper + { + public MemoryStream FileName { get; set; } = new(); + public string Title { get; set; } = string.Empty; + public DateTime DateFrom { get; set; } + public DateTime DateTo { get; set; } + public List reportBundling { get; set; } = new(); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs new file mode 100644 index 0000000..da984e6 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs @@ -0,0 +1,16 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class PdfParagraph + { + public string Text { get; set; } = string.Empty; + public string Style { get; set; } = string.Empty; + public PdfParagraphAlignmentType ParagraphAlignment { get; set; } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs new file mode 100644 index 0000000..fb2c6c5 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs @@ -0,0 +1,16 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class PdfRowParameters + { + public List Texts { get; set; } = new(); + public string Style { get; set; } = string.Empty; + public PdfParagraphAlignmentType ParagraphAlignment { get; set; } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfo.cs new file mode 100644 index 0000000..c6859f2 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class WordInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfoStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfoStorekeeper.cs new file mode 100644 index 0000000..fa7d018 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfoStorekeeper.cs @@ -0,0 +1,16 @@ +using CarCenterContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class WordInfoStorekeeper + { + public MemoryStream memoryStream { get; set; } = new MemoryStream(); + public string Title { get; set; } = string.Empty; + public List carPresalesReport { get; set; } = new(); + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs new file mode 100644 index 0000000..48112a6 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class WordParagraph + { + public List<(string, WordTextProperties)> Texts { get; set; } = new(); + public WordTextProperties? TextProperties { get; set; } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs new file mode 100644 index 0000000..95afa3c --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs @@ -0,0 +1,16 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.HelperModels +{ + public class WordTextProperties + { + public string Size { get; set; } = string.Empty; + public bool Bold { get; set; } + public WordJustificationType JustificationType { get; set; } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToExcellStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToExcellStorekeeper.cs new file mode 100644 index 0000000..fcacce7 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToExcellStorekeeper.cs @@ -0,0 +1,288 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using DocumentFormat.OpenXml.Office2010.Excel; +using DocumentFormat.OpenXml.Office2013.Excel; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using DocumentFormat.OpenXml; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.Implements +{ + public class SaveToExcelStorekeeper : AbstractSaveToExcelStorekeeper + { + private SpreadsheetDocument? _spreadsheetDocument; + + private SharedStringTablePart? _shareStringPart; + + private Worksheet? _worksheet; + + private static void CreateStyles(WorkbookPart workbookpart) + { + var sp = workbookpart.AddNewPart(); + sp.Stylesheet = new Stylesheet(); + + var fonts = new Fonts() { Count = 2U, KnownFonts = true }; + + var fontUsual = new Font(); + fontUsual.Append(new FontSize() { Val = 12D }); + fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U }); + fontUsual.Append(new FontName() { Val = "Times New Roman" }); + fontUsual.Append(new FontFamilyNumbering() { Val = 2 }); + fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + + var fontTitle = new Font(); + fontTitle.Append(new Bold()); + fontTitle.Append(new FontSize() { Val = 14D }); + fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U }); + fontTitle.Append(new FontName() { Val = "Times New Roman" }); + fontTitle.Append(new FontFamilyNumbering() { Val = 2 }); + fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + + fonts.Append(fontUsual); + fonts.Append(fontTitle); + + var fills = new Fills() { Count = 2U }; + + var fill1 = new Fill(); + fill1.Append(new PatternFill() { PatternType = PatternValues.None }); + + var fill2 = new Fill(); + fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 }); + + fills.Append(fill1); + fills.Append(fill2); + + var borders = new Borders() { Count = 2U }; + + var borderNoBorder = new Border(); + borderNoBorder.Append(new LeftBorder()); + borderNoBorder.Append(new RightBorder()); + borderNoBorder.Append(new TopBorder()); + borderNoBorder.Append(new BottomBorder()); + borderNoBorder.Append(new DiagonalBorder()); + + var borderThin = new Border(); + + var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin }; + leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + + var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin }; + rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + + var topBorder = new TopBorder() { Style = BorderStyleValues.Thin }; + topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + + var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin }; + bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + + borderThin.Append(leftBorder); + borderThin.Append(rightBorder); + borderThin.Append(topBorder); + borderThin.Append(bottomBorder); + borderThin.Append(new DiagonalBorder()); + + borders.Append(borderNoBorder); + borders.Append(borderThin); + + var cellStyleFormats = new CellStyleFormats() { Count = 1U }; + var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U }; + + cellStyleFormats.Append(cellFormatStyle); + + var cellFormats = new CellFormats() { Count = 3U }; + var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true }; + var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true }; + var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true }; + + cellFormats.Append(cellFormatFont); + cellFormats.Append(cellFormatFontAndBorder); + cellFormats.Append(cellFormatTitle); + + var cellStyles = new CellStyles() { Count = 1U }; + + cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U }); + + var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U }; + + var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" }; + + var stylesheetExtensionList = new StylesheetExtensionList(); + + var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" }; + stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"); + stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" }); + + var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" }; + stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"); + stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" }); + + stylesheetExtensionList.Append(stylesheetExtension1); + stylesheetExtensionList.Append(stylesheetExtension2); + + sp.Stylesheet.Append(fonts); + sp.Stylesheet.Append(fills); + sp.Stylesheet.Append(borders); + sp.Stylesheet.Append(cellStyleFormats); + sp.Stylesheet.Append(cellFormats); + sp.Stylesheet.Append(cellStyles); + sp.Stylesheet.Append(differentialFormats); + sp.Stylesheet.Append(tableStyles); + sp.Stylesheet.Append(stylesheetExtensionList); + } + + private static uint GetStyleValue(ExcelStyleInfoType styleInfo) + { + return styleInfo switch + { + ExcelStyleInfoType.Title => 2U, + ExcelStyleInfoType.TextWithBorder => 1U, + ExcelStyleInfoType.Text => 0U, + _ => 0U, + }; + } + + protected override void CreateExcel(ExcelInfoStorekeeper info) + { + _spreadsheetDocument = SpreadsheetDocument.Create(info.memoryStream, SpreadsheetDocumentType.Workbook); + // Создаем книгу (в ней хранятся листы) + var workbookpart = _spreadsheetDocument.AddWorkbookPart(); + workbookpart.Workbook = new Workbook(); + + CreateStyles(workbookpart); + + // Получаем/создаем хранилище текстов для книги + _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any() + ? _spreadsheetDocument.WorkbookPart.GetPartsOfType().First() + : _spreadsheetDocument.WorkbookPart.AddNewPart(); + + // Создаем SharedStringTable, если его нет + if (_shareStringPart.SharedStringTable == null) + { + _shareStringPart.SharedStringTable = new SharedStringTable(); + } + + // Создаем лист в книгу + var worksheetPart = workbookpart.AddNewPart(); + worksheetPart.Worksheet = new Worksheet(new SheetData()); + + // Добавляем лист в книгу + var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets()); + var sheet = new Sheet() + { + Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart), + SheetId = 1, + Name = "Лист" + }; + sheets.Append(sheet); + + _worksheet = worksheetPart.Worksheet; + } + + protected override void InsertCellInWorksheet(ExcelCellParameters excelParams) + { + if (_worksheet == null || _shareStringPart == null) + { + return; + } + var sheetData = _worksheet.GetFirstChild(); + if (sheetData == null) + { + return; + } + + // Ищем строку, либо добавляем ее + Row row; + if (sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).Any()) + { + row = sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).First(); + } + else + { + row = new Row() { RowIndex = excelParams.RowIndex }; + sheetData.Append(row); + } + + // Ищем нужную ячейку + Cell cell; + if (row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).Any()) + { + cell = row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).First(); + } + else + { + // Все ячейки должны быть последовательно друг за другом расположены + // нужно определить, после какой вставлять + Cell? refCell = null; + foreach (Cell rowCell in row.Elements()) + { + if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0) + { + refCell = rowCell; + break; + } + } + + var newCell = new Cell() { CellReference = excelParams.CellReference }; + row.InsertBefore(newCell, refCell); + + cell = newCell; + } + + // вставляем новый текст + _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text))); + _shareStringPart.SharedStringTable.Save(); + + cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements().Count() - 1).ToString()); + cell.DataType = new EnumValue(CellValues.SharedString); + cell.StyleIndex = GetStyleValue(excelParams.StyleInfo); + } + + protected override void MergeCells(ExcelMergeParameters excelParams) + { + if (_worksheet == null) + { + return; + } + MergeCells mergeCells; + + if (_worksheet.Elements().Any()) + { + mergeCells = _worksheet.Elements().First(); + } + else + { + mergeCells = new MergeCells(); + + if (_worksheet.Elements().Any()) + { + _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First()); + } + else + { + _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First()); + } + } + + var mergeCell = new MergeCell() + { + Reference = new StringValue(excelParams.Merge) + }; + mergeCells.Append(mergeCell); + } + + protected override void SaveExcel(ExcelInfoStorekeeper info) + { + if (_spreadsheetDocument == null) + { + return; + } + _spreadsheetDocument.WorkbookPart!.Workbook.Save(); + _spreadsheetDocument.Dispose(); + } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToPdfStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToPdfStorekeeper.cs new file mode 100644 index 0000000..3b6c07d --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToPdfStorekeeper.cs @@ -0,0 +1,119 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using MigraDoc.DocumentObjectModel; +using MigraDoc.DocumentObjectModel.Tables; +using MigraDoc.Rendering; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.Implements +{ + public class SaveToPdfStorekeeper : AbstractSaveToPdfStorekeeper + { + private Document? _document; + + private Section? _section; + + private Table? _table; + + private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type) + { + return type switch + { + PdfParagraphAlignmentType.Center => ParagraphAlignment.Center, + PdfParagraphAlignmentType.Left => ParagraphAlignment.Left, + PdfParagraphAlignmentType.Right => ParagraphAlignment.Right, + _ => ParagraphAlignment.Justify, + }; + } + + /// + /// Создание стилей для документа + /// + /// + private static void DefineStyles(Document document) + { + var style = document.Styles["Normal"]; + style.Font.Name = "Times New Roman"; + style.Font.Size = 14; + + style = document.Styles.AddStyle("NormalTitle", "Normal"); + style.Font.Bold = true; + } + + protected override void CreatePdf(PdfInfoStorekeeper info) + { + _document = new Document(); + DefineStyles(_document); + + _section = _document.AddSection(); + } + + protected override void CreateParagraph(PdfParagraph pdfParagraph) + { + if (_section == null) + { + return; + } + var paragraph = _section.AddParagraph(pdfParagraph.Text); + paragraph.Format.SpaceAfter = "1cm"; + paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment); + paragraph.Style = pdfParagraph.Style; + } + + protected override void CreateTable(List columns) + { + if (_document == null) + { + return; + } + _table = _document.LastSection.AddTable(); + + foreach (var elem in columns) + { + _table.AddColumn(elem); + } + } + + protected override void CreateRow(PdfRowParameters rowParameters) + { + if (_table == null) + { + return; + } + var row = _table.AddRow(); + for (int i = 0; i < rowParameters.Texts.Count; ++i) + { + row.Cells[i].AddParagraph(rowParameters.Texts[i]); + + if (!string.IsNullOrEmpty(rowParameters.Style)) + { + row.Cells[i].Style = rowParameters.Style; + } + + Unit borderWidth = 0.5; + + row.Cells[i].Borders.Left.Width = borderWidth; + row.Cells[i].Borders.Right.Width = borderWidth; + row.Cells[i].Borders.Top.Width = borderWidth; + row.Cells[i].Borders.Bottom.Width = borderWidth; + + row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment); + row.Cells[i].VerticalAlignment = VerticalAlignment.Center; + } + } + + protected override void SavePdf(PdfInfoStorekeeper info) + { + var renderer = new PdfDocumentRenderer(true) + { + Document = _document + }; + renderer.RenderDocument(); + renderer.PdfDocument.Save(info.FileName); + } + } +} diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToWordStorekeeper.cs b/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToWordStorekeeper.cs new file mode 100644 index 0000000..f1978d6 --- /dev/null +++ b/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToWordStorekeeper.cs @@ -0,0 +1,138 @@ +using CarCenterBusinessLogic.OfficePackage.HelperEnums; +using CarCenterBusinessLogic.OfficePackage.HelperModels; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; +using DocumentFormat.OpenXml; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterBusinessLogic.OfficePackage.Implements +{ + public class SaveToWordStorekeeper : AbstractSaveToWordStorekeeper + { + private WordprocessingDocument? _wordDocument; + + private Body? _docBody; + + private static JustificationValues GetJustificationValues(WordJustificationType type) + { + return type switch + { + WordJustificationType.Both => JustificationValues.Both, + WordJustificationType.Center => JustificationValues.Center, + _ => JustificationValues.Left, + }; + } + + private static SectionProperties CreateSectionProperties() + { + var properties = new SectionProperties(); + + var pageSize = new PageSize + { + Orient = PageOrientationValues.Portrait + }; + + properties.AppendChild(pageSize); + + return properties; + } + + private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties) + { + if (paragraphProperties == null) + { + return null; + } + + var properties = new ParagraphProperties(); + + properties.AppendChild(new Justification() + { + Val = GetJustificationValues(paragraphProperties.JustificationType) + }); + + properties.AppendChild(new SpacingBetweenLines + { + LineRule = LineSpacingRuleValues.Auto + }); + + properties.AppendChild(new Indentation()); + + var paragraphMarkRunProperties = new ParagraphMarkRunProperties(); + if (!string.IsNullOrEmpty(paragraphProperties.Size)) + { + paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size }); + } + properties.AppendChild(paragraphMarkRunProperties); + + return properties; + } + + protected override void CreateWord(WordInfoStorekeeper info) + { + _wordDocument = WordprocessingDocument.Create(info.memoryStream, WordprocessingDocumentType.Document); + MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart(); + mainPart.Document = new Document(); + _docBody = mainPart.Document.AppendChild(new Body()); + } + + protected override void CreateParagraph(WordParagraph paragraph) + { + if (_docBody == null || paragraph == null) + { + return; + } + var docParagraph = new Paragraph(); + + docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties)); + + foreach (var run in paragraph.Texts) + { + var docRun = new Run(); + + var properties = new RunProperties(); + properties.AppendChild(new FontSize { Val = run.Item2.Size }); + if (run.Item2.Bold) + { + properties.AppendChild(new Bold()); + } + docRun.AppendChild(properties); + + docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve }); + + docParagraph.AppendChild(docRun); + } + + _docBody.AppendChild(docParagraph); + } + + protected override void CreateNumberedParagraph(int numId, int ilvl, string text) + { + Paragraph paragraph = new Paragraph( + new ParagraphProperties( + new NumberingProperties( + new NumberingLevelReference() { Val = ilvl }, + new NumberingId() { Val = numId })), + new Run(new Text(text))); + + _docBody!.Append(paragraph); + } + + protected override void SaveWord(WordInfoStorekeeper info) + { + if (_docBody == null || _wordDocument == null) + { + return; + } + _docBody.AppendChild(CreateSectionProperties()); + + _wordDocument.MainDocumentPart!.Document.Save(); + + _wordDocument.Dispose(); + } + } +} diff --git a/CarCenter/CarCenterContracts/BindingModels/MailConfigModel.cs b/CarCenter/CarCenterContracts/BindingModels/MailConfigModel.cs new file mode 100644 index 0000000..6159650 --- /dev/null +++ b/CarCenter/CarCenterContracts/BindingModels/MailConfigModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.BindingModels +{ + public class MailConfigModel + { + public string MailLogin { get; set; } = string.Empty; + public string MailPassword { get; set; } = string.Empty; + public string SmtpClientHost { get; set; } = string.Empty; + public int SmtpClientPort { get; set; } + public string PopHost { get; set; } = string.Empty; + public int PopPort { get; set; } + } +} diff --git a/CarCenter/CarCenterContracts/BindingModels/MailSendInfoModel.cs b/CarCenter/CarCenterContracts/BindingModels/MailSendInfoModel.cs new file mode 100644 index 0000000..f95d240 --- /dev/null +++ b/CarCenter/CarCenterContracts/BindingModels/MailSendInfoModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterContracts.BindingModels +{ + public class MailSendInfoModel + { + public string MailAddress { get; set; } = string.Empty; + public string Subject { get; set; } = string.Empty; + public string Text { get; set; } = string.Empty; + public byte[] Pdf { get; set; } + public string FileName { get; set; } = string.Empty; + } +} diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportBundlingViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/ReportBundlingViewModel.cs index d0ea5d7..12cd6b1 100644 --- a/CarCenter/CarCenterContracts/ViewModels/ReportBundlingViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/ReportBundlingViewModel.cs @@ -9,9 +9,8 @@ namespace CarCenterContracts.ViewModels { public class ReportBundlingViewModel { - public int Id { get; set; } - //Пока не ясно что конкретно передавать в отчет, поэтому передается моделька - public List Orders { get; set; } = new(); - public List Features { get; set; } = new(); + public int BundlingId { get; set; } + public List Orders { get; set; } = new(); + public List Features { get; set; } = new(); } } diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportCarViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/ReportCarViewModel.cs index 559939c..a7f4e8e 100644 --- a/CarCenter/CarCenterContracts/ViewModels/ReportCarViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/ReportCarViewModel.cs @@ -9,8 +9,7 @@ namespace CarCenterContracts.ViewModels { public class ReportCarViewModel { - public int Id { get; set; } - //Пока не ясно что конкретно передавать в отчет, поэтому передается моделька - public List Presales { get; set; } = new(); + public int CarId { get; set; } + public List Presales { get; set; } = new(); } } diff --git a/CarCenter/CarCenterStorekeeperApp/Program.cs b/CarCenter/CarCenterStorekeeperApp/Program.cs index d0f7ce6..b1d32eb 100644 --- a/CarCenter/CarCenterStorekeeperApp/Program.cs +++ b/CarCenter/CarCenterStorekeeperApp/Program.cs @@ -1,4 +1,7 @@ using CarCenterBusinessLogic.BusinessLogics; +using CarCenterBusinessLogic.MailWorker; +using CarCenterBusinessLogic.OfficePackage; +using CarCenterBusinessLogic.OfficePackage.Implements; using CarCenterContracts.BusinessLogicsContracts; using CarCenterContracts.StoragesContracts; using CarCenterDatabaseImplement.Implements; @@ -19,7 +22,6 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); - builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); @@ -28,6 +30,10 @@ builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddSingleton(); builder.Services.AddTransient(); var app = builder.Build();