diff --git a/.vs/BankProject/DesignTimeBuild/.dtbcache.v2 b/.vs/BankProject/DesignTimeBuild/.dtbcache.v2 index b8b2a6d..de1eae3 100644 Binary files a/.vs/BankProject/DesignTimeBuild/.dtbcache.v2 and b/.vs/BankProject/DesignTimeBuild/.dtbcache.v2 differ diff --git a/BankProject.sln b/BankProject.sln index cecb6d6..0ee3a7b 100644 --- a/BankProject.sln +++ b/BankProject.sln @@ -1,9 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31424.327 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BankProject", "BankProject\BankProject.csproj", "{16C39874-DEFF-4271-9CE0-336111B0F833}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BankProject", "BankProject\BankProject.csproj", "{16C39874-DEFF-4271-9CE0-336111B0F833}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StageTwoTask", "StageTwoTask", "{4F42030D-EE41-415D-B39C-65FD73FAE274}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Chris", "Chris", "{6E0AC6A7-32AF-4C61-89EB-0DB15EF2D73C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StageThreeTask", "StageThreeTask", "{6E0361AF-00B7-450B-B811-034F6EC6FA45}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,6 +25,11 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {16C39874-DEFF-4271-9CE0-336111B0F833} = {4F42030D-EE41-415D-B39C-65FD73FAE274} + {4F42030D-EE41-415D-B39C-65FD73FAE274} = {6E0AC6A7-32AF-4C61-89EB-0DB15EF2D73C} + {6E0361AF-00B7-450B-B811-034F6EC6FA45} = {6E0AC6A7-32AF-4C61-89EB-0DB15EF2D73C} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {123C7F3B-1B1C-48B0-9654-68ABF2074ED3} EndGlobalSection diff --git a/BankProject/AppServices/UserServices.cs b/BankProject/AppServices/UserServices.cs index f3c7df4..bac3e4f 100644 --- a/BankProject/AppServices/UserServices.cs +++ b/BankProject/AppServices/UserServices.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -77,7 +78,7 @@ public void Regiser() public void AddNewMember() { - string filePath = @"C:\Users\USER\Desktop\Project\BankProject\BankProject\Test.txt"; + string filePath = @"C:\Users\DELL\source\repos\Vector\BankProject\Test.txt"; List lines = File.ReadAllLines(filePath).ToList(); List UserAccountList = new List(); @@ -145,7 +146,7 @@ public void AddNewMember() public void InitializeData() { - string filePath = @"C:\Users\USER\Desktop\Project\BankProject\BankProject\Test.txt"; + string filePath = @"C:\Users\DELL\source\repos\Vector\BankProject\Test.txt"; List UserAccountList = new List(); List lines = File.ReadAllLines(filePath).ToList(); foreach (string line in lines) @@ -165,16 +166,6 @@ public void InitializeData() userAccountList.Add(userAccount); } -//1,Adebanjo Olaide,123456,321321,123123,5000.00,0,false -//2,Folorunso Nene,456789,654654,456456 ,4000.00,0,false -//3,Olatunji Money,987654,987987,789789,3000.00,1,true - - // userAccountList = new List - //{ - // new UserAccount{Id = 1, FullName = "Adebanjo Olaide", AccountNumber = 123456, CardNumber = 321321, CardPin = 123123, AccountBalance = 5000.00m, IsLocked=false}, - // new UserAccount{Id = 2, FullName = "Folorunso Nene", AccountNumber = 456789, CardNumber = 654654, CardPin = 456456 , AccountBalance = 4000.00m, IsLocked=false}, - // new UserAccount{Id = 3, FullName = "Olatunji Money", AccountNumber = 987654, CardNumber = 987987, CardPin = 789789, AccountBalance = 3000.00m, IsLocked=true}, - // }; _ListOfTransactions = new List(); } @@ -413,7 +404,7 @@ public void InsertTransaction(long _userBankAccountId, TransactionType _tranType TransactionDate = DateTime.Now, TransactionType = _tranType, TransactionAmount = _tranAmount, - Descriprion = _desc + Description = _desc }; _ListOfTransactions.Add(transaction); @@ -433,7 +424,7 @@ public void ViewTransaction() var table = new ConsoleTable("Id", "Transaction Date", "Type", "Descriptions", "Amount " + AppScreen.cur); foreach (var tran in filteredTransactionList) { - table.AddRow(tran.TransactionId, tran.TransactionDate, tran.TransactionType, tran.Descriprion, tran.TransactionAmount); + table.AddRow(tran.TransactionId, tran.TransactionDate, tran.TransactionType, tran.Description, tran.TransactionAmount); } table.Options.EnableCount = false; table.Write(); diff --git a/BankProject/BankProject.csproj b/BankProject/BankProject.csproj index b0d0642..a9e6811 100644 --- a/BankProject/BankProject.csproj +++ b/BankProject/BankProject.csproj @@ -1,8 +1,8 @@ - + Exe - net6.0 + net5.0 enable enable diff --git a/BankProject/Display/Utility.cs b/BankProject/Display/Utility.cs index fd2b4c7..f5b6b03 100644 --- a/BankProject/Display/Utility.cs +++ b/BankProject/Display/Utility.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace BankProject.Display diff --git a/BankProject/Domain/Enitities/Transaction.cs b/BankProject/Domain/Enitities/Transaction.cs index 7313ae6..14c560d 100644 --- a/BankProject/Domain/Enitities/Transaction.cs +++ b/BankProject/Domain/Enitities/Transaction.cs @@ -13,7 +13,7 @@ public class Transaction public long UserBankAccountId { get; set; } public DateTime TransactionDate { get; set; } public TransactionType TransactionType { get; set; } - public string Descriprion { get; set; } + public string Description { get; set; } public Decimal TransactionAmount { get; set; } } } diff --git a/BankProject/Program.cs b/BankProject/Program.cs index 2bb7618..a52f0ea 100644 --- a/BankProject/Program.cs +++ b/BankProject/Program.cs @@ -18,32 +18,6 @@ -//decimal val = 1278.112m; - - -//CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US"); -//Console.WriteLine($"{val}"); -//var culture = CultureInfo.CreateSpecificCulture("en-US"); -//var culture2 = new CultureInfo("en-US"); - -//string numberAsString = val.ToString("# #####.###", culture); -//string numberAsString2 = val.ToString("# #####.###", culture2); -//Console.WriteLine(numberAsString); -//Console.WriteLine(numberAsString2); - -//var culture = CultureInfo.CreateSpecificCulture("en-US"); -//var culture = CultureInfo.CreateSpecificCulture("en-NG"); -//Console.OutputEncoding = Encoding.Unicode; -//var culture = CultureInfo.CreateSpecificCulture("yo-NG"); -////decimal number = 1_500_000.50m; -//decimal number = 1500000.50m; - -//string numberString = number.ToString("C", CultureInfo.InvariantCulture); -////string numberString = number.ToString("C"); - -//string numberStringTwo = number.ToString("C0", culture); -//Console.WriteLine(numberString); -//Console.WriteLine(numberStringTwo); diff --git a/BankProject/obj/BankProject.csproj.nuget.dgspec.json b/BankProject/obj/BankProject.csproj.nuget.dgspec.json index 61e4446..27cd0c3 100644 --- a/BankProject/obj/BankProject.csproj.nuget.dgspec.json +++ b/BankProject/obj/BankProject.csproj.nuget.dgspec.json @@ -1,38 +1,37 @@ { "format": 1, "restore": { - "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\BankProject.csproj": {} + "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\BankProject.csproj": {} }, "projects": { - "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\BankProject.csproj": { + "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\BankProject.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\BankProject.csproj", + "projectUniqueName": "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\BankProject.csproj", "projectName": "BankProject", - "projectPath": "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\BankProject.csproj", - "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\obj\\", + "projectPath": "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\BankProject.csproj", + "packagesPath": "C:\\Users\\DELL\\.nuget\\packages\\", + "outputPath": "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\DELL\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" ], "originalTargetFrameworks": [ - "net6.0" + "net5.0" ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net5.0": { + "targetAlias": "net5.0", "projectReferences": {} } }, @@ -43,8 +42,8 @@ } }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net5.0": { + "targetAlias": "net5.0", "dependencies": { "ConsoleTables": { "target": "Package", @@ -70,7 +69,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/BankProject/obj/BankProject.csproj.nuget.g.props b/BankProject/obj/BankProject.csproj.nuget.g.props index 252bbcc..975e466 100644 --- a/BankProject/obj/BankProject.csproj.nuget.g.props +++ b/BankProject/obj/BankProject.csproj.nuget.g.props @@ -5,13 +5,16 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\USER\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\DELL\.nuget\packages\;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference - 6.0.1 + 5.10.0 - - + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + \ No newline at end of file diff --git a/BankProject/obj/BankProject.csproj.nuget.g.targets b/BankProject/obj/BankProject.csproj.nuget.g.targets index 3dc06ef..53cfaa1 100644 --- a/BankProject/obj/BankProject.csproj.nuget.g.targets +++ b/BankProject/obj/BankProject.csproj.nuget.g.targets @@ -1,2 +1,6 @@  - \ No newline at end of file + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + \ No newline at end of file diff --git a/BankProject/obj/Debug/net6.0/BankProject.GeneratedMSBuildEditorConfig.editorconfig b/BankProject/obj/Debug/net6.0/BankProject.GeneratedMSBuildEditorConfig.editorconfig index 56f9455..3cd37c3 100644 --- a/BankProject/obj/Debug/net6.0/BankProject.GeneratedMSBuildEditorConfig.editorconfig +++ b/BankProject/obj/Debug/net6.0/BankProject.GeneratedMSBuildEditorConfig.editorconfig @@ -3,8 +3,6 @@ build_property.TargetFramework = net6.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = BankProject -build_property.ProjectDir = C:\Users\USER\Desktop\Project\BankProject\BankProject\ +build_property.PublishSingleFile = +build_property.IncludeAllContentForSelfExtract = +build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows diff --git a/BankProject/obj/Debug/net6.0/BankProject.assets.cache b/BankProject/obj/Debug/net6.0/BankProject.assets.cache index 81572a4..992dd91 100644 Binary files a/BankProject/obj/Debug/net6.0/BankProject.assets.cache and b/BankProject/obj/Debug/net6.0/BankProject.assets.cache differ diff --git a/BankProject/obj/Debug/net6.0/BankProject.csproj.AssemblyReference.cache b/BankProject/obj/Debug/net6.0/BankProject.csproj.AssemblyReference.cache index aa7bfea..f5e894a 100644 Binary files a/BankProject/obj/Debug/net6.0/BankProject.csproj.AssemblyReference.cache and b/BankProject/obj/Debug/net6.0/BankProject.csproj.AssemblyReference.cache differ diff --git a/BankProject/obj/project.assets.json b/BankProject/obj/project.assets.json index 267fde3..60af196 100644 --- a/BankProject/obj/project.assets.json +++ b/BankProject/obj/project.assets.json @@ -1,7 +1,7 @@ { "version": 3, "targets": { - "net6.0": { + "net5.0": { "ConsoleTables/2.4.2": { "type": "package", "dependencies": { @@ -35,10 +35,10 @@ "Newtonsoft.Json/13.0.2": { "type": "package", "compile": { - "lib/net6.0/Newtonsoft.Json.dll": {} + "lib/netstandard2.0/Newtonsoft.Json.dll": {} }, "runtime": { - "lib/net6.0/Newtonsoft.Json.dll": {} + "lib/netstandard2.0/Newtonsoft.Json.dll": {} } }, "System.IO/4.3.0": { @@ -706,45 +706,44 @@ } }, "projectFileDependencyGroups": { - "net6.0": [ + "net5.0": [ "ConsoleTables >= 2.4.2", "Newtonsoft.Json >= 13.0.2" ] }, "packageFolders": { - "C:\\Users\\USER\\.nuget\\packages\\": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Users\\DELL\\.nuget\\packages\\": {}, + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\BankProject.csproj", + "projectUniqueName": "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\BankProject.csproj", "projectName": "BankProject", - "projectPath": "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\BankProject.csproj", - "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\obj\\", + "projectPath": "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\BankProject.csproj", + "packagesPath": "C:\\Users\\DELL\\.nuget\\packages\\", + "outputPath": "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Users\\DELL\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" ], "originalTargetFrameworks": [ - "net6.0" + "net5.0" ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net5.0": { + "targetAlias": "net5.0", "projectReferences": {} } }, @@ -755,8 +754,8 @@ } }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net5.0": { + "targetAlias": "net5.0", "dependencies": { "ConsoleTables": { "target": "Package", @@ -782,7 +781,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.302\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/BankProject/obj/project.nuget.cache b/BankProject/obj/project.nuget.cache index a1ff370..fc51d2f 100644 --- a/BankProject/obj/project.nuget.cache +++ b/BankProject/obj/project.nuget.cache @@ -1,20 +1,20 @@ { "version": 2, - "dgSpecHash": "XgvvOOuHstWiiC+olBB1QY+tppPn6/6hmuIANuUlL5BuBvtPJChEg/5Tffjt3BkZ3H3sSQmFn09OMujRwRynEQ==", + "dgSpecHash": "wnC287yys7tIqFmqtZQTVlvo+ePF4KbuUfnuX31R1R92Oq95eGhSWpMtBQB6El+rGGyBi7hFtsYw/tnhwes00g==", "success": true, - "projectFilePath": "C:\\Users\\USER\\Desktop\\Project\\BankProject\\BankProject\\BankProject.csproj", + "projectFilePath": "C:\\Users\\DELL\\source\\repos\\Vector\\BankProject\\BankProject.csproj", "expectedPackageFiles": [ - "C:\\Users\\USER\\.nuget\\packages\\consoletables\\2.4.2\\consoletables.2.4.2.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\USER\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512" + "C:\\Users\\DELL\\.nuget\\packages\\consoletables\\2.4.2\\consoletables.2.4.2.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\DELL\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file