Artyom_Yashin/PIbd-23_Yashin_A_Zakharov_R_CourseWork_Bank
2
2
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ManagersApp' of https://git.is.ulstu.ru/Artyom_Yashin/PIbd-23_Yashin_A_Zakharov_R_CourseWork_Bank into ManagersApp

Browse Source
This commit is contained in:
Zakharov_Rostislav 2024-05-26 22:03:28 +04:00
commit 8c46958f77
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
View File

@ -101,15 +101,14 @@ namespace BankBusinessLogic.OfficePackage
StyleInfo = ExcelStyleInfoType.Text
});
rowIndex++;
foreach (var component in transfer.Transfers)
foreach (var transfer in transfer.Transfers)
{
InsertCellInWorksheet(new ExcelCellParameters
{
ColumnName = "B",
RowIndex = rowIndex,
Text = "",
StyleInfo =
ExcelStyleInfoType.TextWithBroder
StyleInfo = ExcelStyleInfoType.TextWithBroder
});
InsertCellInWorksheet(new ExcelCellParameters
{

9
Bank/BankClientApp/Controllers/HomeController.cs
View File

@ -246,8 +246,6 @@ namespace BankClientApp.Controllers
{
return Redirect("~/Home/Enter");
}
List<CardViewModel>? list = APIClient.GetRequest<List<CardViewModel>>($"api/card/getcardlist?clientid={APIClient.Client.Id}");
ViewBag.Cards = list;
ViewBag.SenderCards = APIClient.GetRequest<List<CardViewModel>>($"api/card/getcardlist?clientid={APIClient.Client.Id}");
ViewBag.RecipientCards = APIClient.GetRequest<List<CardViewModel>>($"api/card/getcardlist?clientid={null}");
@ -530,18 +528,17 @@ namespace BankClientApp.Controllers
FileName = "C:\\Users\\123\\Desktop\\wordfile.docx",
SelectedCardIds = cards,
});
Response.Redirect("TransferListReport");
break;
case "excel":
APIClient.PostRequest($"api/report/savetransferstoword", new ReportBindingModel
APIClient.PostRequest($"api/report/savetransferstoexcel", new ReportBindingModel
{
FileName = "C:\\Users\\123\\Desktop\\wordfile.docx",
FileName = "C:\\Users\\123\\Desktop\\excelfile.xls",
SelectedCardIds = cards,
});
Response.Redirect("TransferListReport");
break;
default: break;
}
Response.Redirect("TransferListReport");
}
#endregion

2
Bank/BankClientApp/Views/Home/RequestCreate.cshtml
View File

@ -2,7 +2,7 @@
ViewData["Title"] = "RequestCreate";
}
<div class="text-center">
<h2 class="display-4">Создание заапроса</h2>
<h2 class="display-4">Создание запроса</h2>
</div>
<form method="post">
<div class="row">

2
Bank/BankClientApp/Views/Home/TransferListReport.cshtml
View File

@ -20,7 +20,7 @@
</div>
</div>
<div>
<input id="word" type="radio" name="format" value="word" />
<input id="word" type="radio" name="format" value="word" checked/>
<label for="word">Получать в формате Word</label>
</div>
<div>