Anastasia_52/ProjectGSM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Улучшения 2 и 3

Browse Source
This commit is contained in:
Anastasia_52 2024-12-23 11:29:03 +04:00
parent 0301d0c33a
commit d2e8f09ba9
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectGSM/Entities/RouteSheet.cs
View File

@ -18,7 +18,7 @@ public class RouteSheet
[DisplayName("Дата конца")]
public DateTime End_Date { get; private set; }
[DisplayName("Смена")]
[DisplayName("Расход топлива")]
public float Fuel_Consumption { get; private set; }
[Browsable(false)]

1
ProjectGSM/Forms/FormRouteSheet.cs
View File

@ -67,6 +67,5 @@ namespace ProjectGSM.Forms
}
return list;
}
}
}

8
ProjectGSM/Forms/FormRouteSheets.Designer.cs generated
View File

@ -39,9 +39,9 @@
//
panel1.Controls.Add(buttonAdd);
panel1.Dock = DockStyle.Right;
panel1.Location = new Point(641, 0);
panel1.Location = new Point(730, 0);
panel1.Name = "panel1";
panel1.Size = new Size(159, 450);
panel1.Size = new Size(159, 501);
panel1.TabIndex = 0;
//
// buttonAdd
@ -71,14 +71,14 @@
dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51;
dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(641, 450);
dataGridView.Size = new Size(730, 501);
dataGridView.TabIndex = 3;
//
// FormRouteSheets
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450);
ClientSize = new Size(889, 501);
Controls.Add(dataGridView);
Controls.Add(panel1);
Name = "FormRouteSheets";

8
ProjectGSM/Reports/ChartReport.cs
View File

@ -26,7 +26,7 @@ public class ChartReport
{
new PDFBuilder(filePath)
.AddHeader("Отчет по заправкам")
.AddPieChart("Объем заправленного топлива по автомобилям", GetData(dateTime))
.AddPieChart($"Объем заправленного топлива по автомобилям {dateTime: dd MMMM yyyy}", GetData(dateTime))
.Build();
return true;
}
@ -43,13 +43,13 @@ public class ChartReport
.ReadRefills()
.Where(x => x.Refill_Date.Date == dateTime.Date)
.GroupBy(
x => x.Car_ID,
x => x.CarName,
(key, group) => new
{
CarId = key,
CarName = key,
TotalRefill = group.Sum(y => y.Quantity)
})
.Select(x => ($"Автомобиль {x.CarId}", (double)x.TotalRefill))
.Select(x => ($"{x.CarName}", (double)x.TotalRefill))
.ToList();
}
}

15
ProjectGSM/Reports/TableReport.cs
View File

@ -1,5 +1,6 @@
using Microsoft.Extensions.Logging;
using ProjectGSM.Repositories;
using ProjectGSM.Repositories.Implementations;
using System;
using System.Collections.Generic;
using System.Linq;
@ -33,7 +34,7 @@ public class TableReport
new ExcelBuilder(filePath)
.AddHeader("Сводка по пополнению на заправках и поездкам автомобиля", 0, 4)
.AddParagraph($"за период с {startDate:yyyy-MM-dd} по {endDate:yyyy-MM-dd}", 0)
.AddParagraph($"за период с {startDate:dd.MM.yyyy} по {endDate:dd.MM.yyyy}", 0)
.AddTable(new[] { 15, 20, 20, 20 }, tableData)
.Build();
@ -49,10 +50,10 @@ public class TableReport
private List<string[]> GetData(int carId, DateTime startDate, DateTime endDate)
{
var refills = _refillRepository
.ReadRefills()
.Where(x => x.Refill_Date >= startDate && x.Refill_Date <= endDate && x.Car_ID == carId)
.ReadRefills(dateFrom: startDate, dateTo: endDate, carId: carId)
.Select(x => new
{
x.CarName,
CarId = x.Car_ID,
Date = x.Refill_Date,
RefillAmount = (float?)x.Quantity,
@ -61,10 +62,10 @@ public class TableReport
.AsEnumerable();
var trips = _routeSheetRepository
.ReadRouteSheet()
.Where(x => x.Start_Date >= startDate && x.End_Date <= endDate && x.Car_ID == carId)
.ReadRouteSheet(dateFrom: startDate, dateTo: endDate, carId: carId)
.Select(x => new
{
x.CarName,
CarId = x.Car_ID,
Date = x.Start_Date,
RefillAmount = (float?)null,
@ -79,8 +80,8 @@ public class TableReport
new List<string[]>() { item }
.Union(data.Select(x => new string[]
{
x.CarId.ToString(),
x.Date.ToString("yyyy-MM-dd HH:mm"),
x.CarName.ToString(),
x.Date.ToString("dd.MM.yyyy"),
x.RefillAmount?.ToString() ?? string.Empty,
x.FuelConsumption?.ToString() ?? string.Empty
}))