TImourka/PIbd-21_Kouvshinoff_T._A._AutomobilePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LC5 надо было сразу использовать этот костыль лёг бы спать на 5 часов раньше

Browse Source
This commit is contained in:
Timourka 2024-04-07 04:53:21 +04:00
parent 6ee1a91f89
commit 31c0173dac
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AutomobilePlant/AutomobilePlantContracts/ViewModels/ShopViewModel.cs
View File

@ -25,5 +25,7 @@ namespace AutomobilePlantContracts.ViewModels
public DateTime OpeningDate { get; set; } public DateTime OpeningDate { get; set; }
public Dictionary<int, (ICarModel, int)> ShopCars { get; set; } = new(); public Dictionary<int, (ICarModel, int)> ShopCars { get; set; } = new();
public List<Tuple<string, int>>? CarAndCount { get; set; } = new();
} }
} }

5
AutomobilePlant/AutomobilePlantRestApi/Controllers/ShopController.cs
View File

@ -25,7 +25,10 @@ namespace AutomobilePlantRestApi.Controllers
{ {
try try
{ {
return _shop.ReadList(null); List<ShopViewModel> shops = _shop.ReadList(null);
for (int i = 0; i < shops.Count; i++)
shops[i].CarAndCount = shops[i].ShopCars.Values.ToList().Select( x => (x.Item1.CarName, x.Item2).ToTuple() ).ToList();
return shops;
} }
catch (Exception ex) catch (Exception ex)
{ {

4
AutomobilePlant/AutomobilePlantShopApp/Views/Home/Update.cshtml
View File

@ -65,7 +65,7 @@
$("#openingDate").val(new Date(selectedShop.openingDate).toISOString().substring(0, 16)); $("#openingDate").val(new Date(selectedShop.openingDate).toISOString().substring(0, 16));
$("#address").val(selectedShop.address); $("#address").val(selectedShop.address);
$("#maxCountCars").val(selectedShop.maxCountCars); $("#maxCountCars").val(selectedShop.maxCountCars);
fillTable(selectedShop.shopCars); fillTable(selectedShop.carAndCount);
} }
} }
@ -73,6 +73,6 @@
$("#carTable").empty(); $("#carTable").empty();
for (var car in shopCars) for (var car in shopCars)
$("#carTable").append('<tr><td>' + car.Value.Item1.CarName + '</td><td>' + car.Value.Item2 + '</td></tr>'); $("#carTable").append('<tr><td>' + shopCars[car].item1 + '</td><td>' + shopCars[car].item2 + '</td></tr>');
} }
</script> </script>

2
AutomobilePlant/AutomobilePlantShopApp/Views/Home/_Layout.cshtml
View File

@ -40,7 +40,7 @@
<footer class="border-top footer text-muted"> <footer class="border-top footer text-muted">
<div class="container"> <div class="container">
&copy; 2023 - AutomobilePlantShopApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a> &copy; 2024 - AutomobilePlantShopApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
</div> </div>
</footer> </footer>
<script src="~/lib/jquery/dist/jquery.min.js"></script> <script src="~/lib/jquery/dist/jquery.min.js"></script>