Compare commits
3 Commits
adea6c7922
...
a41f1a5638
Author | SHA1 | Date | |
---|---|---|---|
a41f1a5638 | |||
fe90954785 | |||
53817233dc |
1
.gitignore
vendored
1
.gitignore
vendored
@ -398,3 +398,4 @@ FodyWeavers.xsd
|
|||||||
# JetBrains Rider
|
# JetBrains Rider
|
||||||
*.sln.iml
|
*.sln.iml
|
||||||
|
|
||||||
|
/AutomobilePlant/ImplementationExtensions
|
@ -17,7 +17,7 @@ namespace AutomobilePlantContracts.BindingModels
|
|||||||
|
|
||||||
public DateTime OpeningDate { get; set; }
|
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; }
|
public int MaxCountCars { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ using AutomobilePlantContracts.ViewModels;
|
|||||||
using AutomobilePlantShopApp.Models;
|
using AutomobilePlantShopApp.Models;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace AutomobilePlantShopApp.Controllers
|
namespace AutomobilePlantShopApp.Controllers
|
||||||
{
|
{
|
||||||
@ -105,7 +106,7 @@ namespace AutomobilePlantShopApp.Controllers
|
|||||||
return View();
|
return View();
|
||||||
}
|
}
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public void Update(int shop, string shopName, string address, DateTime dateOpening, int count)
|
public void Update(int shop, string name, string address, DateTime openingDate, int count)
|
||||||
{
|
{
|
||||||
if (!APIClient.isAuth)
|
if (!APIClient.isAuth)
|
||||||
{
|
{
|
||||||
@ -115,15 +116,39 @@ namespace AutomobilePlantShopApp.Controllers
|
|||||||
APIClient.PostRequest($"api/shop/updateshop", new ShopBindingModel
|
APIClient.PostRequest($"api/shop/updateshop", new ShopBindingModel
|
||||||
{
|
{
|
||||||
Id = shop,
|
Id = shop,
|
||||||
Name = shopName,
|
Name = name,
|
||||||
Address = address,
|
Address = address,
|
||||||
OpeningDate = dateOpening,
|
OpeningDate = openingDate,
|
||||||
MaxCountCars = count
|
MaxCountCars = count
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
Response.Redirect("Index");
|
Response.Redirect("Index");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpGet]
|
||||||
|
public ShopViewModel? GetShop(int shopId)
|
||||||
|
{
|
||||||
|
return APIClient.GetRequest<ShopViewModel>($"api/shop/getshop?shopId={shopId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
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)]
|
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
|
||||||
public IActionResult Error()
|
public IActionResult Error()
|
||||||
|
@ -6,6 +6,7 @@ var builder = WebApplication.CreateBuilder(args);
|
|||||||
builder.Services.AddControllersWithViews();
|
builder.Services.AddControllersWithViews();
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
APIClient.Connect(builder.Configuration);
|
||||||
|
|
||||||
// Configure the HTTP request pipeline.
|
// Configure the HTTP request pipeline.
|
||||||
if (!app.Environment.IsDevelopment())
|
if (!app.Environment.IsDevelopment())
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
<div class="col-4">Название:</div>
|
<div class="col-4">Название:</div>
|
||||||
<div class="col-8"><input type="text" name="name" id="name" /></div>
|
<div class="col-8"><input type="text" id="name" name="name" /></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
<div class="col-4">Адрес:</div>
|
<div class="col-4">Адрес:</div>
|
||||||
@ -22,7 +22,7 @@
|
|||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
<div class="col-4">Дата открытия:</div>
|
<div class="col-4">Дата открытия:</div>
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<input type="datetime-local" id="openingDate" name="openingDate" />
|
<input type="date" id="openingDate" name="openingDate" /></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
@ -39,7 +39,7 @@
|
|||||||
<th>Количество</th>
|
<th>Количество</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="carcount">
|
<tbody id="carCount">
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
@ -49,7 +49,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
function getData() {
|
function getData() {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
method: "GET",
|
method: "GET",
|
||||||
@ -66,11 +65,10 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function fillTable(carcount) {
|
function fillTable(carCount) {
|
||||||
$("#carcount").empty();
|
$("#carCount").empty();
|
||||||
|
|
||||||
for (var i = 0; i < carcount.length; i++)
|
for (var i = 0; i < carCount.length; i++)
|
||||||
$("#carcount").append('<tr><td>' + carcount[i].item1 +
|
$("#carCount").append('<tr><td>' + carCount[i].item1 + '</td><td>' + carCount[i].item2 + '</td></tr>');
|
||||||
'</td><td>' + carcount[i].item2 + '</td></tr>');
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
Loading…
Reference in New Issue
Block a user