tellsense/ISEbd-22_Baygulov_A.A._SushiBar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправления №1

Browse Source
This commit is contained in:
Андрей Байгулов 2024-04-11 20:52:16 +04:00
parent 1d2926e90d
commit 0570b9089c
7 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SushiBar/SushiBarBusinessLogic/AbstractSaveToPdf.cs
View File

@ -1,7 +1,5 @@
using SishiBarBusinessLogic.OfficePackage.HelperModels;
using SushiBarBusinessLogic.OfficePackage.HelperEnums;
using SushiBarBusinessLogic.OfficePackage.HelperEnums;
using SushiBarBusinessLogic.OfficePackage.HelperModels;
using SushiBarpBusinessLogic.OfficePackage.HelperModels;
using System.Collections.Generic;
using System.Linq;
namespace SushiBarBusinessLogic.OfficePackage

2
SushiBar/SushiBarBusinessLogic/PdfInfo.cs
View File

@ -1,6 +1,6 @@
using SushiBarContracts.ViewModels;
namespace SishiBarBusinessLogic.OfficePackage.HelperModels
namespace SushiBarBusinessLogic.OfficePackage.HelperModels
{
public class PdfInfo
{

2
SushiBar/SushiBarBusinessLogic/PdfParagraph.cs
View File

@ -1,5 +1,5 @@
using SushiBarBusinessLogic.OfficePackage.HelperEnums;
namespace SushiBarpBusinessLogic.OfficePackage.HelperModels
namespace SushiBarBusinessLogic.OfficePackage.HelperModels
{
public class PdfParagraph
{

3
SushiBar/SushiBarBusinessLogic/ReportLogic.cs
View File

@ -1,4 +1,5 @@
using SushiBarBusinessLogic.OfficePackage;

using SushiBarBusinessLogic.OfficePackage;
using SushiBarBusinessLogic.OfficePackage.HelperModels;
using SushiBarContracts.BindingModels;
using SushiBarContracts.BusinessLogicsContracts;

31
SushiBar/SushiBarBusinessLogic/SaveToExcel.cs
View File

@ -6,7 +6,6 @@ using DocumentFormat.OpenXml.Spreadsheet;
using Microsoft.Extensions.Primitives;
using SushiBarBusinessLogic.OfficePackage.HelperEnums;
using SushiBarBusinessLogic.OfficePackage.HelperModels;
using static System.Net.Mime.MediaTypeNames;
namespace SushiBarBusinessLogic.OfficePackage.Implements
{
@ -228,12 +227,10 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
worksheetPart.Worksheet = new Worksheet(new SheetData());
// Добавляем лист в книгу
var sheets =
_spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
var sheet = new Sheet()
{
Id =
_spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
SheetId = 1,
Name = "Лист"
};
@ -253,11 +250,9 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
}
// Ищем строку, либо добавляем ее
Row row;
if (sheetData.Elements<Row>().Where(r => r.RowIndex! ==
excelParams.RowIndex).Any())
if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
{
row = sheetData.Elements<Row>().Where(r => r.RowIndex! ==
excelParams.RowIndex).First();
row = sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).First();
}
else
{
@ -267,8 +262,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
// Ищем нужную ячейку
Cell cell; if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
{
cell = row.Elements<Cell>().Where(c => c.CellReference!.Value ==
excelParams.CellReference).First();
cell = row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
}
else
{
@ -277,8 +271,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
Cell? refCell = null;
foreach (Cell rowCell in row.Elements<Cell>())
{
if (string.Compare(rowCell.CellReference!.Value,
excelParams.CellReference, true) > 0)
if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0)
{
refCell = rowCell;
break;
@ -286,19 +279,15 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
}
var newCell = new Cell()
{
CellReference =
excelParams.CellReference
CellReference = excelParams.CellReference
};
row.InsertBefore(newCell, refCell);
cell = newCell;
}
// вставляем новый текст
_shareStringPart.SharedStringTable.AppendChild(new
SharedStringItem(new Text(excelParams.Text)));
_shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
_shareStringPart.SharedStringTable.Save();
cell.CellValue = new
CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count(
) - 1).ToString());
cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
}
@ -339,7 +328,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
return;
}
_spreadsheetDocument.WorkbookPart!.Workbook.Save();
_spreadsheetDocument.Close();
_spreadsheetDocument.Dispose();
}
}
}

6
SushiBar/SushiBarBusinessLogic/SaveToPdf.cs
View File

@ -2,11 +2,8 @@
using MigraDoc.DocumentObjectModel;
using MigraDoc.DocumentObjectModel.Tables;
using MigraDoc.Rendering;
using SishiBarBusinessLogic.OfficePackage.HelperModels;
using SushiBarBusinessLogic.OfficePackage;
using SushiBarBusinessLogic.OfficePackage.HelperEnums;
using SushiBarBusinessLogic.OfficePackage.HelperModels;
using SushiBarpBusinessLogic.OfficePackage.HelperModels;
namespace SushiBarBusinessLogic.OfficePackage.Implements
{
public class SaveToPdf : AbstractSaveToPdf
@ -51,8 +48,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
}
var paragraph = _section.AddParagraph(pdfParagraph.Text);
paragraph.Format.SpaceAfter = "1cm";
paragraph.Format.Alignment =
GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
paragraph.Style = pdfParagraph.Style;
}
protected override void CreateTable(List<string> columns)

4
SushiBar/SushiBarBusinessLogic/SaveToWord.cs
View File

@ -1,7 +1,5 @@
using SushiBarBusinessLogic.OfficePackage.HelperEnums;
using SushiBarBusinessLogic.OfficePackage.HelperModels;
using static System.Net.Mime.MediaTypeNames;
using System.Reflection.Metadata;
using DocumentFormat.OpenXml;
using DocumentFormat.OpenXml.Packaging;
using DocumentFormat.OpenXml.Wordprocessing;
@ -117,7 +115,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
}
_docBody.AppendChild(CreateSectionProperties());
_wordDocument.MainDocumentPart!.Document.Save();
_wordDocument.Close();
_wordDocument.Dispose();
}
}
}