diff --git a/CarCenter/CarCenterContracts/BindingModels/RequestBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/RequestBindingModel.cs index 8aa552b..a0c64d0 100644 --- a/CarCenter/CarCenterContracts/BindingModels/RequestBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/RequestBindingModel.cs @@ -12,7 +12,7 @@ namespace CarCenterContracts.BindingModels { public int Id { get; set; } public int WorkerId { get; set; } - public int PresaleId { get; set; } + public int? PresaleId { get; set; } public string Description { get; set; } = string.Empty; public RequestTypes RequestType { get; set; } = RequestTypes.Неизвестно; diff --git a/CarCenter/CarCenterContracts/ViewModels/PresaleViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/PresaleViewModel.cs index 29843d0..872ef63 100644 --- a/CarCenter/CarCenterContracts/ViewModels/PresaleViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/PresaleViewModel.cs @@ -21,5 +21,6 @@ namespace CarCenterContracts.ViewModels [DisplayName("Цена")] public double Price { get; set; } public Dictionary PresaleBundlings { get; set; } = new(); - } + public List Requests { get; set; } = new(); + } } diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/PresaleStorage.cs b/CarCenter/CarCenterDatabaseImplement/Implements/PresaleStorage.cs index f2f055d..4f7b5fe 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/PresaleStorage.cs +++ b/CarCenter/CarCenterDatabaseImplement/Implements/PresaleStorage.cs @@ -24,7 +24,8 @@ namespace CarCenterDatabaseImplement.Implements var deletedElement = context.Presales .Include(x => x.Bundlings) .ThenInclude(x => x.Bundling) - .FirstOrDefault(x => x.Id == model.Id) + .Include(x => x.Requests) + .FirstOrDefault(x => x.Id == model.Id) ?.GetViewModel; context.Presales.Remove(element); context.SaveChanges(); @@ -43,19 +44,21 @@ namespace CarCenterDatabaseImplement.Implements return context.Presales .Include(x => x.Bundlings) .ThenInclude(x => x.Bundling) - .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id) + .Include(x => x.Requests) + .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id) ?.GetViewModel; } public List GetFilteredList(PresaleSearchModel model) { using var context = new CarCenterDatabase(); - if (model.Id.HasValue) + if (model.WorkerId.HasValue) { return context.Presales .Include(x => x.Bundlings) .ThenInclude(x => x.Bundling) - .Where(x => x.Id == model.Id) + .Include(x => x.Requests) + .Where(x => x.WorkerId == model.WorkerId) .Select(x => x.GetViewModel) .ToList(); } @@ -68,7 +71,8 @@ namespace CarCenterDatabaseImplement.Implements return context.Presales .Include(x => x.Bundlings) .ThenInclude(x => x.Bundling) - .Select(x => x.GetViewModel) + .Include(x => x.Requests) + .Select(x => x.GetViewModel) .ToList(); } @@ -103,7 +107,8 @@ namespace CarCenterDatabaseImplement.Implements return context.Presales .Include(x => x.Bundlings) .ThenInclude(x => x.Bundling) - .FirstOrDefault(x => x.Id == model.Id) + .Include(x => x.Requests) + .FirstOrDefault(x => x.Id == model.Id) ?.GetViewModel; } } diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/RequestStorage.cs b/CarCenter/CarCenterDatabaseImplement/Implements/RequestStorage.cs index 153bdb5..16e4c50 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/RequestStorage.cs +++ b/CarCenter/CarCenterDatabaseImplement/Implements/RequestStorage.cs @@ -56,6 +56,14 @@ namespace CarCenterDatabaseImplement.Implements .Select(x => x.GetViewModel) .ToList(); } + else if (model.WorkerId.HasValue) + { + return context.Requests + .Include(x => x.Presale) + .Where(x => x.WorkerId == model.WorkerId) + .Select(x => x.GetViewModel) + .ToList(); + } return new(); } diff --git a/CarCenter/CarCenterDatabaseImplement/Migrations/20240528201628_InitFull.Designer.cs b/CarCenter/CarCenterDatabaseImplement/Migrations/20240528201628_InitFull.Designer.cs deleted file mode 100644 index b1d3881..0000000 --- a/CarCenter/CarCenterDatabaseImplement/Migrations/20240528201628_InitFull.Designer.cs +++ /dev/null @@ -1,505 +0,0 @@ -// -using System; -using CarCenterDatabaseImplement; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -#nullable disable - -namespace CarCenterDatabaseImplement.Migrations -{ - [DbContext(typeof(CarCenterDatabase))] - [Migration("20240528201628_InitFull")] - partial class InitFull - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "6.0.29") - .HasAnnotation("Relational:MaxIdentifierLength", 63); - - NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Bundling", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("EquipmentPackage") - .HasColumnType("integer"); - - b.Property("Price") - .HasColumnType("double precision"); - - b.Property("StorekeeperId") - .HasColumnType("integer"); - - b.Property("TirePackage") - .HasColumnType("integer"); - - b.Property("ToolKit") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.ToTable("Bundlings"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Car", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("CarBrand") - .HasColumnType("integer"); - - b.Property("CarClass") - .HasColumnType("integer"); - - b.Property("FeatureID") - .HasColumnType("integer"); - - b.Property("FeatureId") - .HasColumnType("integer"); - - b.Property("Model") - .IsRequired() - .HasColumnType("text"); - - b.Property("OrderId") - .HasColumnType("integer"); - - b.Property("Price") - .HasColumnType("double precision"); - - b.Property("StorekeeperId") - .HasColumnType("integer"); - - b.Property("VINnumber") - .HasColumnType("bigint"); - - b.Property("Year") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("FeatureId"); - - b.HasIndex("OrderId"); - - b.HasIndex("StorekeeperId"); - - b.ToTable("Cars"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.CarBundling", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("BundlingId") - .HasColumnType("integer"); - - b.Property("CarId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("BundlingId"); - - b.HasIndex("CarId"); - - b.ToTable("CarBundlings"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Feature", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("CabinColor") - .IsRequired() - .HasColumnType("text"); - - b.Property("DriveType") - .HasColumnType("integer"); - - b.Property("HelpDevice") - .HasColumnType("integer"); - - b.Property("Price") - .HasColumnType("double precision"); - - b.Property("StorekeeperId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.ToTable("Features"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Order", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("BuyerFCS") - .IsRequired() - .HasColumnType("text"); - - b.Property("PaymentDate") - .HasColumnType("timestamp without time zone"); - - b.Property("PaymentStatus") - .HasColumnType("integer"); - - b.Property("PaymentType") - .HasColumnType("integer"); - - b.Property("Sum") - .HasColumnType("double precision"); - - b.Property("WorkerId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("WorkerId"); - - b.ToTable("Orders"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.OrderPresale", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("OrderId") - .HasColumnType("integer"); - - b.Property("PresaleId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("OrderId"); - - b.HasIndex("PresaleId"); - - b.ToTable("OrderPresales"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Presale", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Description") - .IsRequired() - .HasColumnType("text"); - - b.Property("DueTill") - .HasColumnType("timestamp without time zone"); - - b.Property("PresaleStatus") - .HasColumnType("integer"); - - b.Property("Price") - .HasColumnType("double precision"); - - b.HasKey("Id"); - - b.ToTable("Presales"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.PresaleBundling", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("BundlingId") - .HasColumnType("integer"); - - b.Property("PresaleId") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("BundlingId"); - - b.HasIndex("PresaleId"); - - b.ToTable("PresaleBundlings"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Request", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Description") - .IsRequired() - .HasColumnType("text"); - - b.Property("PresaleId") - .HasColumnType("integer"); - - b.Property("RequestType") - .HasColumnType("integer"); - - b.HasKey("Id"); - - b.HasIndex("PresaleId"); - - b.ToTable("Requests"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Storekeeper", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Email") - .IsRequired() - .HasColumnType("text"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Password") - .IsRequired() - .HasColumnType("text"); - - b.Property("Patronymic") - .HasColumnType("text"); - - b.Property("PhoneNumber") - .HasColumnType("bigint"); - - b.Property("Surname") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Storekeepers"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Worker", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("Email") - .IsRequired() - .HasColumnType("text"); - - b.Property("Name") - .IsRequired() - .HasColumnType("text"); - - b.Property("Password") - .IsRequired() - .HasColumnType("text"); - - b.Property("Patronymic") - .HasColumnType("text"); - - b.Property("PhoneNumber") - .HasColumnType("bigint"); - - b.Property("Surname") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Workers"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Car", b => - { - b.HasOne("CarCenterDatabaseImplement.Models.Feature", "Feature") - .WithMany("Cars") - .HasForeignKey("FeatureId"); - - b.HasOne("CarCenterDatabaseImplement.Models.Order", "Order") - .WithMany("Cars") - .HasForeignKey("OrderId"); - - b.HasOne("CarCenterDatabaseImplement.Models.Storekeeper", "Storekeeper") - .WithMany("Cars") - .HasForeignKey("StorekeeperId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Feature"); - - b.Navigation("Order"); - - b.Navigation("Storekeeper"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.CarBundling", b => - { - b.HasOne("CarCenterDatabaseImplement.Models.Bundling", "Bundling") - .WithMany("CarBundling") - .HasForeignKey("BundlingId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CarCenterDatabaseImplement.Models.Car", "Car") - .WithMany("Bundlings") - .HasForeignKey("CarId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Bundling"); - - b.Navigation("Car"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Order", b => - { - b.HasOne("CarCenterDatabaseImplement.Models.Worker", "Worker") - .WithMany("Orders") - .HasForeignKey("WorkerId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Worker"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.OrderPresale", b => - { - b.HasOne("CarCenterDatabaseImplement.Models.Order", "Order") - .WithMany("Presales") - .HasForeignKey("OrderId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CarCenterDatabaseImplement.Models.Presale", "Presale") - .WithMany("OrderPresales") - .HasForeignKey("PresaleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Order"); - - b.Navigation("Presale"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.PresaleBundling", b => - { - b.HasOne("CarCenterDatabaseImplement.Models.Bundling", "Bundling") - .WithMany("PresaleBundling") - .HasForeignKey("BundlingId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("CarCenterDatabaseImplement.Models.Presale", "Presale") - .WithMany("Bundlings") - .HasForeignKey("PresaleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Bundling"); - - b.Navigation("Presale"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Request", b => - { - b.HasOne("CarCenterDatabaseImplement.Models.Presale", "Presale") - .WithMany("Requests") - .HasForeignKey("PresaleId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Presale"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Bundling", b => - { - b.Navigation("CarBundling"); - - b.Navigation("PresaleBundling"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Car", b => - { - b.Navigation("Bundlings"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Feature", b => - { - b.Navigation("Cars"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Order", b => - { - b.Navigation("Cars"); - - b.Navigation("Presales"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Presale", b => - { - b.Navigation("Bundlings"); - - b.Navigation("OrderPresales"); - - b.Navigation("Requests"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Storekeeper", b => - { - b.Navigation("Cars"); - }); - - modelBuilder.Entity("CarCenterDatabaseImplement.Models.Worker", b => - { - b.Navigation("Orders"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/CarCenter/CarCenterDatabaseImplement/Migrations/20240529111244_Test.cs b/CarCenter/CarCenterDatabaseImplement/Migrations/20240529111244_Test.cs deleted file mode 100644 index 959a2b3..0000000 --- a/CarCenter/CarCenterDatabaseImplement/Migrations/20240529111244_Test.cs +++ /dev/null @@ -1,78 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace CarCenterDatabaseImplement.Migrations -{ - public partial class Test : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Requests_Presales_PresaleId", - table: "Requests"); - - migrationBuilder.AlterColumn( - name: "PresaleId", - table: "Requests", - type: "integer", - nullable: true, - oldClrType: typeof(int), - oldType: "integer"); - - migrationBuilder.AddColumn( - name: "WorkerId", - table: "Requests", - type: "integer", - nullable: false, - defaultValue: 0); - - migrationBuilder.AddColumn( - name: "WorkerId", - table: "Presales", - type: "integer", - nullable: false, - defaultValue: 0); - - migrationBuilder.AddForeignKey( - name: "FK_Requests_Presales_PresaleId", - table: "Requests", - column: "PresaleId", - principalTable: "Presales", - principalColumn: "Id"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropForeignKey( - name: "FK_Requests_Presales_PresaleId", - table: "Requests"); - - migrationBuilder.DropColumn( - name: "WorkerId", - table: "Requests"); - - migrationBuilder.DropColumn( - name: "WorkerId", - table: "Presales"); - - migrationBuilder.AlterColumn( - name: "PresaleId", - table: "Requests", - type: "integer", - nullable: false, - defaultValue: 0, - oldClrType: typeof(int), - oldType: "integer", - oldNullable: true); - - migrationBuilder.AddForeignKey( - name: "FK_Requests_Presales_PresaleId", - table: "Requests", - column: "PresaleId", - principalTable: "Presales", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - } - } -} diff --git a/CarCenter/CarCenterDatabaseImplement/Migrations/20240529111244_Test.Designer.cs b/CarCenter/CarCenterDatabaseImplement/Migrations/20240529134131_FixTest.Designer.cs similarity index 99% rename from CarCenter/CarCenterDatabaseImplement/Migrations/20240529111244_Test.Designer.cs rename to CarCenter/CarCenterDatabaseImplement/Migrations/20240529134131_FixTest.Designer.cs index 97bc8b7..8394098 100644 --- a/CarCenter/CarCenterDatabaseImplement/Migrations/20240529111244_Test.Designer.cs +++ b/CarCenter/CarCenterDatabaseImplement/Migrations/20240529134131_FixTest.Designer.cs @@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace CarCenterDatabaseImplement.Migrations { [DbContext(typeof(CarCenterDatabase))] - [Migration("20240529111244_Test")] - partial class Test + [Migration("20240529134131_FixTest")] + partial class FixTest { protected override void BuildTargetModel(ModelBuilder modelBuilder) { diff --git a/CarCenter/CarCenterDatabaseImplement/Migrations/20240528201628_InitFull.cs b/CarCenter/CarCenterDatabaseImplement/Migrations/20240529134131_FixTest.cs similarity index 98% rename from CarCenter/CarCenterDatabaseImplement/Migrations/20240528201628_InitFull.cs rename to CarCenter/CarCenterDatabaseImplement/Migrations/20240529134131_FixTest.cs index bc836fd..9ec406e 100644 --- a/CarCenter/CarCenterDatabaseImplement/Migrations/20240528201628_InitFull.cs +++ b/CarCenter/CarCenterDatabaseImplement/Migrations/20240529134131_FixTest.cs @@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace CarCenterDatabaseImplement.Migrations { - public partial class InitFull : Migration + public partial class FixTest : Migration { protected override void Up(MigrationBuilder migrationBuilder) { @@ -50,6 +50,7 @@ namespace CarCenterDatabaseImplement.Migrations { Id = table.Column(type: "integer", nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + WorkerId = table.Column(type: "integer", nullable: false), PresaleStatus = table.Column(type: "integer", nullable: false), Description = table.Column(type: "text", nullable: false), DueTill = table.Column(type: "timestamp without time zone", nullable: false), @@ -128,7 +129,8 @@ namespace CarCenterDatabaseImplement.Migrations { Id = table.Column(type: "integer", nullable: false) .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - PresaleId = table.Column(type: "integer", nullable: false), + WorkerId = table.Column(type: "integer", nullable: false), + PresaleId = table.Column(type: "integer", nullable: true), Description = table.Column(type: "text", nullable: false), RequestType = table.Column(type: "integer", nullable: false) }, @@ -139,8 +141,7 @@ namespace CarCenterDatabaseImplement.Migrations name: "FK_Requests_Presales_PresaleId", column: x => x.PresaleId, principalTable: "Presales", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); + principalColumn: "Id"); }); migrationBuilder.CreateTable( diff --git a/CarCenter/CarCenterDatabaseImplement/Models/Presale.cs b/CarCenter/CarCenterDatabaseImplement/Models/Presale.cs index 3bd83bf..df5ed2d 100644 --- a/CarCenter/CarCenterDatabaseImplement/Models/Presale.cs +++ b/CarCenter/CarCenterDatabaseImplement/Models/Presale.cs @@ -25,7 +25,7 @@ namespace CarCenterDatabaseImplement.Models [Required] public double Price { get; set; } [ForeignKey("PresaleId")] - public virtual List Requests { get; set; } = new(); + public virtual List? Requests { get; set; } = new(); [ForeignKey("PresaleId")] public virtual List OrderPresales { get; set; } = new(); diff --git a/CarCenter/CarCenterWorkerApp/Controllers/HomeController.cs b/CarCenter/CarCenterWorkerApp/Controllers/HomeController.cs index 659c888..6219419 100644 --- a/CarCenter/CarCenterWorkerApp/Controllers/HomeController.cs +++ b/CarCenter/CarCenterWorkerApp/Controllers/HomeController.cs @@ -99,8 +99,6 @@ namespace CarCenterWorkerApp.Controllers [HttpGet] public IActionResult CreateRequest(int id) { - var presales = _data.GetPresales(UserWorker.user!.Id); - ViewBag.Presales = presales; if (id != 0) { var value = _data.GetRequest(id); @@ -114,6 +112,7 @@ namespace CarCenterWorkerApp.Controllers { if (model.Id == 0) { + model.PresaleId = null; model.WorkerId = UserWorker.user!.Id; if (_data.CreateRequest(model)) return RedirectToAction("IndexRequest"); @@ -149,7 +148,7 @@ namespace CarCenterWorkerApp.Controllers var bundlings = _data.GetBundlings(); var requests = _data.GetRequests(UserWorker.user!.Id); ViewBag.AllBundlings = bundlings; - ViewBag.Requests = requests; + ViewBag.AllRequests = requests; if (id != 0) { var value = _data.GetPresale(id);