Serxionaft/Coursach
Serxionaft/Coursach
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Serxionaft:5a399a9e205c94b78d427cdf4ce7c921b5cd5541
Branches Tags
Serxionaft:main
..
compare: Serxionaft:e8485e573af6ee5c1d16d3ea7531998bc0752a17
Branches Tags
Serxionaft:main

No commits in common. "5a399a9e205c94b78d427cdf4ce7c921b5cd5541" and "e8485e573af6ee5c1d16d3ea7531998bc0752a17" have entirely different histories.
5a399a9e20 ... e8485e573a

17 changed files with 39 additions and 285 deletions
Show Stats Expand all files Collapse all files

88
Course/BusinessLogic/BusinessLogic/GuarantorReportLogic.cs
View File

@ -1,88 +0,0 @@
using Contracts.BusinessLogicsContracts;
using Contracts.StoragesContracts;
using Contracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BusinessLogic.BusinessLogic
{
public class GuarantorReportLogic : IGuarantorReportLogic
{
private readonly IWorkerStorage _workerStorage;
private readonly IMachineStorage _machineStorage;
private readonly IWorkshopStorage _workshopStorage;
private readonly IProductStorage _productStorage;
public GuarantorReportLogic(IWorkerStorage workerStorage, IMachineStorage machineStorage, IWorkshopStorage workshopStorage, IProductStorage productStorage)
{
_workerStorage = workerStorage;
_machineStorage = machineStorage;
_workshopStorage = workshopStorage;
_productStorage = productStorage;
}
public List<WorkerMachineCountChartViewModel>? GetWorkerMachineChart(int UserId)
{
var machines = _machineStorage.GetFilteredList(new() { UserId = UserId });
List<WorkerMachineCountChartViewModel> workerChart = new();
foreach (var mach in machines)
{
WorkerMachineCountChartViewModel worker = new WorkerMachineCountChartViewModel();
worker.MachineName = mach.Title;
var count = _workerStorage.GetFilteredList(new() { MachineId = mach.Id, UserId = UserId }).Count;
worker.WorkerCount = count;
workerChart.Add(worker);
}
return workerChart;
}
public List<WorkerWorkshopCountChartViewModel>? GetWorkerWorkshopChart(int UserId)
{
var workshops = _workshopStorage.GetFilteredList(new() { UserId = UserId });
List<WorkerWorkshopCountChartViewModel> workerChart = new();
foreach (var work in workshops)
{
WorkerWorkshopCountChartViewModel worker = new WorkerWorkshopCountChartViewModel();
worker.WorkshopName = work.Title;
var count = _workerStorage.GetFilteredList(new() { WorkshopId = work.Id, UserId = UserId }).Count;
worker.WorkerCount = count;
workerChart.Add(worker);
}
return workerChart;
}
public List<MachineWorkshopTimeReport>? GetMachineWorkshopTimeReport(DateTime startDate, DateTime endDate, int UserId)
{
var workshops = _workshopStorage.GetFilteredList(new() { DateFrom = startDate, DateTo = endDate, UserId = UserId });
if (workshops == null)
return new();
List<MachineWorkshopTimeReport> machineWorkshopTimeReports = new List<MachineWorkshopTimeReport>();
foreach (var workshop in workshops)
{
var report = new MachineWorkshopTimeReport();
report.WorkshopName = workshop.Title;
var machines = _machineStorage.GetFilteredList(new() { WorkshopId = workshop.Id, UserId = UserId });
if (machines != null)
report.Machines = machines.Select(p => p.Title).ToList();
machineWorkshopTimeReports.Add(report);
}
return machineWorkshopTimeReports;
}
public List<WorkerProductReportViewModel>? GetWorkerProductReport(List<int> ids)
{
List<WorkerProductReportViewModel> reports = new();
foreach (int i in ids)
{
WorkerProductReportViewModel report = new();
var worker = _workerStorage.GetElement(new() { Id = i });
report.WorkerName = worker!.Name;
var products = _productStorage.GetFilteredList(new() { WorkerId = i });
if (products != null)
report.Products = products.Select(x => x.Name).ToList();
reports.Add(report);
}
return reports;
}
}
}

17
Course/Contracts/BusinessLogicsContracts/IGuarantorReportLogic.cs
View File

@ -1,17 +0,0 @@
using Contracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Contracts.BusinessLogicsContracts
{
public interface IGuarantorReportLogic
{
List<WorkerProductReportViewModel>? GetWorkerProductReport(List<int> ids);
List<MachineWorkshopTimeReport>? GetMachineWorkshopTimeReport(DateTime start, DateTime end, int UserId);
List<WorkerMachineCountChartViewModel>? GetWorkerMachineChart(int UserId);
List<WorkerWorkshopCountChartViewModel>? GetWorkerWorkshopChart(int UserId);
}
}

2
Course/Contracts/SearchModels/WorkerSearchModel.cs
View File

@ -5,7 +5,5 @@
public int? Id { get; set; }
public string? Name { get; set; }
public int? UserId { get; set; }
public int MachineId { get; set; }
public int WorkshopId { get; set; }
}
}

14
Course/Contracts/ViewModels/WorkerMachineCountChartViewModel.cs
View File

@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Contracts.ViewModels
{
public class WorkerMachineCountChartViewModel
{
public string MachineName { get; set; } = string.Empty;
public int WorkerCount { get; set; }
}
}

14
Course/Contracts/ViewModels/WorkerWorkshopCountChartViewModel.cs
View File

@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Contracts.ViewModels
{
public class WorkerWorkshopCountChartViewModel
{
public string WorkshopName { get; set; } = string.Empty;
public int WorkerCount { get; set; }
}
}

37
Course/GuarantorAPP/Controllers/HomeController.cs
View File

@ -537,47 +537,12 @@ namespace GuarantorAPP.Controllers
var workshop = _data.GetWorkshop(workshopId);
if (workshop == null)
return RedirectToAction("Index");
WorkshopBindingModel workshopBinding = new() { Id = workshopId, Title = workshop.Title, Address = workshop.Address, Director = workshop.Director, UserId = workshop.UserId, ProductionId = productionId, WorkshopWorker = workshop.WorkerWorkshops };
WorkshopBindingModel workshopBinding = new() { Id = workshopId, Title = workshop.Title, Address = workshop.Address, Director = workshop.Director, UserId = workshop.UserId, ProductionId = workshop.ProductionId, WorkshopWorker = workshop.WorkerWorkshops };
_data.UpdateWorkshop(workshopBinding);
}
catch (Exception) { }
return RedirectToAction("IndexWorkshop");
}
[HttpGet]
public IActionResult MachineHistogram()
{
if (!IsLoggedIn)
return RedirectToAction("IndexNonReg");
try
{
var chart = _data.GetMachineChart(UserId);
return View(chart);
} catch
{
return RedirectToAction("IndexNonReg");
}
}
public IActionResult Menu()
{
if (!IsLoggedIn)
return RedirectToAction("IndexNonReg");
return View();
}
[HttpGet]
public IActionResult WorkshopHistogram()
{
if (!IsLoggedIn)
return RedirectToAction("IndexNonReg");
try
{
var chart = _data.GetWorkshopChart(UserId);
return View(chart);
}
catch
{
return RedirectToAction("IndexNonReg");
}
}
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error(string ex)
{

42
Course/GuarantorAPP/GuarantorData.cs
View File

@ -18,13 +18,12 @@ namespace GuarantorAPP
private readonly IWorkshopLogic _workshopLogic;
private readonly IProductionLogic _productionLogic;
private readonly IProductLogic _productLogic;
private readonly IGuarantorReportLogic _reportLogic;
private readonly AbstractSaveToExcelGuarantor _excel;
private readonly AbstractSaveToWordGuarantor _word;
private readonly AbstractSaveToPdfGuarantor _pdf;
private readonly AbstractMailWorker _mail;
public GuarantorData(ILogger<GuarantorData> logger, IGuarantorLogic guarantorLogic, IWorkerLogic workerLogic, IMachineLogic machineLogic, IWorkshopLogic workshopLogic, IProductionLogic productionLogic, IProductLogic productLogic, IGuarantorReportLogic reportLogic, AbstractSaveToExcelGuarantor excel, AbstractSaveToPdfGuarantor pdf, AbstractSaveToWordGuarantor word, AbstractMailWorker mail)
public GuarantorData(ILogger<GuarantorData> logger, IGuarantorLogic guarantorLogic, IWorkerLogic workerLogic, IMachineLogic machineLogic, IWorkshopLogic workshopLogic, IProductionLogic productionLogic, IProductLogic productLogic, AbstractSaveToExcelGuarantor excel, AbstractSaveToPdfGuarantor pdf, AbstractSaveToWordGuarantor word, AbstractMailWorker mail)
{
_logger = logger;
_guarantorLogic = guarantorLogic;
@ -33,7 +32,6 @@ namespace GuarantorAPP
_workshopLogic = workshopLogic;
_productionLogic = productionLogic;
_productLogic = productLogic;
_reportLogic = reportLogic;
_excel = excel;
_pdf = pdf;
_mail = mail;
@ -140,13 +138,37 @@ namespace GuarantorAPP
{
return _productionLogic.ReadList(null);
}
public List<MachineWorkshopTimeReport>? GetTimeReport(DateTime? startDate, DateTime? endDate, int UserId)
public List<MachineWorkshopTimeReport> GetTimeReport(DateTime? startDate, DateTime? endDate, int UserId)
{
return _reportLogic.GetMachineWorkshopTimeReport(startDate!.Value, endDate!.Value, UserId);
var workshops = _workshopLogic.ReadList(new() { DateFrom = startDate, DateTo = endDate, UserId = UserId });
if (workshops == null)
return new();
List<MachineWorkshopTimeReport> machineWorkshopTimeReports = new List<MachineWorkshopTimeReport>();
foreach (var workshop in workshops)
{
var report = new MachineWorkshopTimeReport();
report.WorkshopName = workshop.Title;
var machines = _machineLogic.ReadList(new() { WorkshopId = workshop.Id, UserId = UserId });
if (machines != null)
report.Machines = machines.Select(p => p.Title).ToList();
machineWorkshopTimeReports.Add(report);
}
return machineWorkshopTimeReports;
}
public List<WorkerProductReportViewModel>? GetProductReports(List<int> workers)
{
return _reportLogic.GetWorkerProductReport(workers);
List<WorkerProductReportViewModel> reports = new();
foreach (int i in workers)
{
WorkerProductReportViewModel report = new();
var worker = _workerLogic.ReadElement(new() { Id = i });
report.WorkerName = worker!.Name;
var products = _productLogic.ReadList(new() { WorkerId = i });
if (products != null)
report.Products = products.Select(x => x.Name).ToList();
reports.Add(report);
}
return reports;
}
public void SaveReportExcel(List<int> workers, MemoryStream stream)
{
@ -203,13 +225,5 @@ namespace GuarantorAPP
MailAddress = UserGuarantor.user!.Email, Subject = "Отчет", FileName = "PdfReport.pdf", Pdf = report
});
}
public List<WorkerMachineCountChartViewModel>? GetMachineChart(int UserId)
{
return _reportLogic.GetWorkerMachineChart(UserId);
}
public List<WorkerWorkshopCountChartViewModel>? GetWorkshopChart(int UserId)
{
return _reportLogic.GetWorkerWorkshopChart(UserId);
}
}
}

1
Course/GuarantorAPP/Program.cs
View File

@ -26,7 +26,6 @@ builder.Services.AddTransient<IWorkshopLogic, WorkshopLogic>();
builder.Services.AddTransient<IMachineLogic, MachineLogic>();
builder.Services.AddTransient<IProductionLogic, ProductionLogic>();
builder.Services.AddTransient<IProductLogic, ProductLogic>();
builder.Services.AddTransient<IGuarantorReportLogic, GuarantorReportLogic>();
builder.Services.AddTransient<AbstractSaveToExcelGuarantor, SaveToExcelGuarantor>();
builder.Services.AddTransient<AbstractSaveToWordGuarantor, SaveToWordGuarantor>();
builder.Services.AddTransient<AbstractSaveToPdfGuarantor, SaveToPdfGuarantor>();

2
Course/GuarantorAPP/Views/Home/CreateWorker.cshtml
View File

@ -4,7 +4,7 @@
}
@model WorkerViewModel;
<div class="text-center">
<h2 class="display-4">Работник</h2>
<h2 class="display-4">работник</h2>
</div>
<form id="workerForm" method="post">
<input type="text" name="id" id="id" value="@Model.Id" hidden="hidden" />

1
Course/GuarantorAPP/Views/Home/Index.cshtml
View File

@ -10,7 +10,6 @@
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="IndexWorkshop">Цеха</a>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="ReportsMenu">Меню отчетов</a>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Menu">Графики</a>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Logout">Выйти</a>
</div>
</div>

2
Course/GuarantorAPP/Views/Home/IndexMachine.cshtml
View File

@ -7,7 +7,7 @@
}
<div class="text-center">
<h1 class="display-4">Станки</h1>
<h1 class="display-4">Детали</h1>
</div>

42
Course/GuarantorAPP/Views/Home/MachineHistogram.cshtml
View File

@ -1,42 +0,0 @@
@using Contracts.ViewModels;
@model List<WorkerMachineCountChartViewModel>;
<!DOCTYPE html>
<html>
<head>
<title>Histogram Example</title>
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
</head>
<body>
<div>
<canvas id="myChart" width="400" height="150"></canvas>
</div>
<script>
var ctx = document.getElementById('myChart').getContext('2d');
var data = {
labels: @Html.Raw(Json.Serialize(Model.Select(m => m.MachineName))),
datasets: [{
label: 'Category Data',
data: @Html.Raw(Json.Serialize(Model.Select(m => m.WorkerCount))),
backgroundColor: 'rgba(75, 192, 192, 0.2)',
borderColor: 'rgba(75, 192, 192, 1)',
borderWidth: 1
}]
};
var myChart = new Chart(ctx, {
type: 'bar',
data: data,
options: {
scales: {
yAxes: [{
ticks: {
beginAtZero: true
}
}]
}
}
});
</script>
</body>
</html>

11
Course/GuarantorAPP/Views/Home/Menu.cshtml
View File

@ -1,11 +0,0 @@
@{
ViewData["Title"] = "Меню графиков";
}
<div class="text-center">
<h1 class="display-4">Главное меню</h1>
<div class="list-group">
<a class="nav-link text-dark" asp-area="" asp-action="MachineHistogram">Количество работников на каждом станке</a>
<a class="nav-link text-dark" asp-area="" asp-action="WorkshopHistogram">Количество работников в каждом цеху</a>
</div>
</div>

2
Course/GuarantorAPP/Views/Home/WorkerProductChoose.cshtml
View File

@ -5,7 +5,7 @@
ViewData["Title"] = "Выбор работников для отчета";
}
<h2>Выберите работников для отчета</h2>
<h2>Выберите рвботников для отчета</h2>
<form asp-controller="Home" asp-action="WorkerProductChoose" method="post" onsubmit="return validateForm()">
<table class="table">

7
Course/GuarantorAPP/Views/Home/WorkerProductReport.cshtml
View File

@ -9,6 +9,13 @@
<h1 class="display-4">Список работников с отображением изделий</h1>
</div>
<form asp-controller="Report" method="post">
<button type="submit" class="btn btn-primary">Сгенерировать отчет в Word</button>
</form>
<form asp-controller="Report" method="post">
<button type="submit" class="btn btn-primary">Сгенерировать отчет в Excel</button>
</form>
<table class="table">
<thead>
<tr>

42
Course/GuarantorAPP/Views/Home/WorkshopHistogram.cshtml
View File

@ -1,42 +0,0 @@
@using Contracts.ViewModels;
@model List<WorkerWorkshopCountChartViewModel>;
<!DOCTYPE html>
<html>
<head>
<title>Histogram Example</title>
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
</head>
<body>
<div>
<canvas id="myChart" width="400" height="150"></canvas>
</div>
<script>
var ctx = document.getElementById('myChart').getContext('2d');
var data = {
labels: @Html.Raw(Json.Serialize(Model.Select(m => m.WorkshopName))),
datasets: [{
label: 'Category Data',
data: @Html.Raw(Json.Serialize(Model.Select(m => m.WorkerCount))),
backgroundColor: 'rgba(75, 192, 192, 0.2)',
borderColor: 'rgba(75, 192, 192, 1)',
borderWidth: 1
}]
};
var myChart = new Chart(ctx, {
type: 'bar',
data: data,
options: {
scales: {
yAxes: [{
ticks: {
beginAtZero: true
}
}]
}
}
});
</script>
</body>
</html>

BIN
Course/GuarantorAPP/wwwroot/images/Work-transformed.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 88 KiB