diff --git a/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/Storekeeper/ReportStorekeeperLogic.cs b/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/Storekeeper/ReportStorekeeperLogic.cs index 1f7237a..a59018c 100644 --- a/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/Storekeeper/ReportStorekeeperLogic.cs +++ b/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/Storekeeper/ReportStorekeeperLogic.cs @@ -1,4 +1,6 @@ -using HardwareShopContracts.BindingModels; +using HardwareShopBusinessLogic.OfficePackage; +using HardwareShopBusinessLogic.OfficePackage.HelperModels; +using HardwareShopContracts.BindingModels; using HardwareShopContracts.BusinessLogicsContracts; using HardwareShopContracts.StoragesContracts; using HardwareShopContracts.ViewModels; @@ -9,9 +11,15 @@ namespace HardwareShopBusinessLogic.BusinessLogics.Storekeeper { private readonly IComponentStorage _componentStorage; - public ReportStorekeeperLogic(IComponentStorage componentStorage) + private readonly AbstractSaveToExcel _saveToExcel; + + private readonly AbstractSaveToWord _saveToWord; + + public ReportStorekeeperLogic(IComponentStorage componentStorage, AbstractSaveToExcel abstractSaveToExcel, AbstractSaveToWord abstractSaveToWord) { _componentStorage = componentStorage; + _saveToExcel = abstractSaveToExcel; + _saveToWord = abstractSaveToWord; } public List GetBuildGood(List goods) { @@ -69,5 +77,25 @@ namespace HardwareShopBusinessLogic.BusinessLogics.Storekeeper } return result; } + + public void SaveBuildGoodToExcelFile(ReportBindingModel model, List goods) + { + _saveToExcel.CreateBuildGoodReport(new ExcelInfo + { + FileName = model.FileName, + Title = "Cписок сборок по выбранным товарам", + BuildGood = GetBuildGood(goods) + }); + } + + public void SaveBuildGoodToWordFile(ReportBindingModel model, List goods) + { + _saveToWord.CreateBuildGoodReport(new WordInfo + { + FileName = model.FileName, + Title = "Cписок сборок по выбранным товарам", + BuildGood = GetBuildGood(goods) + }); + } } } diff --git a/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/UserLogic.cs b/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/UserLogic.cs index de4e507..701f6f5 100644 --- a/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/UserLogic.cs +++ b/HardwareShop/HardwareShopBusinessLogic/BusinessLogics/UserLogic.cs @@ -4,6 +4,7 @@ using HardwareShopContracts.SearchModels; using HardwareShopContracts.StoragesContracts; using HardwareShopContracts.ViewModels; using Microsoft.Extensions.Logging; +using System.Text.RegularExpressions; namespace HardwareShopBusinessLogic.BusinessLogics { @@ -93,17 +94,21 @@ namespace HardwareShopBusinessLogic.BusinessLogics { return; } - if (string.IsNullOrEmpty(model.Login)) + if (string.IsNullOrEmpty(model.Login) || model.Login.Length > 20) { - throw new ArgumentNullException("Нет логина пользователя", nameof(model.Login)); + throw new ArgumentNullException("Нет логина пользователя или длина превышает 20 символов", nameof(model.Login)); } - if (string.IsNullOrEmpty(model.Email)) + if (string.IsNullOrEmpty(model.Email) || model.Email.Length > 30) { - throw new ArgumentNullException("Нет почты пользователя", nameof(model.Email)); + throw new ArgumentNullException("Нет почты пользователя или длина превышает 30 символов", nameof(model.Email)); } - if (string.IsNullOrEmpty(model.Password)) + if (!Regex.IsMatch(model.Email, @"^[^@\s]+@[^@\s]+\.[^@\s]+$", RegexOptions.IgnoreCase)) { - throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password)); + throw new ArgumentException("Неправильно введенная почта", nameof(model.Email)); + } + if (string.IsNullOrEmpty(model.Password) || model.Password.Length > 30 || model.Password.Contains(' ')) + { + throw new ArgumentNullException("Нет пароля пользователя или пароль содержит пробелы", nameof(model.Password)); } _logger.LogInformation("User. Login: {Login}. Email: {Email}. Id: {Id}", model.Login, model.Email, model.Id); diff --git a/HardwareShop/HardwareShopBusinessLogic/HardwareShopBusinessLogic.csproj b/HardwareShop/HardwareShopBusinessLogic/HardwareShopBusinessLogic.csproj index 1dbf0ca..c92001f 100644 --- a/HardwareShop/HardwareShopBusinessLogic/HardwareShopBusinessLogic.csproj +++ b/HardwareShop/HardwareShopBusinessLogic/HardwareShopBusinessLogic.csproj @@ -7,6 +7,7 @@ + diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs new file mode 100644 index 0000000..2b8ff15 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -0,0 +1,107 @@ +using HardwareShopBusinessLogic.OfficePackage.HelperEnums; +using HardwareShopBusinessLogic.OfficePackage.HelperModels; + +namespace HardwareShopBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToExcel + { + /// + /// Создание отчета по сборкам в выбранных товарах + /// + /// + public void CreateBuildGoodReport(ExcelInfo info) + { + CreateExcel(info); + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = 1, + Text = info.Title, + StyleInfo = ExcelStyleInfoType.Title + }); + + MergeCells(new ExcelMergeParameters + { + CellFromName = "A1", + CellToName = "C1" + }); + + /*uint rowIndex = 2; + foreach (var ss in info.BuildGood) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = ss.ShopName, + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + + foreach (var (Sushi, Count) in ss.ListSushi) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = rowIndex, + Text = Sushi, + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = Count.ToString(), + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + + rowIndex++; + } + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = "Итого", + StyleInfo = ExcelStyleInfoType.Text + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = ss.TotalCount.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + }*/ + + SaveExcel(info); + } + + /// + /// Создание excel-файла + /// + /// + protected abstract void CreateExcel(ExcelInfo info); + + /// + /// Добавляем новую ячейку в лист + /// + /// + protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams); + + /// + /// Объединение ячеек + /// + /// + protected abstract void MergeCells(ExcelMergeParameters excelParams); + + /// + /// Сохранение файла + /// + /// + protected abstract void SaveExcel(ExcelInfo info); + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs new file mode 100644 index 0000000..054d527 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -0,0 +1,74 @@ +using HardwareShopBusinessLogic.OfficePackage.HelperEnums; +using HardwareShopBusinessLogic.OfficePackage.HelperModels; + +namespace HardwareShopBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToWord + { + public void CreateBuildGoodReport(WordInfo 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.Center + } + }); + + List rows = new List(); + rows.Add(new WordRow + { + Rows = new List<(string, WordTextProperties)> { + ("Название", new WordTextProperties { Size = "24", Bold = true }), + ("Адрес", new WordTextProperties { Size = "24", Bold = true }), + ("Дата открытия", new WordTextProperties { Size = "24", Bold = true }) + } + }); + + /*foreach (var shop in info.BuildGood) + { + rows.Add(new WordRow + { + Rows = new List<(string, WordTextProperties)> { + (shop.ShopName, new WordTextProperties { Size = "24" }), + (shop.Address, new WordTextProperties { Size = "24" }), + (shop.DateOpening.ToShortDateString(), new WordTextProperties { Size = "24" }) + } + }); + }*/ + + CreateTable(rows); + + SaveWord(info); + } + + /// + /// Создание doc-файла + /// + /// + protected abstract void CreateWord(WordInfo info); + + /// + /// Создание таблицы + /// + /// + protected abstract void CreateTable(List rows); + + /// + /// Создание абзаца с текстом + /// + /// + /// + protected abstract void CreateParagraph(WordParagraph paragraph); + + /// + /// Сохранение файла + /// + /// + protected abstract void SaveWord(WordInfo info); + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs new file mode 100644 index 0000000..8bbb785 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs @@ -0,0 +1,11 @@ +namespace HardwareShopBusinessLogic.OfficePackage.HelperEnums +{ + public enum ExcelStyleInfoType + { + Title, + + Text, + + TextWithBroder + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs new file mode 100644 index 0000000..50ba6d2 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs @@ -0,0 +1,9 @@ +namespace HardwareShopBusinessLogic.OfficePackage.HelperEnums +{ + public enum WordJustificationType + { + Center, + + Both + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs new file mode 100644 index 0000000..8de7d35 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs @@ -0,0 +1,17 @@ +using HardwareShopBusinessLogic.OfficePackage.HelperEnums; + +namespace HardwareShopBusinessLogic.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; } + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs new file mode 100644 index 0000000..b85af0c --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs @@ -0,0 +1,13 @@ +using HardwareShopContracts.ViewModels; + +namespace HardwareShopBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelInfo + { + public string FileName { get; set; } = string.Empty; + + public string Title { get; set; } = string.Empty; + + public List BuildGood { get; set; } = new(); + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs new file mode 100644 index 0000000..781c24f --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs @@ -0,0 +1,11 @@ +namespace HardwareShopBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelMergeParameters + { + public string CellFromName { get; set; } = string.Empty; + + public string CellToName { get; set; } = string.Empty; + + public string Merge => $"{CellFromName}:{CellToName}"; + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs new file mode 100644 index 0000000..2640fa6 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -0,0 +1,13 @@ +using HardwareShopContracts.ViewModels; + +namespace HardwareShopBusinessLogic.OfficePackage.HelperModels +{ + public class WordInfo + { + public string FileName { get; set; } = string.Empty; + + public string Title { get; set; } = string.Empty; + + public List BuildGood { get; set; } = new(); + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs new file mode 100644 index 0000000..118a09b --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs @@ -0,0 +1,9 @@ +namespace HardwareShopBusinessLogic.OfficePackage.HelperModels +{ + public class WordParagraph + { + public List<(string, WordTextProperties)> Texts { get; set; } = new(); + + public WordTextProperties? TextProperties { get; set; } + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordRow.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordRow.cs new file mode 100644 index 0000000..e941df1 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordRow.cs @@ -0,0 +1,7 @@ +namespace HardwareShopBusinessLogic.OfficePackage.HelperModels +{ + public class WordRow + { + public List<(string, WordTextProperties)> Rows { get; set; } = new(); + } +} diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs new file mode 100644 index 0000000..30ceb87 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs @@ -0,0 +1,13 @@ +using HardwareShopBusinessLogic.OfficePackage.HelperEnums; + +namespace HardwareShopBusinessLogic.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/HardwareShop/HardwareShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs new file mode 100644 index 0000000..368598c --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -0,0 +1,292 @@ +using HardwareShopBusinessLogic.OfficePackage.HelperEnums; +using HardwareShopBusinessLogic.OfficePackage.HelperModels; +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Office2010.Excel; +using DocumentFormat.OpenXml.Office2013.Excel; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; + +namespace HardwareShopBusinessLogic.OfficePackage.Implements +{ + public class SaveToExcel : AbstractSaveToExcel + { + 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.TextWithBroder => 1U, + ExcelStyleInfoType.Text => 0U, + _ => 0U, + }; + } + + protected override void CreateExcel(ExcelInfo info) + { + _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, 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(ExcelInfo info) + { + if (_spreadsheetDocument == null) + { + return; + } + _spreadsheetDocument.WorkbookPart!.Workbook.Save(); + _spreadsheetDocument.Close(); + } + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs new file mode 100644 index 0000000..b3a6874 --- /dev/null +++ b/HardwareShop/HardwareShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -0,0 +1,189 @@ +using HardwareShopBusinessLogic.OfficePackage.HelperEnums; +using HardwareShopBusinessLogic.OfficePackage.HelperModels; +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; + +namespace HardwareShopBusinessLogic.OfficePackage.Implements +{ + public class SaveToWord : AbstractSaveToWord + { + 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(WordInfo info) + { + _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document); + MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart(); + mainPart.Document = new Document(); + _docBody = mainPart.Document.AppendChild(new Body()); + } + + protected override void CreateTable(List data) + { + if (_docBody == null || data == null) + { + return; + } + Table table = new Table(); + var tableProp = new TableProperties(); + tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed }); + tableProp.AppendChild(new TableBorders( + new TopBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new LeftBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new RightBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new BottomBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new InsideHorizontalBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new InsideVerticalBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 } + )); + tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto }); + table.AppendChild(tableProp); + TableGrid tableGrid = new TableGrid(); + for (int j = 0; j < data[0].Rows.Count; ++j) + { + tableGrid.AppendChild(new GridColumn() { Width = "3200" }); + } + table.AppendChild(tableGrid); + for (int i = 0; i < data.Count; ++i) + { + TableRow docRow = new TableRow(); + for (int j = 0; j < data[i].Rows.Count; ++j) + { + var docParagraph = new Paragraph(); + var docRun = new Run(); + var runProperties = new RunProperties(); + + docParagraph.AppendChild(CreateParagraphProperties(data[i].Rows[j].Item2)); + + runProperties.AppendChild(new RunFonts() { Ascii = "Times New Roman", ComplexScript = "Times New Roman", HighAnsi = "Times New Roman" }); + runProperties.AppendChild(new FontSize { Val = data[i].Rows[j].Item2.Size == null ? data[i].Rows[j].Item2.Size : "24" }); + if (data[i].Rows[j].Item2.Bold) + runProperties.AppendChild(new Bold()); + + docRun.AppendChild(runProperties); + docRun.AppendChild(new Text { Text = data[i].Rows[j].Item1.ToString(), Space = SpaceProcessingModeValues.Preserve }); + + docParagraph.AppendChild(docRun); + TableCell docCell = new TableCell(); + docCell.AppendChild(docParagraph); + docRow.AppendChild(docCell); + } + table.AppendChild(docRow); + } + _docBody.AppendChild(table); + } + + 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 SaveWord(WordInfo info) + { + if (_docBody == null || _wordDocument == null) + { + return; + } + _docBody.AppendChild(CreateSectionProperties()); + + _wordDocument.MainDocumentPart!.Document.Save(); + + _wordDocument.Close(); + } + } +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs b/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs index 7ea1aa2..dbc2a6f 100644 --- a/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs +++ b/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs @@ -1,6 +1,7 @@ using HardwareShopContracts.BindingModels; using HardwareShopContracts.ViewModels; using HardwareShopDatabaseImplement.Models; +using HardwareShopDatabaseImplement.Models.Storekeeper; using HardwareShopDataModels.Enums; using Microsoft.AspNetCore.Mvc; @@ -14,6 +15,7 @@ namespace HardwareShopStorekeeperApp.Controllers { _logger = logger; } + public IActionResult CreateOrder() { if (APIClient.User == null) @@ -130,14 +132,110 @@ namespace HardwareShopStorekeeperApp.Controllers goodModel.UserId = APIClient.User.Id; APIClient.PostRequest("api/good/creategood", goodModel); } - - public IActionResult LinkBuilds() + + public IActionResult UpdateGood(int goodid) + { + if (APIClient.User == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + ViewBag.Components = APIClient.GetRequest>($"api/component/getcomponents?userId={APIClient.User.Id}"); + return View(goodid); + } + + [HttpPost] + public void UpdateGood([FromBody] GoodBindingModel goodModel) + { + if (APIClient.User == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + if (string.IsNullOrEmpty(goodModel.GoodName)) + { + throw new Exception("Название не должно быть пустым"); + } + if (goodModel.Price <= 0) + { + throw new Exception("Цена должна быть больше 0"); + } + goodModel.UserId = APIClient.User.Id; + APIClient.PostRequest("api/good/updatedata", goodModel); + } + + [HttpGet] + public Tuple>>? GetGoodUpdate(int goodid) + { + if (APIClient.User == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + var result = APIClient.GetRequest>>?>($"api/good/getgoodupdate?id={goodid}"); + return result; + } + + [HttpPost] + public void DeleteGood(int good) + { + if (APIClient.User == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + if (good <= 0) + { + throw new Exception($"Идентификтаор товара не может быть меньше или равен 0"); + } + APIClient.PostRequest("api/good/deletegood", new GoodBindingModel + { + Id = good + }); + } + + public IActionResult LinkBuilds(int componentid) { if (APIClient.User == null) { return Redirect("~/Home/Enter"); } - return View(); + ViewBag.Builds = APIClient.GetRequest>($"api/build/getbuilds"); + return View(componentid); + } + + [HttpPost] + public void LinkBuilds([FromBody] ComponentBindingModel componentModel) + { + if (APIClient.User == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + componentModel.UserId = APIClient.User.Id; + APIClient.PostRequest("api/component/updatedata", componentModel); + } + + [HttpGet] + public BuildViewModel? GetBuild(int buildId) + { + if (APIClient.User == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + if (buildId <= 0) + { + throw new Exception($"Идентификтаор сборки не может быть меньше или равен 0"); + } + var result = APIClient.GetRequest($"api/build/getbuild?buildId={buildId}"); + return result; + } + + [HttpGet] + public List>? GetComponentBuilds(int componentid) + { + if (APIClient.User == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + var result = APIClient.GetRequest>?>($"api/component/getcomponentbuilds?id={componentid}"); + return result; } public IActionResult CreateComponent() diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml index 1483ce3..75c9f54 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml @@ -16,7 +16,6 @@ @{

Создать комплектующее - Привязка сборок

@@ -50,6 +49,12 @@
+ + + diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml index ec4fcbc..34098b4 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml @@ -10,15 +10,15 @@
- +
- +
- +
diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml index 886cbb7..778af83 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateGood.cshtml @@ -11,16 +11,15 @@
- +
- +

Комплектующие

-
@@ -28,6 +27,7 @@ + @@ -49,7 +49,7 @@ - +
@@ -65,7 +65,6 @@ let list = []; const name = document.getElementById("name"); const submitComponentBtn = document.getElementById("savecomponent"); - const editBtn = document.getElementById("editcomponent"); const saveBtn = document.getElementById("creategood"); const countElem = document.getElementById("count"); const resultTable = document.getElementById("result"); @@ -75,6 +74,7 @@ console.log('try to add component') var count = $('#count').val(); var component = $('#component').val(); + if (component && count) $.ajax({ method: "GET", url: `/Storekeeper/GetComponent`, @@ -93,11 +93,17 @@ reloadTable() countElem.value = '1' } - }); + }).fail(function(xhr, textStatus, errorThrown) { + alert(xhr.responseText); + }) }) saveBtn.addEventListener("click", () => { console.log('try to add good') + if (list.length == 0) { + alert('failed add good. components are empty') + return + } let components = [] let counts = [] list.forEach((x) => { @@ -113,18 +119,32 @@ "GoodComponentsComponents": components, "GoodComponentsCounts": counts }) } ).done(() => window.location.href = '/Storekeeper/Goods') + .fail(function(xhr, textStatus, errorThrown) { + alert(xhr.responseText); + }) }) function reloadTable() { resultTable.innerHTML = '' let price = 0; + let count = 0; list.forEach((elem) => { - console.log(elem); - resultTable.innerHTML += `
` + resultTable.innerHTML += `` + count++; price += elem.component.cost * elem.count }) totalPrice.value = Math.round(price * 100) / 100 } + + function deleteComponent(id) { + list = list.filter(value => value.component.componentName != resultTable.rows[id].cells[0].innerText) + reloadTable() + } } \ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml index b5de9d9..3a3efdb 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateOrder.cshtml @@ -10,7 +10,7 @@
- +
@@ -18,7 +18,7 @@
- +
@@ -46,6 +46,9 @@ success: function (result) { $("#sum").val(result); } + }) + .fail(function(xhr, textStatus, errorThrown) { + alert(xhr.responseText); }); }; } diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml index 83b8a94..f446b6c 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml @@ -14,8 +14,6 @@

Создать товар - Изменить товар - Удалить товар

Комплектующее Количество СуммаДействие
${elem.component.componentName}${elem.count}${Math.round(elem.component.cost * elem.count * 100) / 100}
${elem.component.componentName}${elem.count}${Math.round(elem.component.cost * elem.count * 100) / 100} \ +
\ + \ +
@@ -26,20 +24,49 @@ + @foreach (var item in Model) - { - - - - - } + { + + + + + + }
Цена + Действия +
- @Html.DisplayFor(modelItem => item.GoodName) - - @Html.DisplayFor(modelItem => item.Price) -
+ @Html.DisplayFor(modelItem => item.GoodName) + + @Html.DisplayFor(modelItem => item.Price) + +
+ + + + +
+
-
\ No newline at end of file +
+ +@section Scripts +{ + +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml index c4a61a5..b8c9e6c 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/LinkBuilds.cshtml @@ -8,32 +8,28 @@

Привязка сборок

- +
- - -
- -

Привязанные сборки

- - + + + - +
СборкаКоличествоСборкаКоличествоДействие
- +
- +
- \ No newline at end of file + + +@section Scripts +{ + +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml index 8bcec38..71da1a3 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Orders.cshtml @@ -118,19 +118,25 @@ data: { id: order } } ).done(() => window.location.href='/Storekeeper/Orders') + .fail(function(xhr, textStatus, errorThrown) { + alert(xhr.responseText); + }) }) inwork.addEventListener("click", () => { - console.log('try to delete order') + console.log('try to update order status') $.ajax( { url: `/Storekeeper/UpdateOrder`, type: 'POST', data: { id : order, status : 1 } } - ).done(() => window.location.href='/Storekeeper/Orders') + ).done((result) => window.location.href='/Storekeeper/Orders') + .fail(function(xhr, textStatus, errorThrown) { + alert(xhr.responseText); + }) }) ready.addEventListener("click", () => { - console.log('try to delete order') + console.log('try to update order status') $.ajax( { url: `/Storekeeper/UpdateOrder`, @@ -138,9 +144,12 @@ data: { id : order, status : 2 } } ).done(() => window.location.href='/Storekeeper/Orders') + .fail(function(xhr, textStatus, errorThrown) { + alert(xhr.responseText); + }) }) done.addEventListener("click", () => { - console.log('try to delete order') + console.log('try to update order status') $.ajax( { url: `/Storekeeper/UpdateOrder`, @@ -148,6 +157,9 @@ data: { id : order, status : 3 } } ).done(() => window.location.href='/Storekeeper/Orders') + .fail(function(xhr, textStatus, errorThrown) { + alert(xhr.responseText); + }) }) }; } diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/UpdateGood.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/UpdateGood.cshtml new file mode 100644 index 0000000..7e3051e --- /dev/null +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/UpdateGood.cshtml @@ -0,0 +1,179 @@ +@using HardwareShopContracts.ViewModels + +@model int + +@{ + ViewData["Title"] = "Товар"; + Layout = "~/Views/Shared/_LayoutStorekeeper.cshtml"; +} + +
+

Редактирование товара

+
+ +
+
+ + +
+
+ + +
+

Комплектующие

+
+ +
+ + + + + + + + + + + +
КомплектующееКоличествоСуммаДействие
+
+ +
+
+ + + +@section Scripts +{ + +} \ No newline at end of file diff --git a/HardwareShop/HardwareShopContracts/BindingModels/ComponentBindingModel.cs b/HardwareShop/HardwareShopContracts/BindingModels/ComponentBindingModel.cs index e84a860..d24f92d 100644 --- a/HardwareShop/HardwareShopContracts/BindingModels/ComponentBindingModel.cs +++ b/HardwareShop/HardwareShopContracts/BindingModels/ComponentBindingModel.cs @@ -1,4 +1,5 @@ -using HardwareShopDataModels.Models; +using HardwareShopContracts.ViewModels; +using HardwareShopDataModels.Models; namespace HardwareShopContracts.BindingModels { @@ -19,5 +20,17 @@ namespace HardwareShopContracts.BindingModels get; set; } = new(); + + public List ComponentBuildsBuilds + { + get; + set; + } = new(); + + public List ComponentBuildsCounts + { + get; + set; + } = new(); } } diff --git a/HardwareShop/HardwareShopContracts/BusinessLogicsContracts/IReportStorekeeperLogic.cs b/HardwareShop/HardwareShopContracts/BusinessLogicsContracts/IReportStorekeeperLogic.cs index ea93957..148398b 100644 --- a/HardwareShop/HardwareShopContracts/BusinessLogicsContracts/IReportStorekeeperLogic.cs +++ b/HardwareShop/HardwareShopContracts/BusinessLogicsContracts/IReportStorekeeperLogic.cs @@ -19,5 +19,17 @@ namespace HardwareShopContracts.BusinessLogicsContracts /// /// List GetComponents(UserBindingModel user, ReportBindingModel model); + + /// + /// Сохранение списка сборок по выбранным товарам в файл-Word + /// + /// + void SaveBuildGoodToWordFile(ReportBindingModel model, List goods); + + /// + /// Сохранение списка сборок по выбранным товарам в файл-Excel + /// + /// + void SaveBuildGoodToExcelFile(ReportBindingModel model, List goods); } } diff --git a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs index 4246e31..939b6a4 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs @@ -10,7 +10,7 @@ namespace HardwareShopDatabaseImplement { protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { - optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=Computer_Hardware_Store4;Username=postgres;Password=1234"); + optionsBuilder.UseNpgsql("Host=localhost;Port=5433;Database=Computer_Hardware_Store;Username=user;Password=12345"); AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); } diff --git a/HardwareShop/HardwareShopDatabaseImplement/Implements/Storekeeper/ComponentStorage.cs b/HardwareShop/HardwareShopDatabaseImplement/Implements/Storekeeper/ComponentStorage.cs index 9bcb78e..edfb8c6 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Implements/Storekeeper/ComponentStorage.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Implements/Storekeeper/ComponentStorage.cs @@ -18,6 +18,13 @@ namespace HardwareShopDatabaseImplement.Implements.Storekeeper .FirstOrDefault(rec => rec.Id == model.Id); if (element != null) { + var componentGoods = context.GoodsComponents.Where(x => x.ComponentId == element.Id).ToList(); + componentGoods.ForEach(x => + { + var good = context.Goods.FirstOrDefault(rec => rec.Id == x.GoodId); + if (good != null) + context.Goods.Remove(good); + }); context.Components.Remove(element); context.SaveChanges(); return element.GetViewModel; diff --git a/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Component.cs b/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Component.cs index 12fd9cb..9f378af 100644 --- a/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Component.cs +++ b/HardwareShop/HardwareShopDatabaseImplement/Models/Storekeeper/Component.cs @@ -85,12 +85,34 @@ namespace HardwareShopDatabaseImplement.Models.Storekeeper var componentBuilds = context.ComponentsBuilds.Where(rec => rec.ComponentId == model.Id).ToList(); if (componentBuilds != null && componentBuilds.Count > 0) { // удалили те, которых нет в модели - context.ComponentsBuilds.RemoveRange(componentBuilds.Where(rec => !model.ComponentBuilds.ContainsKey(rec.BuildId))); + context.ComponentsBuilds.RemoveRange(componentBuilds.Where(rec => + { + bool flag = !model.ComponentBuilds.ContainsKey(rec.BuildId); + if (flag) + { + var build = context.Builds.First(x => x.Id == rec.Build.Id); + if (build != null) + { + build.Price -= rec.Component.Cost * rec.Count; + } + context.SaveChanges(); + } + return flag; + })); context.SaveChanges(); componentBuilds = context.ComponentsBuilds.Where(rec => rec.ComponentId == model.Id).ToList(); // обновили количество у существующих записей foreach (var updateBuild in componentBuilds) - { + { + var build = context.Builds.First(x => x.Id == updateBuild.Build.Id); + if (updateBuild.Count > model.ComponentBuilds[updateBuild.BuildId].Item2) + { + build.Price -= (updateBuild.Count - model.ComponentBuilds[updateBuild.BuildId].Item2) * updateBuild.Component.Cost; + } + else if (updateBuild.Count < model.ComponentBuilds[updateBuild.BuildId].Item2) + { + build.Price += (model.ComponentBuilds[updateBuild.BuildId].Item2 - updateBuild.Count) * updateBuild.Component.Cost; + } updateBuild.Count = model.ComponentBuilds[updateBuild.BuildId].Item2; model.ComponentBuilds.Remove(updateBuild.BuildId); } diff --git a/HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs b/HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs index dead656..f10fe82 100644 --- a/HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs +++ b/HardwareShop/HardwareShopRestApi/Controllers/BuildController.cs @@ -30,10 +30,12 @@ namespace HardwareShopRestApi.Controllers } [HttpGet] - public List? GetBuilds(int userId) + public List? GetBuilds(int userId = 0) { try { + if (userId == 0) + return _buildLogic.ReadList(null); return _buildLogic.ReadList(new BuildSearchModel { UserId = userId @@ -46,7 +48,6 @@ namespace HardwareShopRestApi.Controllers } } - [HttpGet] public BuildViewModel? GetBuild(int buildId) { diff --git a/HardwareShop/HardwareShopRestApi/Controllers/ComponentController.cs b/HardwareShop/HardwareShopRestApi/Controllers/ComponentController.cs index dcb4167..d2425fe 100644 --- a/HardwareShop/HardwareShopRestApi/Controllers/ComponentController.cs +++ b/HardwareShop/HardwareShopRestApi/Controllers/ComponentController.cs @@ -2,6 +2,8 @@ using HardwareShopContracts.BusinessLogicsContracts; using HardwareShopContracts.SearchModels; using HardwareShopContracts.ViewModels; +using HardwareShopDatabaseImplement.Models.Storekeeper; +using HardwareShopDataModels.Models; using Microsoft.AspNetCore.Mvc; namespace HardwareShopRestApi.Controllers @@ -48,6 +50,28 @@ namespace HardwareShopRestApi.Controllers } } + [HttpGet] + public List>? GetComponentBuilds(int id) + { + try + { + var component = _component.ReadElement(new() { Id = id }); + if (component == null) + return null; + var tuple = component.ComponentBuilds.Select(x => Tuple.Create(new BuildViewModel + { + Id = x.Value.Item1.Id, + BuildName = x.Value.Item1.BuildName, + }, x.Value.Item2)).ToList(); + return tuple; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения сборок комплектующего"); + throw; + } + } + [HttpPost] public void CreateComponent(ComponentBindingModel model) { @@ -67,6 +91,11 @@ namespace HardwareShopRestApi.Controllers { try { + for (int i = 0; i < model.ComponentBuildsCounts.Count; i++) + { + model.ComponentBuilds.Add(model.ComponentBuildsBuilds[i].Id, + (model.ComponentBuildsBuilds[i] as IBuildModel, model.ComponentBuildsCounts[i])); + } _component.Update(model); } catch (Exception ex) diff --git a/HardwareShop/HardwareShopRestApi/Controllers/GoodController.cs b/HardwareShop/HardwareShopRestApi/Controllers/GoodController.cs index 04b1ef9..5379fda 100644 --- a/HardwareShop/HardwareShopRestApi/Controllers/GoodController.cs +++ b/HardwareShop/HardwareShopRestApi/Controllers/GoodController.cs @@ -62,6 +62,30 @@ namespace HardwareShopRestApi.Controllers } } + [HttpGet] + public Tuple>>? GetGoodUpdate(int id) + { + try + { + var good = _good.ReadElement(new() { Id = id }); + if (good == null) + return null; + var tuple = Tuple.Create(good, + good.GoodComponents.Select(x => Tuple.Create(new ComponentViewModel + { + Id = x.Value.Item1.Id, + ComponentName = x.Value.Item1.ComponentName, + Cost = x.Value.Item1.Cost + }, x.Value.Item2)).ToList()); + return tuple; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения товара"); + throw; + } + } + [HttpPost] public void CreateGood(GoodBindingModel model) { @@ -86,6 +110,11 @@ namespace HardwareShopRestApi.Controllers { try { + for (int i = 0; i < model.GoodComponentsCounts.Count; i++) + { + model.GoodComponents.Add(model.GoodComponentsComponents[i].Id, + (model.GoodComponentsComponents[i] as IComponentModel, model.GoodComponentsCounts[i])); + } _good.Update(model); } catch (Exception ex)