diff --git a/BankYouBankrupt/BankYouBankruptContracts/BankYouBankruptContracts.csproj b/BankYouBankrupt/BankYouBankruptContracts/BankYouBankruptContracts.csproj index aae7352..69d6220 100644 --- a/BankYouBankrupt/BankYouBankruptContracts/BankYouBankruptContracts.csproj +++ b/BankYouBankrupt/BankYouBankruptContracts/BankYouBankruptContracts.csproj @@ -10,7 +10,6 @@ - diff --git a/BankYouBankrupt/BankYouBankruptContracts/BindingModels/AccountBindingModel.cs b/BankYouBankrupt/BankYouBankruptContracts/BindingModels/AccountBindingModel.cs index 4cb52b9..b0c2cca 100644 --- a/BankYouBankrupt/BankYouBankruptContracts/BindingModels/AccountBindingModel.cs +++ b/BankYouBankrupt/BankYouBankruptContracts/BindingModels/AccountBindingModel.cs @@ -15,6 +15,8 @@ namespace BankYouBankruptContracts.BindingModels public int ClientId { get; set; } + public int AccountNumber { get; set; } + public string PasswordAccount { get; set; } = string.Empty; public double Balance { get; set; } diff --git a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/AccountViewModel.cs b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/AccountViewModel.cs new file mode 100644 index 0000000..399be92 --- /dev/null +++ b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/AccountViewModel.cs @@ -0,0 +1,36 @@ +using BankYouBankruptDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankYouBankruptContracts.ViewModels +{ + public class AccountViewModel : IAccountModel + { + public int Id { get; set; } + + public int CashierId { get; set; } + + public int ClientId { get; set; } + + [DisplayName("Номер счёта")] + public int AccountNumber { get; set; } + + [DisplayName("Имя")] + public string Name { get; set; } = string.Empty; + + [DisplayName("Отчество")] + public string Patronymic { get; set; } = string.Empty; + + public string PasswordAccount { get; set; } = string.Empty; + + [DisplayName("Баланс")] + public double Balance { get; set; } + + [DisplayName("Дата открытия")] + public DateTime DateOpen { get; set; } = DateTime.Now; + } +} diff --git a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/CashWithdrawalViewModel.cs b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/CashWithdrawalViewModel.cs new file mode 100644 index 0000000..d3aa12f --- /dev/null +++ b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/CashWithdrawalViewModel.cs @@ -0,0 +1,26 @@ +using BankYouBankruptDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankYouBankruptContracts.ViewModels +{ + public class CashWithdrawalViewModel : ICashWithdrawalModel + { + public int Id { get; set; } + + public int AccountId { get; set; } + + [DisplayName("Номер счёта")] + public int AccountNumber { get; set; } + + [DisplayName("Сумма выданных наличных")] + public int Sum { get; set; } + + [DisplayName("Дата операции")] + public DateTime DateOperation { get; set; } = DateTime.Now; + } +} diff --git a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/CashierViewModel.cs b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/CashierViewModel.cs new file mode 100644 index 0000000..6a15a7b --- /dev/null +++ b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/CashierViewModel.cs @@ -0,0 +1,32 @@ +using BankYouBankruptDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankYouBankruptContracts.ViewModels +{ + public class CashierViewModel : ICashierModel + { + public int Id { get; set; } + + public string Password { get; set; } = string.Empty; + + [DisplayName("Имя")] + public string Name { get; set; } = string.Empty; + + [DisplayName("Фамилия")] + public string Surname { get; set; } = string.Empty; + + [DisplayName("Отчество")] + public string Patronymic { get; set; } = string.Empty; + + [DisplayName("Телефон")] + public string Telephone { get; set; } = string.Empty; + + [DisplayName("Почта")] + public string Email { get; set; } = string.Empty; + } +} diff --git a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/MoneyTransferViewModel.cs b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/MoneyTransferViewModel.cs new file mode 100644 index 0000000..688e9f0 --- /dev/null +++ b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/MoneyTransferViewModel.cs @@ -0,0 +1,31 @@ +using BankYouBankruptDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BankYouBankruptContracts.ViewModels +{ + public class MoneyTransferViewModel : IMoneyTransferModel + { + public int Id { get; set; } + + [DisplayName("Сумма перевода")] + public int Sum { get; set; } + + public int AccountSenderId { get; set; } + + [DisplayName("Номер счёта отп.")] + public int AccountSenderNumber { get; set; } + + public int AccountPayeeId { get; set; } + + [DisplayName("Номер счёта получ.")] + public int AccountPayeeNumber { get; set; } + + [DisplayName("Дата операции")] + public DateTime DateOperation { get; set; } = DateTime.Now; + } +} diff --git a/BankYouBankrupt/BankYouBankruptDataModels/Models/IAccountModel.cs b/BankYouBankrupt/BankYouBankruptDataModels/Models/IAccountModel.cs index 355e0f4..49f4b91 100644 --- a/BankYouBankrupt/BankYouBankruptDataModels/Models/IAccountModel.cs +++ b/BankYouBankrupt/BankYouBankruptDataModels/Models/IAccountModel.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Security.Principal; using System.Text; using System.Threading.Tasks; @@ -9,6 +10,8 @@ namespace BankYouBankruptDataModels.Models //банковский счёт public interface IAccountModel : IId { + int AccountNumber { get; } + int CashierId { get; } int ClientId { get; }