diff --git a/BlacksmithWorkshop/BlacksmithWorkshopRestApi/Controllers/ShopController.cs b/BlacksmithWorkshop/BlacksmithWorkshopRestApi/Controllers/ShopController.cs index ed9d91d..af302aa 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopRestApi/Controllers/ShopController.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopRestApi/Controllers/ShopController.cs @@ -65,7 +65,6 @@ namespace BlacksmithWorkshopRestApi.Controllers { try { - model.ShopManufactures = null!; return _logic.Update(model); } catch (Exception ex) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/ApiClient.cs b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/ApiClient.cs index d000792..0d05a18 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/ApiClient.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/ApiClient.cs @@ -33,8 +33,7 @@ namespace BlacksmithWorkshopShopApp public static void PostRequest(string requestUrl, T model) { var json = JsonConvert.SerializeObject(model); - var data = new StringContent(json, Encoding.UTF8, - "application/json"); + var data = new StringContent(json, Encoding.UTF8, "application/json"); var response = _client.PostAsync(requestUrl, data); var result = response.Result.Content.ReadAsStringAsync().Result; if (!response.Result.IsSuccessStatusCode) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Create.cshtml b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Create.cshtml index 00b9ea0..f229154 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Create.cshtml +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Create.cshtml @@ -21,7 +21,7 @@
Дата открытия:
- +
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Update.cshtml b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Update.cshtml index de6bb78..e073525 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Update.cshtml +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Home/Update.cshtml @@ -24,7 +24,7 @@
Дата открытия:
-
+
Вместимость:
@@ -64,7 +64,7 @@ success: function (result) { $('#name').val(result.item1.shopName); $('#address').val(result.item1.address); - $('#dateopen').val(result.item1.dateOpen); + $('#openingdate').val(result.item1.openingDate); $('#maxcapacity').val(result.item1.maxCapacity); $('#table-elements').html(result.item2); } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Shared/_Layout.cshtml b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Shared/_Layout.cshtml index 79cd9fe..4c27b5f 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Shared/_Layout.cshtml +++ b/BlacksmithWorkshop/BlacksmithWorkshopShopApp/Views/Shared/_Layout.cshtml @@ -34,6 +34,9 @@ +