safgerd/PIbd-23_Minhasapov_R.H._AutomobilePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minhasapov R.H. LabWork05_Hard #13

Closed
safgerd wants to merge 14 commits from LabWork05_Hard into LabWork04_Hard
pull from: LabWork05_Hard
merge into: safgerd:LabWork04_Hard
Conversation 1 Commits 14 Files Changed 217 +82 -57
6 changed files with 82 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 53817233dc - Show all commits

2
AutomobilePlant/AutomobilePlantContracts/BindingModels/ShopBindingModel.cs
View File

@ -17,7 +17,7 @@ namespace AutomobilePlantContracts.BindingModels
public DateTime OpeningDate { get; set; }
public Dictionary<int, (ICarModel, int)> ShopCars { get; set; }
public Dictionary<int, (ICarModel, int)> ShopCars { get; set; } = new();
public int MaxCountCars { get; set; }
}
}

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

@ -51,7 +51,7 @@ namespace AutomobilePlantRestApi.Controllers
carCount.Add(new Tuple<string, int>(car.Value.Item1.CarName, car.Value.Item2));
}
shop = new()
shop = new ShopViewModel()
{
Id = shop.Id,
Name = shop.Name,

26
AutomobilePlant/AutomobilePlantShopApp/Controllers/HomeController.cs
View File

@ -124,8 +124,32 @@ namespace AutomobilePlantShopApp.Controllers
Response.Redirect("Index");
}
[HttpGet]
public ShopViewModel? GetShop(int shopId)
{
return APIClient.GetRequest<ShopViewModel>($"api/shop/getshop?shopId={shopId}");
}
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Supply()
{
ViewBag.Shops = APIClient.GetRequest<List<ShopViewModel>>("api/shop/getshoplist");
ViewBag.Cars = APIClient.GetRequest<List<CarViewModel>>("api/main/getcarlist");
return View();
}
[HttpPost]
public void Supply(int shopId, int carId, int count)
{
if (!APIClient.isAuth)
{
throw new Exception("Вы как суда попали? Суда вход только авторизованным");
}
APIClient.PostRequest($"api/shop/supplycarstoshop", (new ShopSearchModel { Id = shopId }, new CarBindingModel { Id = carId }, count));
Response.Redirect("Index");
}
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error()
{
return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });

1
AutomobilePlant/AutomobilePlantShopApp/Program.cs
View File

@ -6,6 +6,7 @@ var builder = WebApplication.CreateBuilder(args);
builder.Services.AddControllersWithViews();
var app = builder.Build();
APIClient.Connect(builder.Configuration);
// Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment())

64
AutomobilePlant/AutomobilePlantShopApp/Views/Home/Index.cshtml
View File

@ -10,48 +10,48 @@
@{
if (Model == null)
{
<h3 class="display-4">Авторизируйтесь</h3>
<h3 class="display-4">Авторизируйтесь</h3>
return;
}
<p >
<a class="text-decoration-none me-3 text-black h5" asp-action="Create">Создать магазин</a>
<a class="text-decoration-none me-3 text-black h5" asp-action="Update">Изменить магазин</a>
<a class="text-decoration-none me-3 text-black h5" asp-action="Supply">Пополнить магазин</a>
<a class="text-decoration-none text-black h5" asp-action="Delete">Удалить магазин</a>
</p>
<p >
<a class="text-decoration-none me-3 text-black h5" asp-action="Create">Создать магазин</a>
<a class="text-decoration-none me-3 text-black h5" asp-action="Update">Изменить магазин</a>
<a class="text-decoration-none me-3 text-black h5" asp-action="Supply">Пополнить магазин</a>
<a class="text-decoration-none text-black h5" asp-action="Delete">Удалить магазин</a>
</p>
<table class="table">
<thead>
<tr>
<th>Номер</th>
<th>Название</th>
<th>Адрес</th>
<th>Дата открытия</th>
<th>Макс. авто</th>
</tr>
</thead>
<tbody>
<table class="table">
<thead>
<tr>
<th>Номер</th>
<th>Название</th>
<th>Адрес</th>
<th>Дата открытия</th>
<th>Макс. авто</th>
</tr>
</thead>
<tbody>
@foreach (var shop in Model)
{
<tr>
<td>
<tr>
<td>
@Html.DisplayFor(modelItem => shop.Id)
</td>
<td>
</td>
<td>
@Html.DisplayFor(modelItem => shop.Name)
</td>
<td>
</td>
<td>
@Html.DisplayFor(modelItem => shop.Address)
</td>
<td>
</td>
<td>
@Html.DisplayFor(modelItem => shop.OpeningDate)
</td>
<td>
</td>
<td>
@Html.DisplayFor(modelItem => shop.MaxCountCars)
</td>
</tr>
</td>
</tr>
}
</tbody>
</table>
</tbody>
</table>
}
</div>

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

@ -29,24 +29,24 @@
<div class="col-4">Макс. авто:</div>
<div class="col-8"><input type="number" id="count" name="count" /></div>
</div>
<div class="row mb-3">
<div class="col-4">Авто в магазине:</div>
<div class="col-8">
<table class="table">
<thead>
<tr>
<th>Автомобиль</th>
<th>Количество</th>
</tr>
</thead>
<tbody id="carcount">
</tbody>
</table>
</div>
</div>
<div class="text-center ">
<input type="submit" value="Принять" class="btn btn-success ps-5 pe-5" />
<div class="row mb-3">
<div class="col-4">Авто в магазине:</div>
<div class="col-8">
<table class="table">
<thead>
<tr>
<th>Автомобиль</th>
<th>Количество</th>
</tr>
</thead>
<tbody id="carсount">
</tbody>
</table>
</div>
</div>
<div class="text-center ">
<input type="submit" value="Принять" class="btn btn-success ps-5 pe-5" />
</div>
</form>
<script>
@ -57,11 +57,11 @@
data: { shopId: $('#shop').val()},
success: function (result) {
console.log(result)
$("#name").val(result.name);
$("#openingDate").val(new Date(result.openingDate).toISOString().substring(0, 16));
$("#address").val(result.address);
$("#count").val(result.maxCountCars);
fillTable(result.carCount);
$("#name").val(result.Name);
$("#openingDate").val(new Date(result.OpeningDate).toISOString().substring(0, 16));
$("#address").val(result.Address);
$("#count").val(result.MaxCountCars);
fillTable(result.CarCount);
}
});
}