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

и снова изменения

Browse Source
This commit is contained in:
Дмитрий Блохин 2024-05-29 18:11:01 +04:00
parent ed24d5e00e
commit 6148e4c272
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Course/DatabaseImplement/Models/Workshop.cs
View File

@ -35,7 +35,7 @@ namespace DatabaseImplement.Models
} }
} }
[ForeignKey("WorkshopId")] [ForeignKey("WorkshopId")]
public List<WorkerWorkshop> Workers { get; set; } = new(); public virtual List<WorkerWorkshop> Workers { get; set; } = new();
public static Workshop? Create(FactoryGoWorkDatabase context, WorkshopBindingModel model) public static Workshop? Create(FactoryGoWorkDatabase context, WorkshopBindingModel model)
{ {
if(model == null) if(model == null)

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

@ -460,7 +460,7 @@ namespace GuarantorAPP.Controllers
return RedirectToAction("WorkerProductChoose"); return RedirectToAction("WorkerProductChoose");
} catch } catch
{ {
RedirectToAction("Error"); return RedirectToAction("Error");
} }
} }
public async Task<IActionResult> WordGenerate() public async Task<IActionResult> WordGenerate()
@ -497,7 +497,7 @@ namespace GuarantorAPP.Controllers
var value = HttpContext.Session.GetString("Workers"); var value = HttpContext.Session.GetString("Workers");
if (value != null) if (value != null)
{ {
List<int> rawReports = value!.Split(',').Select(x => int.Parse(x)).ToList(); List<int> rawReports = value!.Split('/').Select(x => int.Parse(x)).ToList();
var reports = _data.GetProductReports(rawReports); var reports = _data.GetProductReports(rawReports);
return View(reports); return View(reports);
} }

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

@ -8,6 +8,7 @@
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="IndexWorker">Работники</a> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="IndexWorker">Работники</a>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="IndexMachine">Станки</a> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="IndexMachine">Станки</a>
<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="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="Privacy">Личные данные</a>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Logout">Выйти</a> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Logout">Выйти</a>
</div> </div>

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

@ -63,6 +63,7 @@
if (startDate > endDate) { if (startDate > endDate) {
$('#endDateError').text('Дата окончания не может быть раньше даты начала.'); $('#endDateError').text('Дата окончания не может быть раньше даты начала.');
isValid = false; isValid = false;
}
} }
return isValid; return isValid;
} }