DavidMakarov/PIbd-21_Makarov_Razubaev_CourseWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.is.ulstu.ru/DavidMakarov/PIbd-21_Makarov_Razubaev_CourseWork

Browse Source
This commit is contained in:
DavidMakarov 2024-05-30 06:56:00 +04:00
commit 45f2a7cc3b
7 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Factory/FactoryDatabaseImplement/FactoryDatabaseImplement.csproj
View File

@ -23,4 +23,8 @@
<ProjectReference Include="..\FactoryContracts\FactoryContracts.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Migrations\" />
</ItemGroup>
</Project>

17
Factory/FactoryDatabaseImplement/Migrations/20240528144223_InitCreate.Designer.cs → Factory/FactoryDatabaseImplement/Migrations/20240529212521_Init.Designer.cs generated
View File

@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace FactoryDatabaseImplement.Migrations
{
[DbContext(typeof(FactoryDatabase))]
[Migration("20240528144223_InitCreate")]
partial class InitCreate
[Migration("20240529212521_Init")]
partial class Init
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
@ -71,7 +71,8 @@ namespace FactoryDatabaseImplement.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<int>("PlanProductionId")
b.Property<int?>("PlanProductionId")
.IsRequired()
.HasColumnType("integer");
b.Property<int>("Status")
@ -81,8 +82,7 @@ namespace FactoryDatabaseImplement.Migrations
b.HasIndex("ClientId");
b.HasIndex("PlanProductionId")
.IsUnique();
b.HasIndex("PlanProductionId");
b.ToTable("ExecutionPhases");
});
@ -345,8 +345,8 @@ namespace FactoryDatabaseImplement.Migrations
.IsRequired();
b.HasOne("FactoryDatabaseImplement.Models.PlanProduction", "PlanProduction")
.WithOne("ExecutionPhase")
.HasForeignKey("FactoryDatabaseImplement.Models.ExecutionPhase", "PlanProductionId")
.WithMany()
.HasForeignKey("PlanProductionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@ -518,9 +518,6 @@ namespace FactoryDatabaseImplement.Migrations
modelBuilder.Entity("FactoryDatabaseImplement.Models.PlanProduction", b =>
{
b.Navigation("ExecutionPhase")
.IsRequired();
b.Navigation("Machines");
b.Navigation("Workpieces");

5
Factory/FactoryDatabaseImplement/Migrations/20240528144223_InitCreate.cs → Factory/FactoryDatabaseImplement/Migrations/20240529212521_Init.cs
View File

@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace FactoryDatabaseImplement.Migrations
{
public partial class InitCreate : Migration
public partial class Init : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
@ -287,8 +287,7 @@ namespace FactoryDatabaseImplement.Migrations
migrationBuilder.CreateIndex(
name: "IX_ExecutionPhases_PlanProductionId",
table: "ExecutionPhases",
column: "PlanProductionId",
unique: true);
column: "PlanProductionId");
migrationBuilder.CreateIndex(
name: "IX_MachinePlanProductions_MachineId",

13
Factory/FactoryDatabaseImplement/Migrations/FactoryDatabaseModelSnapshot.cs
View File

@ -69,7 +69,8 @@ namespace FactoryDatabaseImplement.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<int>("PlanProductionId")
b.Property<int?>("PlanProductionId")
.IsRequired()
.HasColumnType("integer");
b.Property<int>("Status")
@ -79,8 +80,7 @@ namespace FactoryDatabaseImplement.Migrations
b.HasIndex("ClientId");
b.HasIndex("PlanProductionId")
.IsUnique();
b.HasIndex("PlanProductionId");
b.ToTable("ExecutionPhases");
});
@ -343,8 +343,8 @@ namespace FactoryDatabaseImplement.Migrations
.IsRequired();
b.HasOne("FactoryDatabaseImplement.Models.PlanProduction", "PlanProduction")
.WithOne("ExecutionPhase")
.HasForeignKey("FactoryDatabaseImplement.Models.ExecutionPhase", "PlanProductionId")
.WithMany()
.HasForeignKey("PlanProductionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@ -516,9 +516,6 @@ namespace FactoryDatabaseImplement.Migrations
modelBuilder.Entity("FactoryDatabaseImplement.Models.PlanProduction", b =>
{
b.Navigation("ExecutionPhase")
.IsRequired();
b.Navigation("Machines");
b.Navigation("Workpieces");

5
Factory/FactoryWorkerApp/Controllers/HomeController.cs
View File

@ -302,6 +302,11 @@ namespace FactoryWorkerApp.Controllers
DateFrom = startDate,
DateTo = endDate,
});
foreach( var report in reports)
{
if (report.Machines == null)
report.Machines = new();
}
return View(reports);

2
Factory/FactoryWorkerApp/Views/Home/ExecutionPhase.cshtml
View File

@ -7,7 +7,7 @@
ViewData["Title"] = "Execution Phase";
}
<div class="text-center">
<h2 class="display-4">Заготовка</h2>
<h2 class="display-4">Этап выполнения</h2>
</div>
<form method="post">
<div class="row">

2
Factory/FactoryWorkerApp/Views/Home/PlanProductions.cshtml
View File

@ -14,7 +14,7 @@
<p>
<a asp-action="PlanProduction">Создать план</a>
<a asp-action="ConnectionPlanProductionWorkpiece">Привязка планов производства к заготовкам</a>
<a asp-action="ConnectionPlanProductionWorkpiece">Привязка заготовок к планам производства</a>
</p>
<table class="table">