Compare commits

..

No commits in common. "1b12da5d9829f3aa0752c7aaa4dd184aa021a617" and "0e74bece3379479f68b17bc5ba99c72ab37d0710" have entirely different histories.

5 changed files with 9 additions and 34 deletions

View File

@ -23,10 +23,7 @@ namespace BankClientApp
var result = response.Result.Content.ReadAsStringAsync().Result;
if (response.Result.IsSuccessStatusCode)
{
return JsonConvert.DeserializeObject<T>(result, new JsonSerializerSettings {
TypeNameHandling = Newtonsoft.Json.TypeNameHandling.All,
NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,
});
return JsonConvert.DeserializeObject<T>(result);
}
else
{

View File

@ -427,7 +427,7 @@ namespace BankClientApp.Controllers
}
[HttpPost]
public void RequestUpdate(int request, int sum, List<int> cards)
public void RequestUpdate(int sum, List<int> cards)
{
if (APIClient.Client == null)
throw new Exception("Вы как суда попали? Суда вход только авторизованным");
@ -438,7 +438,6 @@ namespace BankClientApp.Controllers
}
APIClient.PostRequest("/api/request/updaterequest", new RequestBindingModel
{
Id = request,
Sum = sum,
CardRequests = a,
Status = RequestStatus.Неизвестен
@ -472,22 +471,6 @@ namespace BankClientApp.Controllers
Response.Redirect("Request");
}
[HttpGet]
public RequestViewModel? GetRequest(int requestId)
{
if (APIClient.Client == null)
{
throw new Exception("Вы как суда попали? Суда вход только авторизованным");
}
var result = APIClient.GetRequest<RequestViewModel>($"api/request/getrequest?requestid={requestId}");
result.CardRequests = null;
if (result == null)
{
return default;
}
return result;
}
#endregion
#region//работа с отчетами

View File

@ -40,26 +40,23 @@
{
<script>
function check() {
var cards = $('#cards').val();
var request = $('#request').val();
$("#cards option:selected").removeAttr("selected");
if (request) {
if (cards && request) {
$.ajax({
method: "GET",
url: "/Home/GetCards",
data: { requestId: request },
success: function (result) {
$.map(result, function (n) {
$(`option[value=${n}]`).attr("selected", "selected")
$(`option[data-name=${n}]`).attr("selected", "selected")
});
}
});
$.ajax({
method: "GET",
url: "/Home/GetRequest",
data: {requestId: request},
success: function (result) {
$('#sum').val(result.sum)
}
});
};
}

View File

@ -48,7 +48,7 @@ namespace BankDatabaseImplement.Implements
{
if (!model.Id.HasValue) return null;
using var context = new BankDatabase();
return context.Requests.Include(x => x.Cards).ThenInclude(x => x.Card).ToList()
return context.Requests.Include(x => x.Cards).ThenInclude(x => x.Card)
.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
}
public RequestViewModel? Insert(RequestBindingModel model)

View File

@ -37,12 +37,10 @@ namespace BankRestApi.Controllers
{
try
{
var tmp = _logic.ReadElement(new RequestSearchModel
return _logic.ReadElement(new RequestSearchModel
{
Id = RequestId
});
tmp.CardRequests = null;
return tmp;
}
catch (Exception ex)
{