From 73b39aade1800e5998e2344f4a48d7ead96236f3 Mon Sep 17 00:00:00 2001 From: Artyom_Yashin Date: Fri, 26 Apr 2024 11:55:12 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bank/BankContracts/SearchModels/CardSearchModel.cs | 2 ++ Bank/BankContracts/SearchModels/OperationSearchModel.cs | 1 + Bank/BankContracts/SearchModels/RequestSearchModel.cs | 1 + Bank/BankContracts/ViewModels/CardViewModel.cs | 2 +- Bank/BankContracts/ViewModels/ManagerViewModel.cs | 2 +- Bank/BankContracts/ViewModels/OperationViewModel.cs | 1 + Bank/BankContracts/ViewModels/RequestViewModel.cs | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Bank/BankContracts/SearchModels/CardSearchModel.cs b/Bank/BankContracts/SearchModels/CardSearchModel.cs index e154736..bc04b3e 100644 --- a/Bank/BankContracts/SearchModels/CardSearchModel.cs +++ b/Bank/BankContracts/SearchModels/CardSearchModel.cs @@ -11,5 +11,7 @@ namespace BankContracts.SearchModels public int? Id { get; set; } public string? Number { get; set; } public int? ClientId { get; set; } + public DateOnly? ReleaseDate { get; set; } + public DateOnly? ExpirationDate { get; set; } } } diff --git a/Bank/BankContracts/SearchModels/OperationSearchModel.cs b/Bank/BankContracts/SearchModels/OperationSearchModel.cs index f532a3d..2ba7ad9 100644 --- a/Bank/BankContracts/SearchModels/OperationSearchModel.cs +++ b/Bank/BankContracts/SearchModels/OperationSearchModel.cs @@ -10,6 +10,7 @@ namespace BankContracts.SearchModels { public int? Id { get; set; } public DateTime? OperationTime { get; set; } + public int? SenderCardId { get; set; } public int? RecipientCardId { get; set; } } } diff --git a/Bank/BankContracts/SearchModels/RequestSearchModel.cs b/Bank/BankContracts/SearchModels/RequestSearchModel.cs index 7812db3..de95ed5 100644 --- a/Bank/BankContracts/SearchModels/RequestSearchModel.cs +++ b/Bank/BankContracts/SearchModels/RequestSearchModel.cs @@ -12,5 +12,6 @@ namespace BankContracts.SearchModels public int? Id { get; set; } public DateTime? RequestTime { get; set; } public string? CardNumber { get; set; } + public RequestStatus? Status { get; set; } } } diff --git a/Bank/BankContracts/ViewModels/CardViewModel.cs b/Bank/BankContracts/ViewModels/CardViewModel.cs index 41e77a3..784712b 100644 --- a/Bank/BankContracts/ViewModels/CardViewModel.cs +++ b/Bank/BankContracts/ViewModels/CardViewModel.cs @@ -25,7 +25,7 @@ namespace BankContracts.ViewModels [DisplayName("Держатель карты")] public string ClientName { get; set; } = string.Empty; public int? AccountId { get; set; } - [DisplayName("")] + [DisplayName("Номер счета")] public string AccountNumber { get; set; } = string.Empty; } } diff --git a/Bank/BankContracts/ViewModels/ManagerViewModel.cs b/Bank/BankContracts/ViewModels/ManagerViewModel.cs index 0e93c59..f267f2c 100644 --- a/Bank/BankContracts/ViewModels/ManagerViewModel.cs +++ b/Bank/BankContracts/ViewModels/ManagerViewModel.cs @@ -16,7 +16,7 @@ namespace BankContracts.ViewModels [DisplayName("Email")] public string Email { get; set; } = string.Empty; - + [DisplayName("Пароль")] public string Password { get; set; } = string.Empty; } } diff --git a/Bank/BankContracts/ViewModels/OperationViewModel.cs b/Bank/BankContracts/ViewModels/OperationViewModel.cs index b979b39..0658d95 100644 --- a/Bank/BankContracts/ViewModels/OperationViewModel.cs +++ b/Bank/BankContracts/ViewModels/OperationViewModel.cs @@ -10,6 +10,7 @@ namespace BankContracts.ViewModels { public class OperationViewModel : IOperationModel { + [DisplayName("Номер")] public int Id { get; set; } [DisplayName("Сумма пополнения")] public int Sum { get; set; } diff --git a/Bank/BankContracts/ViewModels/RequestViewModel.cs b/Bank/BankContracts/ViewModels/RequestViewModel.cs index 22a022f..7bb5239 100644 --- a/Bank/BankContracts/ViewModels/RequestViewModel.cs +++ b/Bank/BankContracts/ViewModels/RequestViewModel.cs @@ -10,6 +10,7 @@ namespace BankContracts.ViewModels { public class RequestViewModel : IRequestModel { + [DisplayName("Номер")] public int Id { get; set; } [DisplayName("Сумма заявки")] public int Sum { get; set; }