PIbd-21_Andrianova_E.N._CompShop.LabWork03 #3
@ -10,9 +10,11 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapper" Version="2.1.35" />
|
||||
<PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Npgsql" Version="6.0.12" />
|
||||
<PackageReference Include="PDFsharp-MigraDoc" Version="6.1.1" />
|
||||
<PackageReference Include="Serilog" Version="4.1.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
|
||||
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
|
||||
|
55
CompShop/CompShop/DocumentsBuilder/ChartReport.cs
Normal file
55
CompShop/CompShop/DocumentsBuilder/ChartReport.cs
Normal file
@ -0,0 +1,55 @@
|
||||
using CompShop.DocumentsBuilder;
|
||||
using CompShop.Repos;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
internal class ChartReport
|
||||
{
|
||||
private readonly ICheckRepository _checkRepository; // Репозиторий для получения данных о чеках
|
||||
private readonly IProductRepository _productRepository; // Репозиторий для получения данных о продуктах
|
||||
private readonly ILogger<ChartReport> _logger;
|
||||
|
||||
public ChartReport(ICheckRepository checkRepository, IProductRepository productRepository, ILoggerFactory loggerFactory)
|
||||
{
|
||||
_checkRepository = checkRepository ?? throw new ArgumentNullException(nameof(checkRepository));
|
||||
_productRepository = productRepository ?? throw new ArgumentNullException(nameof(productRepository));
|
||||
_logger = loggerFactory.CreateLogger<ChartReport>();
|
||||
}
|
||||
|
||||
public bool CreateChart(string filePath, DateTime dateTime)
|
||||
{
|
||||
try
|
||||
{
|
||||
new PdfBuilder(filePath)
|
||||
.AddHeader("Отчет по продажам товаров")
|
||||
.AddPieChart("Проданные товары", GetData(dateTime)) // Диаграмма с продуктами
|
||||
.Build();
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Ошибка при формировании документа");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private List<(string Caption, double Value)> GetData(DateTime dateTime)
|
||||
{
|
||||
// Получаем все чеки, которые были оформлены в указанную дату
|
||||
var checkData = _checkRepository
|
||||
.ReadAll()
|
||||
.Where(x => x.PurchaseDate.Date == dateTime.Date) // Фильтрация по дате
|
||||
.SelectMany(x => x.Products) // Получаем все продукты из всех чеков
|
||||
.GroupBy(p => p.ProductID) // Группируем по ID продукта
|
||||
.Select(g =>
|
||||
{
|
||||
// Получаем продукт по ProductID
|
||||
var product = _productRepository.Read(g.Key);
|
||||
return (Caption: product.Name, Value: (double)g.Sum(p => p.Count)); // Преобразуем Count в double
|
||||
})
|
||||
.ToList();
|
||||
|
||||
return checkData;
|
||||
}
|
||||
|
||||
}
|
93
CompShop/CompShop/DocumentsBuilder/DocReport.cs
Normal file
93
CompShop/CompShop/DocumentsBuilder/DocReport.cs
Normal file
@ -0,0 +1,93 @@
|
||||
using CompShop.Repos;
|
||||
using CompShop.Repos.Impements;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CompShop.DocumentsBuilder
|
||||
{
|
||||
internal class DocReport
|
||||
{
|
||||
private readonly IClientRepository _clientRepository;
|
||||
|
||||
private readonly IProductRepository _productRepository;
|
||||
|
||||
private readonly IStorageRepository _storageRepository;
|
||||
|
||||
private readonly ILogger<DocReport> _logger;
|
||||
|
||||
public DocReport(IClientRepository clientRepository, IProductRepository productRepository, IStorageRepository storageRepository, ILoggerFactory loggerFactory)
|
||||
{
|
||||
_clientRepository = clientRepository ??
|
||||
throw new ArgumentNullException(nameof(clientRepository));
|
||||
_productRepository = productRepository ??
|
||||
throw new ArgumentNullException(nameof(productRepository));
|
||||
_storageRepository = storageRepository ??
|
||||
throw new ArgumentNullException(nameof(storageRepository));
|
||||
_logger = loggerFactory.CreateLogger<DocReport>();
|
||||
}
|
||||
public bool CreateDoc(string filePath, bool includeClients, bool includeProducts, bool includeStorage)
|
||||
{
|
||||
try
|
||||
{
|
||||
var builder = new WordBuilder(filePath)
|
||||
.AddHeader("Документ со справочниками");
|
||||
|
||||
if (includeClients)
|
||||
{
|
||||
builder.AddParagraph("Клиенты")
|
||||
.AddTable(new int[] { 2400, 2400, 3200, 1200 }, GetClients());
|
||||
}
|
||||
|
||||
if (includeProducts)
|
||||
{
|
||||
builder.AddParagraph("Товары")
|
||||
.AddTable(new int[] { 2400, 2400, 2400, 2400, 2400 }, GetProducts());
|
||||
}
|
||||
|
||||
if (includeStorage)
|
||||
{
|
||||
builder.AddParagraph("Склады")
|
||||
.AddTable(new int[] { 2400, 2400, 1200 }, GetStorage());
|
||||
}
|
||||
|
||||
builder.Build();
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Ошибка при формировании документа");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private List<string[]> GetClients()
|
||||
{
|
||||
List<string[]> result = _clientRepository.ReadAll().Select(x => new string[] { x.Id.ToString(), x.Name, x.PhoneNumber, x.ClientType.ToString() }).ToList();
|
||||
|
||||
result.Insert(0, new string[] { "ID", "Имя", "Номер телефона", "Тип клиента" });
|
||||
|
||||
return result;
|
||||
}
|
||||
private List<string[]> GetProducts()
|
||||
{
|
||||
List<string[]> result = _productRepository.ReadAll().Select(x => new string[] { x.ID.ToString(), x.Name, x.Description, x.ProductType.ToString(), x.Price.ToString() + " р." }).ToList();
|
||||
|
||||
result.Insert(0, new string[] { "ID", "Имя", "Описание", "Тип товара", "Цена" });
|
||||
|
||||
return result;
|
||||
}
|
||||
private List<string[]> GetStorage()
|
||||
{
|
||||
List<string[]> result = _storageRepository.ReadAll().Select(x => new string[] { x.Id.ToString(), x.Adress, x.Size.ToString()}).ToList();
|
||||
|
||||
result.Insert(0, new string[] { "ID", "Адрес", "Вместимость"});
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
257
CompShop/CompShop/DocumentsBuilder/ExcelBuilder.cs
Normal file
257
CompShop/CompShop/DocumentsBuilder/ExcelBuilder.cs
Normal file
@ -0,0 +1,257 @@
|
||||
using DocumentFormat.OpenXml.Packaging;
|
||||
using DocumentFormat.OpenXml.Spreadsheet;
|
||||
using DocumentFormat.OpenXml;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
namespace CompShop.DocumentsBuilder
|
||||
{
|
||||
internal class ExcelBuilder
|
||||
{
|
||||
private readonly string _filePath;
|
||||
private readonly SheetData _sheetData;
|
||||
private readonly MergeCells _mergeCells;
|
||||
private readonly Columns _columns;
|
||||
private uint _rowIndex = 0;
|
||||
|
||||
public ExcelBuilder(string filePath)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(filePath))
|
||||
{
|
||||
throw new ArgumentNullException(nameof(filePath));
|
||||
}
|
||||
if (File.Exists(filePath))
|
||||
{
|
||||
File.Delete(filePath);
|
||||
}
|
||||
|
||||
_filePath = filePath;
|
||||
_sheetData = new SheetData();
|
||||
_mergeCells = new MergeCells();
|
||||
_columns = new Columns();
|
||||
_rowIndex = 1;
|
||||
}
|
||||
|
||||
public ExcelBuilder AddHeader(string header, int startIndex, int count)
|
||||
{
|
||||
CreateCell(startIndex, _rowIndex, header, StyleIndex.BoldTextWithBorders);
|
||||
for (int i = startIndex + 1; i < startIndex + count; ++i)
|
||||
{
|
||||
CreateCell(i, _rowIndex, "", StyleIndex.BoldTextWithBorders);
|
||||
}
|
||||
|
||||
_mergeCells.Append(new MergeCell()
|
||||
{
|
||||
Reference = new StringValue($"{GetExcelColumnName(startIndex)}{_rowIndex}:{GetExcelColumnName(startIndex + count - 1)}{_rowIndex}")
|
||||
});
|
||||
|
||||
_rowIndex++;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ExcelBuilder AddParagraph(string text, int columnIndex)
|
||||
{
|
||||
CreateCell(columnIndex, _rowIndex++, text, StyleIndex.SimpleTextWithBorders);
|
||||
return this;
|
||||
}
|
||||
|
||||
public ExcelBuilder AddTable(int[] columnsWidths, List<string[]> data)
|
||||
{
|
||||
if (columnsWidths == null || columnsWidths.Length == 0)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(columnsWidths));
|
||||
}
|
||||
|
||||
if (data == null || data.Count == 0)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(data));
|
||||
}
|
||||
|
||||
if (data.Any(x => x.Length != columnsWidths.Length))
|
||||
{
|
||||
throw new InvalidOperationException("widths.Length != data.Length");
|
||||
}
|
||||
|
||||
uint counter = 1;
|
||||
int coef = 2;
|
||||
_columns.Append(columnsWidths.Select(x => new Column
|
||||
{
|
||||
Min = counter,
|
||||
Max = counter++,
|
||||
Width = x * coef,
|
||||
CustomWidth = true
|
||||
}));
|
||||
|
||||
// Добавляем строки таблицы
|
||||
for (int i = 0; i < data.Count; ++i)
|
||||
{
|
||||
var isBoldRow = i == 0 || i == data.Count - 1; // Только заголовок и последняя строка жирные
|
||||
var styleIndex = isBoldRow ? StyleIndex.BoldTextWithBorders : StyleIndex.SimpleTextWithBorders;
|
||||
|
||||
for (int j = 0; j < data[i].Length; ++j)
|
||||
{
|
||||
CreateCell(j, _rowIndex, data[i][j], styleIndex);
|
||||
}
|
||||
|
||||
_rowIndex++;
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
private enum StyleIndex
|
||||
{
|
||||
SimpleTextWithoutBorder = 0,
|
||||
BoldText = 1,
|
||||
SimpleTextWithBorders = 2,
|
||||
BoldTextWithBorders = 3
|
||||
}
|
||||
|
||||
public void Build()
|
||||
{
|
||||
using var spreadsheetDocument = SpreadsheetDocument.Create(_filePath, SpreadsheetDocumentType.Workbook);
|
||||
var workbookpart = spreadsheetDocument.AddWorkbookPart();
|
||||
GenerateStyle(workbookpart);
|
||||
workbookpart.Workbook = new Workbook();
|
||||
var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
|
||||
worksheetPart.Worksheet = new Worksheet();
|
||||
if (_columns.HasChildren)
|
||||
{
|
||||
worksheetPart.Worksheet.Append(_columns);
|
||||
}
|
||||
|
||||
worksheetPart.Worksheet.Append(_sheetData);
|
||||
var sheets = spreadsheetDocument.WorkbookPart!.Workbook.AppendChild(new Sheets());
|
||||
var sheet = new Sheet()
|
||||
{
|
||||
Id = spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
|
||||
SheetId = 1,
|
||||
Name = "Лист 1"
|
||||
};
|
||||
|
||||
sheets.Append(sheet);
|
||||
if (_mergeCells.HasChildren)
|
||||
{
|
||||
worksheetPart.Worksheet.InsertAfter(_mergeCells, worksheetPart.Worksheet.Elements<SheetData>().First());
|
||||
}
|
||||
}
|
||||
|
||||
private static void GenerateStyle(WorkbookPart workbookPart)
|
||||
{
|
||||
var workbookStylesPart = workbookPart.AddNewPart<WorkbookStylesPart>();
|
||||
workbookStylesPart.Stylesheet = new Stylesheet();
|
||||
|
||||
// Шрифты
|
||||
var fonts = new Fonts() { Count = 2 };
|
||||
fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
|
||||
{
|
||||
FontSize = new FontSize() { Val = 11 },
|
||||
FontName = new FontName() { Val = "Calibri" }
|
||||
});
|
||||
fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
|
||||
{
|
||||
Bold = new Bold(),
|
||||
FontSize = new FontSize() { Val = 11 },
|
||||
FontName = new FontName() { Val = "Calibri" }
|
||||
});
|
||||
|
||||
// Заполнение
|
||||
var fills = new Fills() { Count = 1 };
|
||||
fills.Append(new Fill
|
||||
{
|
||||
PatternFill = new PatternFill { PatternType = PatternValues.None }
|
||||
});
|
||||
|
||||
// Границы
|
||||
var borders = new Borders() { Count = 2 };
|
||||
borders.Append(new Border()); // Без границ
|
||||
borders.Append(new Border
|
||||
{
|
||||
LeftBorder = new LeftBorder { Style = BorderStyleValues.Thin },
|
||||
RightBorder = new RightBorder { Style = BorderStyleValues.Thin },
|
||||
TopBorder = new TopBorder { Style = BorderStyleValues.Thin },
|
||||
BottomBorder = new BottomBorder { Style = BorderStyleValues.Thin }
|
||||
});
|
||||
|
||||
// Форматы ячеек
|
||||
var cellFormats = new CellFormats() { Count = 4 };
|
||||
cellFormats.Append(new CellFormat
|
||||
{
|
||||
FontId = 0,
|
||||
FillId = 0,
|
||||
BorderId = 0,
|
||||
ApplyFont = true
|
||||
}); // Обычный текст без границ
|
||||
cellFormats.Append(new CellFormat
|
||||
{
|
||||
FontId = 1,
|
||||
FillId = 0,
|
||||
BorderId = 0,
|
||||
ApplyFont = true
|
||||
}); // Жирный текст без границ
|
||||
cellFormats.Append(new CellFormat
|
||||
{
|
||||
FontId = 0,
|
||||
FillId = 0,
|
||||
BorderId = 1,
|
||||
ApplyFont = true,
|
||||
ApplyBorder = true
|
||||
}); // Обычный текст с границами
|
||||
cellFormats.Append(new CellFormat
|
||||
{
|
||||
FontId = 1,
|
||||
FillId = 0,
|
||||
BorderId = 1,
|
||||
ApplyFont = true,
|
||||
ApplyBorder = true
|
||||
}); // Жирный текст с границами
|
||||
|
||||
workbookStylesPart.Stylesheet.Append(fonts);
|
||||
workbookStylesPart.Stylesheet.Append(fills);
|
||||
workbookStylesPart.Stylesheet.Append(borders);
|
||||
workbookStylesPart.Stylesheet.Append(cellFormats);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex)
|
||||
{
|
||||
var columnName = GetExcelColumnName(columnIndex);
|
||||
var cellReference = columnName + rowIndex;
|
||||
|
||||
var row = _sheetData.Elements<Row>().FirstOrDefault(r => r.RowIndex == rowIndex);
|
||||
if (row == null)
|
||||
{
|
||||
row = new Row() { RowIndex = rowIndex };
|
||||
_sheetData.Append(row);
|
||||
}
|
||||
|
||||
var cell = new Cell
|
||||
{
|
||||
CellReference = cellReference,
|
||||
StyleIndex = (UInt32Value)(uint)styleIndex,
|
||||
CellValue = new CellValue(text),
|
||||
DataType = new EnumValue<CellValues>(CellValues.String)
|
||||
};
|
||||
|
||||
row.Append(cell);
|
||||
}
|
||||
|
||||
private static string GetExcelColumnName(int index)
|
||||
{
|
||||
int div = index;
|
||||
string columnName = string.Empty;
|
||||
while (div >= 0)
|
||||
{
|
||||
columnName = (char)(div % 26 + 65) + columnName;
|
||||
div = div / 26 - 1;
|
||||
}
|
||||
return columnName;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
106
CompShop/CompShop/DocumentsBuilder/PdfBuilder.cs
Normal file
106
CompShop/CompShop/DocumentsBuilder/PdfBuilder.cs
Normal file
@ -0,0 +1,106 @@
|
||||
using MigraDoc.DocumentObjectModel;
|
||||
using MigraDoc.DocumentObjectModel.Shapes.Charts;
|
||||
using MigraDoc.Rendering;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Chart = MigraDoc.DocumentObjectModel.Shapes.Charts.Chart;
|
||||
|
||||
namespace CompShop.DocumentsBuilder
|
||||
{
|
||||
internal class PdfBuilder
|
||||
{
|
||||
private readonly string _filePath;
|
||||
|
||||
private readonly Document _document;
|
||||
|
||||
public PdfBuilder(string filePath)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(filePath))
|
||||
{
|
||||
throw new ArgumentNullException(nameof(filePath));
|
||||
}
|
||||
|
||||
if (File.Exists(filePath))
|
||||
{
|
||||
File.Delete(filePath);
|
||||
}
|
||||
|
||||
_filePath = filePath;
|
||||
_document = new Document();
|
||||
DefineStyles();
|
||||
}
|
||||
|
||||
public PdfBuilder AddHeader(string header)
|
||||
{
|
||||
_document.AddSection().AddParagraph(header, "NormalBold");
|
||||
return this;//подпись, число
|
||||
}
|
||||
|
||||
public PdfBuilder AddPieChart(string title, List<(string Caption, double
|
||||
Value)> data)
|
||||
{
|
||||
if (data == null || data.Count == 0)
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
var chart = new Chart(ChartType.Pie2D);
|
||||
var series = chart.SeriesCollection.AddSeries();
|
||||
series.Add(data.Select(x => x.Value).ToArray());
|
||||
|
||||
var xseries = chart.XValues.AddXSeries();
|
||||
xseries.Add(data.Select(x => x.Caption).ToArray());
|
||||
|
||||
chart.DataLabel.Type = DataLabelType.Percent;
|
||||
chart.DataLabel.Position = DataLabelPosition.OutsideEnd;
|
||||
|
||||
chart.Width = Unit.FromCentimeter(16);
|
||||
chart.Height = Unit.FromCentimeter(12);
|
||||
|
||||
chart.TopArea.AddParagraph(title);
|
||||
|
||||
chart.XAxis.MajorTickMark = TickMarkType.Outside;
|
||||
|
||||
chart.YAxis.MajorTickMark = TickMarkType.Outside;
|
||||
chart.YAxis.HasMajorGridlines = true;
|
||||
|
||||
chart.PlotArea.LineFormat.Width = 1;
|
||||
chart.PlotArea.LineFormat.Visible = true;
|
||||
|
||||
chart.TopArea.AddLegend();
|
||||
|
||||
_document.LastSection.Add(chart);
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public void Build()
|
||||
{
|
||||
var renderer = new PdfDocumentRenderer(true)
|
||||
{
|
||||
Document = _document
|
||||
};
|
||||
|
||||
renderer.RenderDocument();
|
||||
renderer.PdfDocument.Save(_filePath);
|
||||
}
|
||||
|
||||
private void DefineStyles()
|
||||
{
|
||||
// Получаем стандартный стиль Normal
|
||||
var normalStyle = _document.Styles["Normal"];
|
||||
normalStyle.Font.Name = "Arial";
|
||||
normalStyle.Font.Size = 12;
|
||||
|
||||
// Создаем стиль для жирного заголовка
|
||||
var boldStyle = _document.Styles.AddStyle("NormalBold", "Normal");
|
||||
boldStyle.Font.Bold = true;
|
||||
boldStyle.Font.Size = 14; // Например, чуть больше стандартного текста
|
||||
boldStyle.ParagraphFormat.Alignment = ParagraphAlignment.Center; // Опционально, выравнивание по центру
|
||||
}
|
||||
|
||||
}
|
||||
}
|
77
CompShop/CompShop/DocumentsBuilder/TableReport.cs
Normal file
77
CompShop/CompShop/DocumentsBuilder/TableReport.cs
Normal file
@ -0,0 +1,77 @@
|
||||
using CompShop.DocumentsBuilder;
|
||||
using CompShop.Repos;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
internal class TableReport
|
||||
{
|
||||
private readonly ICheckRepository _checkRepository;
|
||||
private readonly IProductRepository _productRepository;
|
||||
private readonly ILogger<TableReport> _logger;
|
||||
|
||||
internal static readonly string[] Headers = { "Клиент", "Дата", "Количество" };
|
||||
|
||||
public TableReport(ICheckRepository checkRepository, IProductRepository productRepository, ILoggerFactory loggerFactory)
|
||||
{
|
||||
_checkRepository = checkRepository ?? throw new ArgumentNullException(nameof(checkRepository));
|
||||
_productRepository = productRepository ?? throw new ArgumentNullException(nameof(productRepository));
|
||||
_logger = loggerFactory.CreateLogger<TableReport>();
|
||||
}
|
||||
|
||||
public bool CreateTable(string filePath, int productId, DateTime startDate, DateTime endDate)
|
||||
{
|
||||
try
|
||||
{
|
||||
new ExcelBuilder(filePath)
|
||||
.AddHeader("Отчет по продажам товара", 0, 3)
|
||||
.AddParagraph($"за период с {startDate.ToShortDateString()} по {endDate.ToShortDateString()}", 0)
|
||||
.AddTable(new[] { 20, 20, 15 }, GetData(productId, startDate, endDate))
|
||||
.Build();
|
||||
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Ошибка при формировании отчета");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private List<string[]> GetData(int productId, DateTime startDate, DateTime endDate)
|
||||
{
|
||||
// Получение данных о чеках, содержащих указанный товар
|
||||
var checksWithProduct = _checkRepository
|
||||
.ReadAll()
|
||||
.Where(c => c.PurchaseDate >= startDate && c.PurchaseDate <= endDate
|
||||
&& c.Products.Any(p => p.ProductID == productId))
|
||||
.Select(c => new
|
||||
{
|
||||
ClientName = c.Client?.ToString() ?? "Неизвестно",
|
||||
Date = c.PurchaseDate,
|
||||
Quantity = c.Products
|
||||
.Where(p => p.ProductID == productId)
|
||||
.Sum(p => p.Count)
|
||||
})
|
||||
.OrderBy(x => x.Date);
|
||||
|
||||
// Формирование итоговой таблицы
|
||||
return new List<string[]> { Headers }
|
||||
.Union(
|
||||
checksWithProduct.Select(x => new string[]
|
||||
{
|
||||
x.ClientName,
|
||||
x.Date.ToShortDateString(),
|
||||
x.Quantity.ToString()
|
||||
})
|
||||
)
|
||||
.Union(new[]
|
||||
{
|
||||
new string[]
|
||||
{
|
||||
"Всего",
|
||||
"",
|
||||
checksWithProduct.Sum(x => x.Quantity).ToString()
|
||||
}
|
||||
})
|
||||
.ToList();
|
||||
}
|
||||
}
|
145
CompShop/CompShop/DocumentsBuilder/WordBuilder.cs
Normal file
145
CompShop/CompShop/DocumentsBuilder/WordBuilder.cs
Normal file
@ -0,0 +1,145 @@
|
||||
using DocumentFormat.OpenXml;
|
||||
using DocumentFormat.OpenXml.Packaging;
|
||||
using DocumentFormat.OpenXml.Wordprocessing;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
|
||||
namespace CompShop.DocumentsBuilder
|
||||
{
|
||||
internal class WordBuilder
|
||||
{
|
||||
private readonly string _filePath;
|
||||
private readonly Document _document;
|
||||
private readonly Body _body;
|
||||
public WordBuilder(string filePath)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(filePath))
|
||||
{
|
||||
throw new ArgumentNullException(nameof(filePath));
|
||||
}
|
||||
|
||||
if (File.Exists(filePath))
|
||||
{
|
||||
File.Delete(filePath);
|
||||
}
|
||||
|
||||
_filePath = filePath;
|
||||
_document = new Document();
|
||||
_body = _document.AppendChild(new Body());
|
||||
}
|
||||
|
||||
public WordBuilder AddHeader(string header)
|
||||
{
|
||||
var paragraph = _body.AppendChild(new Paragraph());
|
||||
var run = paragraph.AppendChild(new Run());
|
||||
|
||||
// Добавляем свойства для жирного текста
|
||||
var runProperties = new RunProperties();
|
||||
runProperties.AppendChild(new Bold());
|
||||
run.PrependChild(runProperties);
|
||||
|
||||
// Добавляем текст заголовка
|
||||
run.AppendChild(new Text(header));
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public WordBuilder AddParagraph(string text)
|
||||
{
|
||||
var paragraph = _body.AppendChild(new Paragraph());
|
||||
var run = paragraph.AppendChild(new Run());
|
||||
run.AppendChild(new Text(text));
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public WordBuilder AddTable(int[] widths, List<string[]> data)
|
||||
{
|
||||
if (widths == null || widths.Length == 0)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(widths));
|
||||
}
|
||||
|
||||
if (data == null || data.Count == 0)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(data));
|
||||
}
|
||||
|
||||
if (data.Any(x => x.Length != widths.Length))
|
||||
{
|
||||
throw new InvalidOperationException("widths.Length != data.Length");
|
||||
}
|
||||
|
||||
var table = new Table();
|
||||
table.AppendChild(new TableProperties(
|
||||
new TableBorders(
|
||||
new TopBorder()
|
||||
{
|
||||
Val = new EnumValue<BorderValues>(BorderValues.Single),
|
||||
Size = 12
|
||||
},
|
||||
new BottomBorder()
|
||||
{
|
||||
Val = new EnumValue<BorderValues>(BorderValues.Single),
|
||||
Size = 12
|
||||
},
|
||||
new LeftBorder()
|
||||
{
|
||||
Val = new EnumValue<BorderValues>(BorderValues.Single),
|
||||
Size = 12
|
||||
},
|
||||
new RightBorder()
|
||||
{
|
||||
Val = new EnumValue<BorderValues>(BorderValues.Single),
|
||||
Size = 12
|
||||
},
|
||||
new InsideHorizontalBorder()
|
||||
{
|
||||
Val = new EnumValue<BorderValues>(BorderValues.Single),
|
||||
Size = 12
|
||||
},
|
||||
new InsideVerticalBorder()
|
||||
{
|
||||
Val = new EnumValue<BorderValues>(BorderValues.Single),
|
||||
Size = 12
|
||||
}
|
||||
)
|
||||
));
|
||||
|
||||
// Заголовок
|
||||
var tr = new TableRow();
|
||||
for (var j = 0; j < widths.Length; ++j)
|
||||
{
|
||||
tr.Append(new TableCell(
|
||||
new TableCellProperties(new TableCellWidth()
|
||||
{
|
||||
Width =
|
||||
widths[j].ToString()
|
||||
}),
|
||||
new Paragraph(new Run(new RunProperties(new Bold()), new
|
||||
Text(data.First()[j])))));
|
||||
}
|
||||
table.Append(tr);
|
||||
|
||||
// Данные
|
||||
table.Append(data.Skip(1).Select(x =>
|
||||
new TableRow(x.Select(y => new TableCell(new Paragraph(new
|
||||
Run(new Text(y))))))));
|
||||
|
||||
_body.Append(table);
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public void Build()
|
||||
{
|
||||
using var wordDocument = WordprocessingDocument.Create(_filePath,
|
||||
WordprocessingDocumentType.Document);
|
||||
var mainPart = wordDocument.AddMainDocumentPart();
|
||||
mainPart.Document = _document;
|
||||
}
|
||||
}
|
||||
}
|
@ -9,7 +9,7 @@ namespace CompShop.Entites
|
||||
public Client Client { get; set; }
|
||||
|
||||
[System.ComponentModel.Browsable(false)]
|
||||
public int ClientId { get; set; }
|
||||
public int ClientId { get; set; }
|
||||
public DateTime PurchaseDate { get; set; }
|
||||
|
||||
public static Check CreateEntity(int id, List<ProductInCheck> products, Client client, DateTime purchaseDate)
|
||||
|
@ -31,4 +31,3 @@ namespace CompShop.Entites
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,10 @@
|
||||
namespace CompShop.Entites.Enums
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CompShop.Entites.Enums
|
||||
{
|
||||
public enum ClientType
|
||||
{
|
||||
|
@ -1,4 +1,10 @@
|
||||
namespace CompShop.Entites.Enums
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CompShop.Entites.Enums
|
||||
{
|
||||
[Flags]
|
||||
public enum ProductType
|
||||
|
@ -12,14 +12,11 @@ namespace CompShop.Entites
|
||||
|
||||
public static Product CreateEntity(int id, string name, string desc, decimal price, ProductType productType)
|
||||
{
|
||||
return new Product
|
||||
{
|
||||
ID = id,
|
||||
return new Product { ID = id,
|
||||
Name = name ?? string.Empty,
|
||||
Description = desc ?? string.Empty,
|
||||
Price = price,
|
||||
ProductType = productType
|
||||
};
|
||||
ProductType = productType };
|
||||
}
|
||||
public override string ToString()
|
||||
{
|
||||
|
@ -14,7 +14,7 @@ namespace CompShop.Entites
|
||||
public int Count { get; set; }
|
||||
public static ProductInCheck CreateElement(int id, int count)
|
||||
{
|
||||
return new ProductInCheck { ProductID = id, Count = count };
|
||||
return new ProductInCheck { ProductID = id, Count = count};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -23,4 +23,4 @@ namespace CompShop.Entites
|
||||
return Adress;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
43
CompShop/CompShop/Forms/Form1.Designer.cs
generated
43
CompShop/CompShop/Forms/Form1.Designer.cs
generated
@ -37,13 +37,17 @@
|
||||
операцииToolStripMenuItem = new ToolStripMenuItem();
|
||||
товарыНаСкаледToolStripMenuItem = new ToolStripMenuItem();
|
||||
чекиToolStripMenuItem = new ToolStripMenuItem();
|
||||
отчетToolStripMenuItem = new ToolStripMenuItem();
|
||||
документсправочникToolStripMenuItem = new ToolStripMenuItem();
|
||||
продажиТоваровToolStripMenuItem = new ToolStripMenuItem();
|
||||
отчетграфикToolStripMenuItem = new ToolStripMenuItem();
|
||||
menuStrip1.SuspendLayout();
|
||||
SuspendLayout();
|
||||
//
|
||||
// menuStrip1
|
||||
//
|
||||
menuStrip1.ImageScalingSize = new Size(20, 20);
|
||||
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem });
|
||||
menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчетToolStripMenuItem });
|
||||
menuStrip1.Location = new Point(0, 0);
|
||||
menuStrip1.Name = "menuStrip1";
|
||||
menuStrip1.Size = new Size(800, 28);
|
||||
@ -88,17 +92,45 @@
|
||||
// товарыНаСкаледToolStripMenuItem
|
||||
//
|
||||
товарыНаСкаледToolStripMenuItem.Name = "товарыНаСкаледToolStripMenuItem";
|
||||
товарыНаСкаледToolStripMenuItem.Size = new Size(224, 26);
|
||||
товарыНаСкаледToolStripMenuItem.Size = new Size(216, 26);
|
||||
товарыНаСкаледToolStripMenuItem.Text = "Товары на складе";
|
||||
товарыНаСкаледToolStripMenuItem.Click += товарыНаСкаледToolStripMenuItem_Click;
|
||||
//
|
||||
// чекиToolStripMenuItem
|
||||
//
|
||||
чекиToolStripMenuItem.Name = "чекиToolStripMenuItem";
|
||||
чекиToolStripMenuItem.Size = new Size(224, 26);
|
||||
чекиToolStripMenuItem.Size = new Size(216, 26);
|
||||
чекиToolStripMenuItem.Text = "Чеки...";
|
||||
чекиToolStripMenuItem.Click += чекиToolStripMenuItem_Click;
|
||||
//
|
||||
// отчетToolStripMenuItem
|
||||
//
|
||||
отчетToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { документсправочникToolStripMenuItem, продажиТоваровToolStripMenuItem, отчетграфикToolStripMenuItem });
|
||||
отчетToolStripMenuItem.Name = "отчетToolStripMenuItem";
|
||||
отчетToolStripMenuItem.Size = new Size(82, 24);
|
||||
отчетToolStripMenuItem.Text = "Отчеты...";
|
||||
//
|
||||
// документсправочникToolStripMenuItem
|
||||
//
|
||||
документсправочникToolStripMenuItem.Name = "документсправочникToolStripMenuItem";
|
||||
документсправочникToolStripMenuItem.Size = new Size(248, 26);
|
||||
документсправочникToolStripMenuItem.Text = "Документ-справочник";
|
||||
документсправочникToolStripMenuItem.Click += документсправочникToolStripMenuItem_Click;
|
||||
//
|
||||
// продажиТоваровToolStripMenuItem
|
||||
//
|
||||
продажиТоваровToolStripMenuItem.Name = "продажиТоваровToolStripMenuItem";
|
||||
продажиТоваровToolStripMenuItem.Size = new Size(248, 26);
|
||||
продажиТоваровToolStripMenuItem.Text = "Продажи товаров";
|
||||
продажиТоваровToolStripMenuItem.Click += продажиТоваровToolStripMenuItem_Click;
|
||||
//
|
||||
// отчетграфикToolStripMenuItem
|
||||
//
|
||||
отчетграфикToolStripMenuItem.Name = "отчетграфикToolStripMenuItem";
|
||||
отчетграфикToolStripMenuItem.Size = new Size(248, 26);
|
||||
отчетграфикToolStripMenuItem.Text = "Отчет-график";
|
||||
отчетграфикToolStripMenuItem.Click += отчетграфикToolStripMenuItem_Click;
|
||||
//
|
||||
// ShopForm
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
@ -110,6 +142,7 @@
|
||||
MainMenuStrip = menuStrip1;
|
||||
Name = "ShopForm";
|
||||
Text = "Магазин электроники";
|
||||
Load += ShopForm_Load;
|
||||
menuStrip1.ResumeLayout(false);
|
||||
menuStrip1.PerformLayout();
|
||||
ResumeLayout(false);
|
||||
@ -126,5 +159,9 @@
|
||||
private ToolStripMenuItem операцииToolStripMenuItem;
|
||||
private ToolStripMenuItem товарыНаСкаледToolStripMenuItem;
|
||||
private ToolStripMenuItem чекиToolStripMenuItem;
|
||||
private ToolStripMenuItem отчетToolStripMenuItem;
|
||||
private ToolStripMenuItem документсправочникToolStripMenuItem;
|
||||
private ToolStripMenuItem продажиТоваровToolStripMenuItem;
|
||||
private ToolStripMenuItem отчетграфикToolStripMenuItem;
|
||||
}
|
||||
}
|
@ -2,6 +2,7 @@ using CompShop.Forms;
|
||||
using CompShop.Forms.ProductsOnStorage;
|
||||
using CompShop.Forms.Receipt;
|
||||
using CompShop.Forms.Storage;
|
||||
using CompShop.Forms.WordDocReport;
|
||||
using Unity;
|
||||
|
||||
namespace CompShop
|
||||
@ -44,5 +45,25 @@ namespace CompShop
|
||||
_container.Resolve<CheckForm>().ShowDialog();
|
||||
|
||||
}
|
||||
|
||||
private void äîêóìåíòñïðàâî÷íèêToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
_container.Resolve<DocReportForm>().ShowDialog();
|
||||
}
|
||||
|
||||
private void ïðîäàæèÒîâàðîâToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
_container.Resolve<ExcelReportForm>().ShowDialog();
|
||||
}
|
||||
|
||||
private void ShopForm_Load(object sender, EventArgs e)
|
||||
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void îò÷åòãðàôèêToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
_container.Resolve<PdfReportForm>().ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
@ -56,7 +56,7 @@
|
||||
productsDataGridView.Size = new Size(851, 400);
|
||||
productsDataGridView.TabIndex = 8;
|
||||
//
|
||||
// deleteButton
|
||||
// editButton
|
||||
//
|
||||
editButton.Location = new Point(881, 78);
|
||||
editButton.Name = "editButton";
|
||||
|
@ -32,9 +32,9 @@ namespace CompShop.Forms.ProductsOnStorage
|
||||
throw new InvalidDataException("Record not found");
|
||||
}
|
||||
//ProductComboBox
|
||||
foreach (var item in _productRepository.ReadAll())
|
||||
foreach(var item in _productRepository.ReadAll() )
|
||||
{
|
||||
if (item.ID == record.ProductId)
|
||||
if(item.ID == record.ProductId)
|
||||
{
|
||||
productCombobox.SelectedItem = item;
|
||||
}
|
||||
@ -114,4 +114,4 @@ namespace CompShop.Forms.ProductsOnStorage
|
||||
return Entites.ProductsOnStorage.CreateEntity(id, product, storage, count);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
86
CompShop/CompShop/Forms/WordDocReport/DocReportForm.Designer.cs
generated
Normal file
86
CompShop/CompShop/Forms/WordDocReport/DocReportForm.Designer.cs
generated
Normal file
@ -0,0 +1,86 @@
|
||||
namespace CompShop.Forms.WordDocReport
|
||||
{
|
||||
partial class DocReportForm
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
label1 = new Label();
|
||||
buildReportButton = new Button();
|
||||
entitiesCheckedListBox = new CheckedListBox();
|
||||
SuspendLayout();
|
||||
//
|
||||
// label1
|
||||
//
|
||||
label1.AutoSize = true;
|
||||
label1.Location = new Point(12, 9);
|
||||
label1.Name = "label1";
|
||||
label1.Size = new Size(164, 20);
|
||||
label1.TabIndex = 0;
|
||||
label1.Text = "Что включить в отчет?";
|
||||
//
|
||||
// buildReportButton
|
||||
//
|
||||
buildReportButton.Anchor = AnchorStyles.Bottom;
|
||||
buildReportButton.Location = new Point(81, 174);
|
||||
buildReportButton.Name = "buildReportButton";
|
||||
buildReportButton.Size = new Size(143, 29);
|
||||
buildReportButton.TabIndex = 1;
|
||||
buildReportButton.Text = "Сформировать";
|
||||
buildReportButton.UseVisualStyleBackColor = true;
|
||||
buildReportButton.Click += buildReportButton_Click;
|
||||
//
|
||||
// entitiesCheckedListBox
|
||||
//
|
||||
entitiesCheckedListBox.FormattingEnabled = true;
|
||||
entitiesCheckedListBox.Items.AddRange(new object[] { "Клиенты", "Товары", "Склады" });
|
||||
entitiesCheckedListBox.Location = new Point(12, 42);
|
||||
entitiesCheckedListBox.Name = "entitiesCheckedListBox";
|
||||
entitiesCheckedListBox.Size = new Size(273, 114);
|
||||
entitiesCheckedListBox.TabIndex = 2;
|
||||
//
|
||||
// DocReportForm
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(311, 215);
|
||||
Controls.Add(entitiesCheckedListBox);
|
||||
Controls.Add(buildReportButton);
|
||||
Controls.Add(label1);
|
||||
Name = "DocReportForm";
|
||||
Text = "DocReportForm";
|
||||
eegov
commented
Заголовок формы оформлен неверно Заголовок формы оформлен неверно
|
||||
Load += DocReportForm_Load;
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private Label label1;
|
||||
private Button buildReportButton;
|
||||
private CheckedListBox entitiesCheckedListBox;
|
||||
}
|
||||
}
|
71
CompShop/CompShop/Forms/WordDocReport/DocReportForm.cs
Normal file
71
CompShop/CompShop/Forms/WordDocReport/DocReportForm.cs
Normal file
@ -0,0 +1,71 @@
|
||||
using CompShop.DocumentsBuilder;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using Unity;
|
||||
|
||||
namespace CompShop.Forms.WordDocReport
|
||||
{
|
||||
public partial class DocReportForm : Form
|
||||
{
|
||||
private readonly IUnityContainer _container;
|
||||
|
||||
public DocReportForm(IUnityContainer container)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
_container = container ?? throw new ArgumentNullException(nameof(container));
|
||||
}
|
||||
|
||||
private void DocReportForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void buildReportButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!entitiesCheckedListBox.GetItemChecked(0) && !entitiesCheckedListBox.GetItemChecked(1) && !entitiesCheckedListBox.GetItemChecked(2))
|
||||
{
|
||||
throw new Exception("Не выбран ни один справочник для выгрузки");
|
||||
}
|
||||
|
||||
var sfd = new SaveFileDialog()
|
||||
{
|
||||
Filter = "Docx Files | *.docx"
|
||||
};
|
||||
|
||||
if (sfd.ShowDialog() != DialogResult.OK)
|
||||
{
|
||||
throw new Exception("Не выбран файла для отчета");
|
||||
}
|
||||
|
||||
if (_container.Resolve<DocReport>().CreateDoc(sfd.FileName, entitiesCheckedListBox.GetItemChecked(0),
|
||||
entitiesCheckedListBox.GetItemChecked(1),
|
||||
entitiesCheckedListBox.GetItemChecked(2)))
|
||||
{
|
||||
MessageBox.Show("Документ сформирован",
|
||||
"Формирование документа",
|
||||
MessageBoxButtons.OK,
|
||||
MessageBoxIcon.Information);
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBox.Show("Возникли ошибки при документа.Подробности в логах",
|
||||
"Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(ex.Message, "Ошибка при создании отчета", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
60
CompShop/CompShop/Forms/WordDocReport/DocReportForm.resx
Normal file
60
CompShop/CompShop/Forms/WordDocReport/DocReportForm.resx
Normal file
@ -0,0 +1,60 @@
|
||||
<root>
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
165
CompShop/CompShop/Forms/WordDocReport/ExcelReportForm.Designer.cs
generated
Normal file
165
CompShop/CompShop/Forms/WordDocReport/ExcelReportForm.Designer.cs
generated
Normal file
@ -0,0 +1,165 @@
|
||||
namespace CompShop.Forms.WordDocReport
|
||||
{
|
||||
partial class ExcelReportForm
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
formButton = new Button();
|
||||
dateTimePickerDo = new DateTimePicker();
|
||||
label4 = new Label();
|
||||
dateTimePickerOt = new DateTimePicker();
|
||||
label3 = new Label();
|
||||
productCombobox = new ComboBox();
|
||||
label2 = new Label();
|
||||
pathChoiceButton = new Button();
|
||||
pathTextbox = new TextBox();
|
||||
label1 = new Label();
|
||||
SuspendLayout();
|
||||
//
|
||||
// formButton
|
||||
//
|
||||
formButton.Anchor = AnchorStyles.Bottom;
|
||||
formButton.Location = new Point(178, 240);
|
||||
formButton.Name = "formButton";
|
||||
formButton.Size = new Size(138, 29);
|
||||
formButton.TabIndex = 29;
|
||||
formButton.Text = "Формировать";
|
||||
formButton.UseVisualStyleBackColor = true;
|
||||
formButton.Click += formButton_Click;
|
||||
//
|
||||
// dateTimePickerDo
|
||||
//
|
||||
dateTimePickerDo.Location = new Point(156, 161);
|
||||
dateTimePickerDo.Name = "dateTimePickerDo";
|
||||
dateTimePickerDo.Size = new Size(250, 27);
|
||||
dateTimePickerDo.TabIndex = 28;
|
||||
//
|
||||
// label4
|
||||
//
|
||||
label4.AutoSize = true;
|
||||
label4.Location = new Point(19, 166);
|
||||
label4.Name = "label4";
|
||||
label4.Size = new Size(31, 20);
|
||||
label4.TabIndex = 27;
|
||||
label4.Text = "До:";
|
||||
//
|
||||
// dateTimePickerOt
|
||||
//
|
||||
dateTimePickerOt.Location = new Point(156, 117);
|
||||
dateTimePickerOt.Name = "dateTimePickerOt";
|
||||
dateTimePickerOt.Size = new Size(250, 27);
|
||||
dateTimePickerOt.TabIndex = 26;
|
||||
//
|
||||
// label3
|
||||
//
|
||||
label3.AutoSize = true;
|
||||
label3.Location = new Point(19, 122);
|
||||
label3.Name = "label3";
|
||||
label3.Size = new Size(29, 20);
|
||||
label3.TabIndex = 25;
|
||||
label3.Text = "От:";
|
||||
//
|
||||
// productCombobox
|
||||
//
|
||||
productCombobox.FormattingEnabled = true;
|
||||
productCombobox.Location = new Point(156, 68);
|
||||
productCombobox.Name = "productCombobox";
|
||||
productCombobox.Size = new Size(251, 28);
|
||||
productCombobox.TabIndex = 24;
|
||||
//
|
||||
// label2
|
||||
//
|
||||
label2.AutoSize = true;
|
||||
label2.Location = new Point(19, 71);
|
||||
label2.Name = "label2";
|
||||
label2.Size = new Size(54, 20);
|
||||
label2.TabIndex = 23;
|
||||
label2.Text = "Товар:";
|
||||
//
|
||||
// pathChoiceButton
|
||||
//
|
||||
pathChoiceButton.Location = new Point(372, 14);
|
||||
pathChoiceButton.Name = "pathChoiceButton";
|
||||
pathChoiceButton.Size = new Size(35, 29);
|
||||
pathChoiceButton.TabIndex = 22;
|
||||
pathChoiceButton.Text = "...";
|
||||
pathChoiceButton.UseVisualStyleBackColor = true;
|
||||
pathChoiceButton.Click += pathChoiceButton_Click;
|
||||
//
|
||||
// pathTextbox
|
||||
//
|
||||
pathTextbox.Location = new Point(156, 15);
|
||||
pathTextbox.Name = "pathTextbox";
|
||||
pathTextbox.ReadOnly = true;
|
||||
pathTextbox.Size = new Size(210, 27);
|
||||
pathTextbox.TabIndex = 21;
|
||||
//
|
||||
// label1
|
||||
//
|
||||
label1.AutoSize = true;
|
||||
label1.Location = new Point(19, 18);
|
||||
label1.Name = "label1";
|
||||
label1.Size = new Size(116, 20);
|
||||
label1.TabIndex = 20;
|
||||
label1.Text = "Путь до файла: ";
|
||||
//
|
||||
// ExcelReportForm
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(478, 281);
|
||||
Controls.Add(formButton);
|
||||
Controls.Add(dateTimePickerDo);
|
||||
Controls.Add(label4);
|
||||
Controls.Add(dateTimePickerOt);
|
||||
Controls.Add(label3);
|
||||
Controls.Add(productCombobox);
|
||||
Controls.Add(label2);
|
||||
Controls.Add(pathChoiceButton);
|
||||
Controls.Add(pathTextbox);
|
||||
Controls.Add(label1);
|
||||
Name = "ExcelReportForm";
|
||||
Text = "ExcelReportForm";
|
||||
Load += ExcelReportForm_Load;
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private Button formButton;
|
||||
private DateTimePicker dateTimePickerDo;
|
||||
private Label label4;
|
||||
private DateTimePicker dateTimePickerOt;
|
||||
private Label label3;
|
||||
private ComboBox productCombobox;
|
||||
private Label label2;
|
||||
private Button pathChoiceButton;
|
||||
private TextBox pathTextbox;
|
||||
private Label label1;
|
||||
}
|
||||
}
|
90
CompShop/CompShop/Forms/WordDocReport/ExcelReportForm.cs
Normal file
90
CompShop/CompShop/Forms/WordDocReport/ExcelReportForm.cs
Normal file
@ -0,0 +1,90 @@
|
||||
using CompShop.Repos;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using Unity;
|
||||
|
||||
namespace CompShop.Forms.WordDocReport
|
||||
{
|
||||
public partial class ExcelReportForm : Form
|
||||
{
|
||||
private readonly IUnityContainer _container;
|
||||
|
||||
public ExcelReportForm(IUnityContainer container, IProductRepository productRepository)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
_container = container ?? throw new ArgumentNullException(nameof(container));
|
||||
|
||||
productCombobox.DataSource = productRepository.ReadAll();
|
||||
productCombobox.DisplayMember = "Name";
|
||||
productCombobox.ValueMember = "Id";
|
||||
}
|
||||
|
||||
private void ExcelReportForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void formButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(pathTextbox.Text))
|
||||
{
|
||||
throw new Exception("Отсутствует имя файла для отчета");
|
||||
}
|
||||
|
||||
if (productCombobox.SelectedIndex < 0)
|
||||
{
|
||||
throw new Exception("Не выбран товар");
|
||||
}
|
||||
|
||||
if (dateTimePickerDo.Value <= dateTimePickerOt.Value)
|
||||
{
|
||||
throw new Exception("Дата начала должна быть раньше даты окончания");
|
||||
}
|
||||
|
||||
if (_container.Resolve<TableReport>().CreateTable(pathTextbox.Text,
|
||||
(int)productCombobox.SelectedValue!,
|
||||
dateTimePickerOt.Value, dateTimePickerDo.Value))
|
||||
{
|
||||
MessageBox.Show("Документ сформирован", "Формирование документа",
|
||||
MessageBoxButtons.OK,
|
||||
MessageBoxIcon.Information);
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах", "Формирование документа",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(ex.Message, "Ошибка при создании очета",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private void pathChoiceButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
var sfd = new SaveFileDialog()
|
||||
{
|
||||
Filter = "Excel Files | *.xlsx"
|
||||
};
|
||||
|
||||
if (sfd.ShowDialog() != DialogResult.OK)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
pathTextbox.Text = sfd.FileName;
|
||||
}
|
||||
}
|
||||
}
|
60
CompShop/CompShop/Forms/WordDocReport/ExcelReportForm.resx
Normal file
60
CompShop/CompShop/Forms/WordDocReport/ExcelReportForm.resx
Normal file
@ -0,0 +1,60 @@
|
||||
<root>
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
109
CompShop/CompShop/Forms/WordDocReport/PdfReportForm.Designer.cs
generated
Normal file
109
CompShop/CompShop/Forms/WordDocReport/PdfReportForm.Designer.cs
generated
Normal file
@ -0,0 +1,109 @@
|
||||
namespace CompShop.Forms.WordDocReport
|
||||
{
|
||||
partial class PdfReportForm
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
formButton = new Button();
|
||||
fileDialogButton = new Button();
|
||||
fileLabel = new Label();
|
||||
label1 = new Label();
|
||||
dateTimePicker = new DateTimePicker();
|
||||
SuspendLayout();
|
||||
//
|
||||
// formButton
|
||||
//
|
||||
formButton.Anchor = AnchorStyles.Bottom;
|
||||
formButton.Location = new Point(106, 138);
|
||||
formButton.Name = "formButton";
|
||||
formButton.Size = new Size(138, 29);
|
||||
formButton.TabIndex = 30;
|
||||
formButton.Text = "Формировать";
|
||||
formButton.UseVisualStyleBackColor = true;
|
||||
formButton.Click += formButton_Click;
|
||||
//
|
||||
// fileDialogButton
|
||||
//
|
||||
fileDialogButton.Location = new Point(41, 23);
|
||||
fileDialogButton.Name = "fileDialogButton";
|
||||
fileDialogButton.Size = new Size(94, 29);
|
||||
fileDialogButton.TabIndex = 31;
|
||||
fileDialogButton.Text = "Выбрать";
|
||||
fileDialogButton.UseVisualStyleBackColor = true;
|
||||
fileDialogButton.Click += button1_Click;
|
||||
//
|
||||
// fileLabel
|
||||
//
|
||||
fileLabel.AutoSize = true;
|
||||
fileLabel.Location = new Point(141, 28);
|
||||
fileLabel.Name = "fileLabel";
|
||||
fileLabel.Size = new Size(45, 20);
|
||||
fileLabel.TabIndex = 32;
|
||||
fileLabel.Text = "Файл";
|
||||
//
|
||||
// label1
|
||||
//
|
||||
label1.AutoSize = true;
|
||||
label1.Location = new Point(41, 80);
|
||||
label1.Name = "label1";
|
||||
label1.Size = new Size(44, 20);
|
||||
label1.TabIndex = 33;
|
||||
label1.Text = "Дата:";
|
||||
//
|
||||
// dateTimePicker
|
||||
//
|
||||
dateTimePicker.Location = new Point(91, 78);
|
||||
dateTimePicker.Name = "dateTimePicker";
|
||||
dateTimePicker.Size = new Size(250, 27);
|
||||
dateTimePicker.TabIndex = 34;
|
||||
//
|
||||
// PdfReportForm
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(362, 179);
|
||||
Controls.Add(dateTimePicker);
|
||||
Controls.Add(label1);
|
||||
Controls.Add(fileLabel);
|
||||
Controls.Add(fileDialogButton);
|
||||
Controls.Add(formButton);
|
||||
Name = "PdfReportForm";
|
||||
Text = "PdfReportForm";
|
||||
Load += PdfReportForm_Load;
|
||||
ResumeLayout(false);
|
||||
PerformLayout();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private Button formButton;
|
||||
private Button fileDialogButton;
|
||||
private Label fileLabel;
|
||||
private Label label1;
|
||||
private DateTimePicker dateTimePicker;
|
||||
}
|
||||
}
|
71
CompShop/CompShop/Forms/WordDocReport/PdfReportForm.cs
Normal file
71
CompShop/CompShop/Forms/WordDocReport/PdfReportForm.cs
Normal file
@ -0,0 +1,71 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using Unity;
|
||||
|
||||
namespace CompShop.Forms.WordDocReport
|
||||
{
|
||||
public partial class PdfReportForm : Form
|
||||
{
|
||||
private string _fileName = string.Empty;
|
||||
private readonly IUnityContainer _container;
|
||||
|
||||
public PdfReportForm(IUnityContainer container)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
_container = container ?? throw new ArgumentNullException(nameof(container));
|
||||
}
|
||||
|
||||
private void PdfReportForm_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void button1_Click(object sender, EventArgs e)
|
||||
{
|
||||
var sfd = new SaveFileDialog()
|
||||
{
|
||||
Filter = "Pdf Files | *.pdf"
|
||||
};
|
||||
|
||||
if (sfd.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
_fileName = sfd.FileName;
|
||||
fileLabel.Text = Path.GetFileName(_fileName);
|
||||
}
|
||||
}
|
||||
|
||||
private void formButton_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(_fileName))
|
||||
{
|
||||
throw new Exception("Отсутствует имя файла для отчета");
|
||||
}
|
||||
|
||||
if (_container.Resolve<ChartReport>().CreateChart(_fileName, dateTimePicker.Value))
|
||||
{
|
||||
MessageBox.Show("Документ сформирован", "Формирование документа",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах",
|
||||
"Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(ex.Message, "Ошибка при создании очета", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
60
CompShop/CompShop/Forms/WordDocReport/PdfReportForm.resx
Normal file
60
CompShop/CompShop/Forms/WordDocReport/PdfReportForm.resx
Normal file
@ -0,0 +1,60 @@
|
||||
<root>
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
@ -1,4 +1,10 @@
|
||||
using CompShop.Entites;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CompShop.Repos
|
||||
{
|
||||
public interface IProductOnStorageRepository
|
||||
@ -8,4 +14,4 @@ namespace CompShop.Repos
|
||||
void Create(ProductsOnStorage ps);
|
||||
void Delete(int id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,9 @@
|
||||
using CompShop.Entites;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CompShop.Repos
|
||||
{
|
||||
|
@ -21,6 +21,7 @@ namespace CompShop.Repos.Impements
|
||||
_logger = loggerFactory.CreateLogger<CheckRepo>();
|
||||
_clientRepository = clientRepository ?? throw new ArgumentNullException(nameof(clientRepository));
|
||||
}
|
||||
|
||||
|
||||
private IDbConnection CreateConnection() => new NpgsqlConnection(_connectionString.ConnectionString);
|
||||
|
||||
|
@ -132,4 +132,4 @@ namespace CompShop.Repos.Impements
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -108,7 +108,7 @@ namespace CompShop.Repos.Impements
|
||||
_logger.LogError(ex, "Ошибка при чтении объектов");
|
||||
throw;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
public Product Update(Product product)
|
||||
|
@ -134,4 +134,3 @@ namespace CompShop.Repos.Impements
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -137,4 +137,4 @@ namespace CompShop.Repos.Impements
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user
Пустых методов быть не должно