diff --git a/BlacksmithWorkshop/BlacksmithWorkshopClientApp/APIClient.cs b/BlacksmithWorkshop/BlacksmithWorkshopClientApp/APIClient.cs index 4b96b33..046d2e9 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopClientApp/APIClient.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopClientApp/APIClient.cs @@ -33,7 +33,7 @@ namespace BlacksmithWorkshopClientApp var json = JsonConvert.SerializeObject(model); var data = new StringContent(json, Encoding.UTF8, "application/json"); - var response = _client.PostAsync(requestUrl, data); + var response = _client.PostAsync(requestUrl, data); var result = response.Result.Content.ReadAsStringAsync().Result; if (!response.Result.IsSuccessStatusCode) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopClientApp/Program.cs b/BlacksmithWorkshop/BlacksmithWorkshopClientApp/Program.cs index 0727468..05dec10 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopClientApp/Program.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopClientApp/Program.cs @@ -1,10 +1,12 @@ +using BlacksmithWorkshopClientApp; + var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddControllersWithViews(); var app = builder.Build(); - +APIClient.Connect(builder.Configuration); // Configure the HTTP request pipeline. if (!app.Environment.IsDevelopment()) { diff --git a/BlacksmithWorkshop/BlacksmithWorkshopClientApp/appsettings.json b/BlacksmithWorkshop/BlacksmithWorkshopClientApp/appsettings.json index dfe1d26..3418633 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopClientApp/appsettings.json +++ b/BlacksmithWorkshop/BlacksmithWorkshopClientApp/appsettings.json @@ -7,5 +7,5 @@ }, "AllowedHosts": "*", - "IPAddress": "http://localhost:5263/" + "IPAddress": "https://localhost:7116/" } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Implements/OrderStorage.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Implements/OrderStorage.cs index 27d91a4..91ca492 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Implements/OrderStorage.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Implements/OrderStorage.cs @@ -78,11 +78,11 @@ namespace BlacksmithWorkshopDatabaseImplement.Implements { using var context = new BlacksmithWorkshopDatabase(); return context.Orders - .Include(x => x.Manufacture) - .Include(x => x.Client) - .Select(x => x.GetViewModel) - .ToList(); - } + .Include(x => x.Manufacture) + .Include(x => x.Client) + .Select(x => x.GetViewModel) + .ToList(); + } public OrderViewModel? Insert(OrderBindingModel model) { var newOrder = Order.Create(model); diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs index b9f500d..0c3e4a2 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs @@ -19,6 +19,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Models public int ManufactureId { get; set; } [Required] public int ClientId { get; set; } + //public string ClientFIO { get; set; } [Required] public int Count { get; set; } [Required] @@ -63,6 +64,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Models ManufactureId = ManufactureId, ManufactureName = Manufacture.ManufactureName, ClientId = ClientId, + ClientFIO = Client.ClientFIO, Count = Count, Sum = Sum, Status = Status,