diff --git a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/ReportCashierLogic.cs b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/ReportCashierLogic.cs index 8b7d330..ce029ea 100644 --- a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/ReportCashierLogic.cs +++ b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/ReportCashierLogic.cs @@ -46,11 +46,10 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics return _moneyTransferStorage.GetFilteredList(new MoneyTransferSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo}) .Select(x => new ReportCashierViewModel { - AccountId = x.Id, DateComplite = x.DateOperation, - ClientName = x.ClientName, - SumOperation = x.SumOperation, - TypeOperation = x.TypeOperation + AccountPayeeId = x.AccountPayeeId, + AccountSenderId = x.AccountSenderId, + SumOperation = x.Sum }) .ToList(); } @@ -60,11 +59,9 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics return _cashWithdrawalStorage.GetFilteredList(new CashWithdrawalSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo }) .Select(x => new ReportCashierViewModel { - AccountId = x.Id, + AccountPayeeId = x.Id, DateComplite = x.DateOperation, - ManufactureName = x.ManufactureName, - Sum = x.Sum, - OrderStatus = x.Status.ToString() + SumOperation = x.Sum }) .ToList(); } @@ -72,36 +69,19 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics //Сохранение мороженных в файл-Word public void SaveAccountsToWordFile(ReportBindingModel model) { - _saveToWord.CreateDoc(new WordInfo - { - FileName = model.FileName, - Title = "Список изделий", - Accounts = _accountStorage.GetFullList() - }); + throw new NotImplementedException(); } //Сохранение заготовок с указаеним изделий в файл-Excel public void SaveAccountsToExcelFile(ReportBindingModel model) { - _saveToExcel.CreateReport(new ExcelInfo - { - FileName = model.FileName, - Title = "Список заготовок", - Accounts = _accountStorage.GetFullList() - }); + throw new NotImplementedException(); } //Сохранение заказов в файл-Pdf public void SaveAccountsToPdfFile(ReportBindingModel model) { - _saveToPdf.CreateDoc(new PdfInfo - { - FileName = model.FileName, - Title = "Список заказов", - DateFrom = model.DateFrom!.Value, - DateTo = model.DateTo!.Value, - ReportAccounts = GetAccounts(model) - }); + throw new NotImplementedException(); } } } diff --git a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ReportCashierViewModel.cs b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ReportCashierViewModel.cs index 3b2b271..b4e8398 100644 --- a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ReportCashierViewModel.cs +++ b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ReportCashierViewModel.cs @@ -8,11 +8,9 @@ namespace BankYouBankruptContracts.ViewModels { public class ReportCashierViewModel { - public int AccountId { get; set; } + public int AccountPayeeId { get; set; } - public string ClientName { get; set; } = string.Empty; - - public string TypeOperation { get; set; } = string.Empty; + public int AccountSenderId { get; set; } public double SumOperation { get; set; }