Skip to content

Commit 6d3be3f

Browse files
committed
Doing a bit of code cleanup.
1 parent a89d305 commit 6d3be3f

File tree

1 file changed

+6
-79
lines changed
  • eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/ExcelService

1 file changed

+6
-79
lines changed

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/ExcelService/ExcelService.cs

Lines changed: 6 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using DocumentFormat.OpenXml.Validation;
1717
using Microsoft.EntityFrameworkCore;
1818
using Microsoft.Extensions.Logging;
19-
using Microting.eFormApi.BasePn.Abstractions;
2019
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
2120
using Microting.EformBackendConfigurationBase.Infrastructure.Data;
2221
using Sentry;
@@ -26,30 +25,16 @@ namespace BackendConfiguration.Pn.Services.ExcelService;
2625
public class ExcelService(
2726
ILogger<ExcelService> logger,
2827
IBackendConfigurationLocalizationService localizationService,
29-
BackendConfigurationPnDbContext backendConfigurationPnDbContext,
30-
IUserService userService,
31-
IEFormCoreService coreHelper)
28+
BackendConfigurationPnDbContext backendConfigurationPnDbContext)
3229
: IExcelService
3330
{
34-
private readonly IUserService _userService = userService;
3531

3632
public async Task<Stream> GenerateWorkOrderCaseReport(TaskManagementFiltersModel filtersModel,
3733
List<WorkorderCaseModel> workOrderCaseModels)
3834
{
3935
try
4036
{
41-
var filtersLastAssignedTo = "";
42-
4337
var worksheetNames = new List<KeyValuePair<string, string>>();
44-
if (filtersModel.LastAssignedTo.HasValue && filtersModel.LastAssignedTo.Value != 0)
45-
{
46-
var core = await coreHelper.GetCore();
47-
var sdkDbContext = core.DbContextHelper.GetDbContext();
48-
filtersLastAssignedTo = await sdkDbContext.Sites
49-
.Where(x => x.Id == filtersModel.LastAssignedTo.Value)
50-
.Select(x => x.Name)
51-
.FirstOrDefaultAsync();
52-
}
5338

5439
var propertyName = await backendConfigurationPnDbContext.Properties
5540
.Where(x => x.Id == filtersModel.PropertyId)
@@ -116,22 +101,6 @@ public async Task<Stream> GenerateWorkOrderCaseReport(TaskManagementFiltersModel
116101

117102
SheetData sheetData1 = new SheetData();
118103

119-
// var sheets = workbookPart.Workbook.AppendChild(new Sheets());
120-
//
121-
//
122-
// var worksheetPart = workbookPart.AddNewPart<WorksheetPart>();
123-
// worksheetPart.Worksheet = new Worksheet(new SheetData());
124-
//
125-
// var sheet = new Sheet
126-
// {
127-
// Id = workbookPart.GetIdOfPart(worksheetPart),
128-
// SheetId = 1,
129-
// Name = sheetName
130-
// };
131-
// sheets.Append(sheet);
132-
//
133-
// var sheetData = worksheetPart.Worksheet.GetFirstChild<SheetData>();
134-
135104
// Create header row
136105
CreateHeaderRow(sheetData1, localizationService);
137106

@@ -155,11 +124,7 @@ public async Task<Stream> GenerateWorkOrderCaseReport(TaskManagementFiltersModel
155124

156125
worksheetPart1.Worksheet = worksheet1;
157126

158-
//workbookPart.Workbook.Save();
159127
}
160-
161-
// Stream result = File.Open(filePath, FileMode.Open);
162-
// return result;
163128
ValidateExcel(filePath);
164129

165130
Stream result = File.Open(filePath, FileMode.Open);
@@ -230,7 +195,7 @@ public async Task<OperationDataResult<Stream>> GenerateExcelDashboard(List<OldRe
230195
headerRow.Append(CreateCell(itemHeader.Value));
231196
}
232197

233-
sheetData.AppendChild(headerRow);
198+
sheetData!.AppendChild(headerRow);
234199

235200
// Populate data rows
236201
foreach (var dataModel in eformModel.Items)
@@ -333,11 +298,11 @@ public async Task<OperationDataResult<Stream>> GenerateExcelDashboard(List<Repor
333298

334299
// Check for duplicate sheet names
335300
if (worksheetNames.Contains(
336-
new KeyValuePair<string, string>($"{sheetName}", $"rId{i + 1}")))
301+
new($"{sheetName}", $"rId{i + 1}")))
337302
{
338303
var duplicateNumber = 1;
339304
while (worksheetNames.Contains(
340-
new KeyValuePair<string, string>($"{sheetName} ({duplicateNumber})",
305+
new($"{sheetName} ({duplicateNumber})",
341306
$"rId{i + 1}")))
342307
{
343308
duplicateNumber++;
@@ -439,7 +404,7 @@ public async Task<OperationDataResult<Stream>> GenerateExcelDashboard(List<Repor
439404

440405
sheetData1.Append(row1);
441406

442-
int rowIndex = 1;
407+
var rowIndex = 1;
443408

444409

445410
// Populate data rows
@@ -616,44 +581,6 @@ private Stylesheet CreateStylesheet()
616581
);
617582
}
618583

619-
private void ApplyTableFormatting(Sheet sheet, WorksheetPart worksheetPart, SheetData sheetData)
620-
{
621-
// Define the range for the table
622-
var columns = sheetData.Elements<Row>().First().Elements<Cell>().Count();
623-
var rows = sheetData.Elements<Row>().Count();
624-
string range = $"A1:{GetColumnLetter(columns)}{rows}";
625-
626-
// Apply auto filter
627-
AutoFilter autoFilter = new AutoFilter() { Reference = range };
628-
worksheetPart.Worksheet.InsertAfter(autoFilter, sheetData);
629-
630-
// Define table
631-
TableDefinitionPart tablePart = worksheetPart.AddNewPart<TableDefinitionPart>();
632-
Table table = new Table()
633-
{
634-
Id = (uint)new Random().Next(1, 10000),
635-
Name = "Table1",
636-
DisplayName = "Table1",
637-
Reference = range,
638-
AutoFilter = new AutoFilter() { Reference = range }
639-
};
640-
641-
TableColumns tableColumns = new TableColumns() { Count = (uint)columns };
642-
for (uint i = 1; i <= columns; i++)
643-
{
644-
tableColumns.Append(new TableColumn() { Id = i, Name = $"Column{i}" });
645-
}
646-
647-
table.Append(tableColumns);
648-
table.Append(new TableStyleInfo()
649-
{
650-
Name = "TableStyleMedium2", ShowFirstColumn = false, ShowLastColumn = false, ShowRowStripes = true,
651-
ShowColumnStripes = false
652-
});
653-
tablePart.Table = table;
654-
table.Save();
655-
}
656-
657584
private string GetColumnLetter(int columnIndex)
658585
{
659586
string columnLetter = "";
@@ -812,7 +739,7 @@ public Task<Stream> GenerateTaskTracker(List<TaskTrackerModel> model)
812739
headerRow.Append(CreateCell(column));
813740
}
814741

815-
sheetData.AppendChild(headerRow);
742+
sheetData!.AppendChild(headerRow);
816743

817744
// Populate rows
818745
foreach (var taskTrackerModel in model)

0 commit comments

Comments
 (0)