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

Compare commits

base: Artyom_Yashin:c9922e9522c7ad4ba5921d0114bbaaa8b0fc1128
Branches Tags
Artyom_Yashin:main
Artyom_Yashin:ManagersApp
..
compare: Artyom_Yashin:717d6e9e25f7d326cb298a292e76abda058e6f1c
Branches Tags
Artyom_Yashin:ManagersApp
Artyom_Yashin:main

No commits in common. "c9922e9522c7ad4ba5921d0114bbaaa8b0fc1128" and "717d6e9e25f7d326cb298a292e76abda058e6f1c" have entirely different histories.
c9922e9522 ... 717d6e9e25

22 changed files with 7 additions and 275 deletions
Show Stats Expand all files Collapse all files

1
Bank/BankBusinessLogic/BankBusinessLogic.csproj
View File

@ -8,7 +8,6 @@
<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
<PackageReference Include="MailKit" Version="4.6.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
</ItemGroup>

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

@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage
{
internal class AbstractSaveToExcel
{
}
}

12
Bank/BankBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
View File

@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage
{
internal class AbstractSaveToPdf
{
}
}

12
Bank/BankBusinessLogic/OfficePackage/AbstractSaveToWord.cs
View File

@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage
{
internal class AbstractSaveToWord
{
}
}

15
Bank/BankBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
View File

@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperEnums
{
public enum ExcelStyleInfoType
{
Title,
Text,
TextWithBroder
}
}

15
Bank/BankBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs
View File

@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperEnums
{
public enum PdfParagraphAlignmentType
{
Center,
Left,
Right
}
}

14
Bank/BankBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs
View File

@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperEnums
{
public enum WordJustificationType
{
Center,
Both
}
}

18
Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
View File

@ -1,18 +0,0 @@
using BankBusinessLogic.OfficePackage.HelperEnums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperModels
{
public class ExcelCellParameters
{
public string ColumnName { get; set; } = string.Empty;
public uint RowIndex { get; set; }
public string Text { get; set; } = string.Empty;
public string CellReference => $"{ColumnName}{RowIndex}";
public ExcelStyleInfoType StyleInfo { get; set; }
}
}

21
Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
View File

@ -1,21 +0,0 @@
using BankContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperModels
{
public class ExcelInfo
{
public string FileName { get; set; } = string.Empty;
public string Title { get; set; } = string.Empty;
public List<ReportOperationsRequestsViewModel> OperationRequests
{
get;
set;
} = new();
}
}

15
Bank/BankBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
View File

@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperModels
{
public class ExcelMergeParameters
{
public string CellFromName { get; set; } = string.Empty;
public string CellToName { get; set; } = string.Empty;
public string Merge => $"{CellFromName}:{CellToName}";
}
}

18
Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
View File

@ -1,18 +0,0 @@
using BankContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperModels
{
public class PdfInfo
{
public string FileName { get; set; } = string.Empty;
public string Title { get; set; } = string.Empty;
public DateTime DateFrom { get; set; }
public DateTime DateTo { get; set; }
public List<ReportRequestsViewModel> Requests { get; set; } = new();
}
}

16
Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
View File

@ -1,16 +0,0 @@
using ComputersShopBusinessLogic.OfficePackage.HelperEnums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ComputersShopBusinessLogic.OfficePackage.HelperModels
{
public class PdfParagraph
{
public string Text { get; set; } = string.Empty;
public string Style { get; set; } = string.Empty;
public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
}
}

16
Bank/BankBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
View File

@ -1,16 +0,0 @@
using ComputersShopBusinessLogic.OfficePackage.HelperEnums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ComputersShopBusinessLogic.OfficePackage.HelperModels
{
public class PdfRowParameters
{
public List<string> Texts { get; set; } = new();
public string Style { get; set; } = string.Empty;
public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
}
}

16
Bank/BankBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
View File

@ -1,16 +0,0 @@
using BankContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperModels
{
public class WordInfo
{
public string FileName { get; set; } = string.Empty;
public string Title { get; set; } = string.Empty;
public List<RequestViewModel> Requests { get; set; } = new();
}
}

14
Bank/BankBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
View File

@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperModels
{
public class WordParagraph
{
public List<(string, WordTextProperties)> Texts { get; set; } = new();
public WordTextProperties? TextProperties { get; set; }
}
}

16
Bank/BankBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
View File

@ -1,16 +0,0 @@
using BankBusinessLogic.OfficePackage.HelperEnums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.HelperModels
{
public class WordTextProperties
{
public string Size { get; set; } = string.Empty;
public bool Bold { get; set; }
public WordJustificationType JustificationType { get; set; }
}
}

12
Bank/BankBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
View File

@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.Implements
{
internal class SaveToExcel
{
}
}

12
Bank/BankBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
View File

@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.Implements
{
internal class SaveToPdf
{
}
}

12
Bank/BankBusinessLogic/OfficePackage/Implements/SaveToWord.cs
View File

@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BankBusinessLogic.OfficePackage.Implements
{
internal class SaveToWord
{
}
}

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

@ -403,7 +403,7 @@ namespace BankClientApp.Controllers
Dictionary<int, ICardModel> a = new Dictionary<int, ICardModel>();
foreach(int card in cards)
{
a.Add(card, null);
a.Add(card, new CardSearchModel() { Id = card } as ICardModel);
}
APIClient.PostRequest("/api/request/createrequest", new RequestBindingModel
{
@ -434,14 +434,14 @@ namespace BankClientApp.Controllers
Dictionary<int, ICardModel> a = new Dictionary<int, ICardModel>();
foreach (int card in cards)
{
a.Add(card, null);
a.Add(card, new CardSearchModel() { Id = card } as ICardModel);
}
APIClient.PostRequest("/api/request/updaterequest", new RequestBindingModel
{
Id = request,
Sum = sum,
CardRequests = a,
Status = RequestStatus.Принята
Status = RequestStatus.Неизвестен
});
Response.Redirect("Request");
}

6
Bank/BankClientApp/Views/Shared/_Layout.cshtml
View File

@ -13,12 +13,12 @@
<header>
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bgwhite border-bottom box-shadow mb-3">
<div class="container">
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Банк</a>
<a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Компьютерный магазин</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
<div class="navbar-collapse collapse d-sm-inline-flex flex-smrow-reverse">
<ul class="navbar-nav flex-grow-1">
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>
@ -56,7 +56,7 @@
</div>
<footer class="border-top footer text-muted">
<div class="container">
&copy; 2024 - Банк - <a asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
&copy; 2020 - Абстрактный магазин - <a asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
</div>
</footer>
<script src="~/js/site.js" asp-append-version="true"></script>

3
Bank/BankDatabaseImplement/Implements/RequestStorage.cs
View File

@ -3,7 +3,6 @@ using BankContracts.SearchModels;
using BankContracts.StoragesContracts;
using BankContracts.ViewModels;
using BankDatabaseImplement.Models;
using BankDataModels.Models;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections;
@ -72,7 +71,7 @@ namespace BankDatabaseImplement.Implements
{
var Request = context.Requests.FirstOrDefault(rec =>
rec.Id == model.Id);
if (Request == null || Request.Status != RequestStatus.Принята)
if (Request == null)
{
return null;
}