diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 552c95e..84aea1d 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -78,6 +78,66 @@ namespace rmutr_report.Controllers return Ok(); } + [HttpPost, Route("reports/budget_summary_report/{type}")] + [ApiExplorerSettings(GroupName = "reports")] + public IActionResult GetSumReport([FromRoute] string type, [FromBody] budget_summary_report budget_summary_reports) + { + var _budget_summary_report = new List() { budget_summary_reports }; + var s1 = budget_summary_reports.summary.Sum(d => d.budget_1); + var s2 = budget_summary_reports.summary.Sum(d => d.budget_2); + var s3 = budget_summary_reports.summary.Sum(d => d.budget_3); + var s4 = budget_summary_reports.summary.Sum(d => d.budget_4); + var s5 = budget_summary_reports.summary.Sum(d => d.budget_5); + var s6 = s1+s2+s3+s4+s5; + budget_summary_reports.budget_1 = s1; + budget_summary_reports.budget_2 = s2; + budget_summary_reports.budget_3 = s3; + budget_summary_reports.budget_4 = s4; + budget_summary_reports.budget_5 = s5; + budget_summary_reports.total_budget = s6; + foreach (var budget in budget_summary_reports.summary) + { + budget.total_budget = budget.budget_1 + budget.budget_2 + budget.budget_3 + budget.budget_4 + + budget.budget_5; + + } + Report report = new Report(); + report.Load(_setting.report_path + "budget_summary_report.frx"); + report.RegisterData(_budget_summary_report, "budget_summary_report"); + report.Prepare(); + + MemoryStream stream = new MemoryStream(); + switch (type) + { + case "pdf": + PDFExport pdf = new PDFExport(); + report.Export(pdf, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/pdf"); + + case "xls":case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/vnd.ms-excel"); + break; + case "mht": + MHTExport mht = new MHTExport(); + report.Export(mht, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "multipart/related"); + break; + case "csv": + CSVExport csv = new CSVExport(); + report.Export(csv, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "text/csv"); + break; + } + + return Ok(); + } + } } \ No newline at end of file diff --git a/Models/budget/budget_summary_report.cs b/Models/budget/budget_summary_report.cs new file mode 100644 index 0000000..fc52649 --- /dev/null +++ b/Models/budget/budget_summary_report.cs @@ -0,0 +1,168 @@ +using System.Collections.Generic; + +namespace rmutr_report.Models +{ + public class budget_summary_report + { + public string budget_year { get; set; } + public string agency_name_th { get; set; } + public Listsummary{ get; set; } + public decimal? budget_1 { get; set; } + public decimal? budget_2 { get; set; } + public decimal? budget_3 { get; set; } + public decimal? budget_4 { get; set; } + public decimal? budget_5 { get; set; } + public decimal? total_budget { get; set; } + public string product { get; set; } + public string set_request_year { get; set; } + public Listoperating_expenses{ get; set; } + public string durable_articles_year { get; set; } + public string durable_articles_product { get; set; } + public List durable_articles_header { get; set; } + public string building_year { get; set; } + public string building_product { get; set; } + public List building_header_1 { get; set; } + public List building_header_2 { get; set; } + public string research_support_year { get; set; } + public string research_support_product { get; set; } + public Listresearch_support{ get; set; } + public string subsidy_service_year { get; set; } + public string subsidy_service_product { get; set; } + public List subsidy_service_header { get; set; } + public string subsidy_science_year { get; set; } + public List subsidy_science_header { get; set; } + public string subsidy_society_year { get; set; } + public List subsidy_society_header { get; set; } + public string subsidy_arts_culture_year { get; set; } + public List subsidy_arts_culture_header { get; set; } + public string thailand_year { get; set; } + public List thailand_header { get; set; } + public string subsidy_budget_project_year { get; set; } + public List subsidy_budget_project_header { get; set; } + public string integrated_plan_name { get; set; } + public string integrated_plan_year { get; set; } + public Listintegrated_plan{ get; set; } + public string strategic_plan_name { get; set; } + public string strategic_plan_year { get; set; } + //public List strategic_plan_header { get; set; } + public Liststrategic_plan{ get; set; } + } + + public class budget_summary_report_detail + { + public string product { get; set; } + public decimal? budget_1 { get; set; } + public decimal? budget_2 { get; set; } + public decimal? budget_3 { get; set; } + public decimal? budget_4 { get; set; } + public decimal? budget_5 { get; set; } + public decimal? total_budget { get; set; } + + } + + public class operating_expenses_details + { + public string rowno { get; set; } + public string list { get; set; } + public decimal? amount { get; set; } + public string remark { get; set; } + } + + public class durable_articles_headers + { + public string header_name { get; set; } + + public Listdurable_articles{ get; set; } + + } + + public class durable_articles_detail + { + public string list { get; set; } + public string unit { get; set; } + public string unit_amount { get; set; } + public decimal? unit_price { get; set; } + public decimal? total_amount { get; set; } + public decimal? budget { get; set; } + public string company { get; set; } + public string in_country { get; set; } + public string out_country { get; set; } + public string type_1 { get; set; } + public string type_2 { get; set; } + public string type_3 { get; set; } + public string remark { get; set; } + } + + public class building_headers1 + { + public string header_name { get; set; } + public Listbuilding_1{ get; set; } + + } + + public class building_headers1_detail + { + public string rowno { get; set; } + public string list { get; set; } + } + public class building_headers2 + { + public string header_name { get; set; } + public Listbuilding_2{ get; set; } + + } + + public class building_headers2_detail + { + public string list { get; set; } + public string unit { get; set; } + public string unit_amount { get; set; } + public decimal? unit_price { get; set; } + public decimal? total_amount { get; set; } + public string boq { get; set; } + public string pic { get; set; } + public string remark { get; set; } + + } + + public class subsidy_service_headers + { + public string header_name { get; set; } + public Listsubsidy_service{ get; set; } + public Listsubsidy_arts_culture{ get; set; } + public Listsubsidy_budget_project{ get; set; } + } + + public class subsidy_service_headers_detail + { + public string list { get; set; } + public decimal? amount_1 { get; set; } + public decimal? amount_2 { get; set; } + public decimal? amount_3 { get; set; } + public decimal? amount_4 { get; set; } + public decimal? amount_5 { get; set; } + public decimal? amount_6 { get; set; } + public decimal? amount_7 { get; set; } + public string remark { get; set; } + + } + + public class subsidy_science_headers + { + public string header_name { get; set; } + public Listsubsidy_science{ get; set; } + public Listsubsidy_society{ get; set; } + public Listthailand{ get; set; } + + } + + public class subsidy_science_headers_detail + { + public string list { get; set; } + public string unit { get; set; } + public decimal? unit_amount { get; set; } + public decimal? amount { get; set; } + public string remark { get; set; } + + } +} \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr-report.StaticWebAssets.xml b/bin/Debug/net5.0/rmutr-report.StaticWebAssets.xml new file mode 100644 index 0000000..7b21d22 --- /dev/null +++ b/bin/Debug/net5.0/rmutr-report.StaticWebAssets.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr-report.deps.json b/bin/Debug/net5.0/rmutr-report.deps.json index 49473ac..a92cfbf 100644 --- a/bin/Debug/net5.0/rmutr-report.deps.json +++ b/bin/Debug/net5.0/rmutr-report.deps.json @@ -9,7 +9,15 @@ "DEBUG", "NET", "NET5_0", - "NETCOREAPP" + "NETCOREAPP", + "NET5_0_OR_GREATER", + "NETCOREAPP1_0_OR_GREATER", + "NETCOREAPP1_1_OR_GREATER", + "NETCOREAPP2_0_OR_GREATER", + "NETCOREAPP2_1_OR_GREATER", + "NETCOREAPP2_2_OR_GREATER", + "NETCOREAPP3_0_OR_GREATER", + "NETCOREAPP3_1_OR_GREATER" ], "languageVersion": "9.0", "platform": "", @@ -856,16 +864,8 @@ "lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {} } }, - "System.Collections.Immutable/5.0.0": { - "compile": { - "lib/netstandard2.0/System.Collections.Immutable.dll": {} - } - }, - "System.ComponentModel.Annotations/5.0.0": { - "compile": { - "ref/netstandard2.1/System.ComponentModel.Annotations.dll": {} - } - }, + "System.Collections.Immutable/5.0.0": {}, + "System.ComponentModel.Annotations/5.0.0": {}, "System.Data.SqlClient/4.4.3": { "dependencies": { "Microsoft.Win32.Registry": "4.4.0", diff --git a/bin/Debug/net5.0/rmutr-report.dll b/bin/Debug/net5.0/rmutr-report.dll index eb3964d..964371f 100644 Binary files a/bin/Debug/net5.0/rmutr-report.dll and b/bin/Debug/net5.0/rmutr-report.dll differ diff --git a/bin/Debug/net5.0/rmutr-report.pdb b/bin/Debug/net5.0/rmutr-report.pdb index 4bf284f..88eb136 100644 Binary files a/bin/Debug/net5.0/rmutr-report.pdb and b/bin/Debug/net5.0/rmutr-report.pdb differ diff --git a/obj/Debug/net5.0/ref/rmutr-report.dll b/obj/Debug/net5.0/ref/rmutr-report.dll index 456c6ab..38527c2 100644 Binary files a/obj/Debug/net5.0/ref/rmutr-report.dll and b/obj/Debug/net5.0/ref/rmutr-report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr-report.dll b/obj/Debug/net5.0/refint/rmutr-report.dll new file mode 100644 index 0000000..38527c2 Binary files /dev/null and b/obj/Debug/net5.0/refint/rmutr-report.dll differ diff --git a/obj/Debug/net5.0/rmutr-report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr-report.AssemblyInfo.cs index f9c2842..646aa4c 100644 --- a/obj/Debug/net5.0/rmutr-report.AssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr-report.AssemblyInfo.cs @@ -1,6 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/obj/Debug/net5.0/rmutr-report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net5.0/rmutr-report.GeneratedMSBuildEditorConfig.editorconfig index 3872ac0..c04e72e 100644 --- a/obj/Debug/net5.0/rmutr-report.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net5.0/rmutr-report.GeneratedMSBuildEditorConfig.editorconfig @@ -3,6 +3,8 @@ build_property.TargetFramework = net5.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = true build_property.ProjectTypeGuids = -build_property.PublishSingleFile = -build_property.IncludeAllContentForSelfExtract = -build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = rmutr_report +build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\ diff --git a/obj/Debug/net5.0/rmutr-report.MvcApplicationPartsAssemblyInfo.cs b/obj/Debug/net5.0/rmutr-report.MvcApplicationPartsAssemblyInfo.cs index 9550db0..5dda6d3 100644 --- a/obj/Debug/net5.0/rmutr-report.MvcApplicationPartsAssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr-report.MvcApplicationPartsAssemblyInfo.cs @@ -1,6 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/obj/Debug/net5.0/rmutr-report.assets.cache b/obj/Debug/net5.0/rmutr-report.assets.cache index 0e9d77e..e18da6a 100644 Binary files a/obj/Debug/net5.0/rmutr-report.assets.cache and b/obj/Debug/net5.0/rmutr-report.assets.cache differ diff --git a/obj/Debug/net5.0/rmutr-report.csproj.AssemblyReference.cache b/obj/Debug/net5.0/rmutr-report.csproj.AssemblyReference.cache new file mode 100644 index 0000000..fea74ac Binary files /dev/null and b/obj/Debug/net5.0/rmutr-report.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/net5.0/rmutr-report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr-report.csproj.CoreCompileInputs.cache index 6c546d2..173d976 100644 --- a/obj/Debug/net5.0/rmutr-report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr-report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ec400d66489b588cbe62fa95c6dc2b633ae04c65 +953bf99eff308035779e1eaadb6c497ed13331bb diff --git a/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt b/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt index 0e69bdb..ef92ca5 100644 --- a/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt +++ b/obj/Debug/net5.0/rmutr-report.csproj.FileListAbsolute.txt @@ -274,3 +274,100 @@ C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr-report.xml C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr-report.pdb C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr-report.genruntimeconfig.cache C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr-report.csprojAssemblyReference.cache +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\appsettings.Development.json +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\appsettings.json +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\nuget.config +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.StaticWebAssets.xml +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.exe +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.deps.json +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.runtimeconfig.json +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.runtimeconfig.dev.json +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.pdb +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\rmutr-report.xml +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ClosedXML.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\DocumentFormat.OpenXml.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ExcelDataReader.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ExcelNumberFormat.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\FastReport.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Humanizer.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.CSharp.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.VisualBasic.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.EntityFrameworkCore.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.EntityFrameworkCore.Abstractions.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.EntityFrameworkCore.Design.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.EntityFrameworkCore.Relational.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.Extensions.DependencyInjection.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Microsoft.OpenApi.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\SeventyOneDev.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Annotations.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Swagger.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.SwaggerGen.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.SwaggerUI.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\System.Data.SqlClient.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\System.Diagnostics.DiagnosticSource.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\System.IO.Packaging.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.VisualBasic.resources.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\any\lib\netcoreapp3.0\FastReport.Compat.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\any\lib\netcoreapp3.0\FastReport.DataVisualization.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\win-arm64\native\sni.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\win-x64\native\sni.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\win-x86\native\sni.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\unix\lib\netstandard2.0\System.Data.SqlClient.dll +C:\Users\USER\Documents\rmutr_report\bin\Debug\net5.0\runtimes\win\lib\netstandard2.0\System.Data.SqlClient.dll +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.csproj.AssemblyReference.cache +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.AssemblyInfoInputs.cache +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.AssemblyInfo.cs +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.csproj.CoreCompileInputs.cache +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.MvcApplicationPartsAssemblyInfo.cs +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.MvcApplicationPartsAssemblyInfo.cache +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\scopedcss\bundle\rmutr-report.styles.css +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\rmutr-report.StaticWebAssets.Manifest.cache +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.RazorTargetAssemblyInfo.cache +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.csproj.CopyComplete +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.dll +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\refint\rmutr-report.dll +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.xml +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.pdb +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr-report.genruntimeconfig.cache +C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\ref\rmutr-report.dll diff --git a/obj/Debug/net5.0/rmutr-report.dll b/obj/Debug/net5.0/rmutr-report.dll index eb3964d..964371f 100644 Binary files a/obj/Debug/net5.0/rmutr-report.dll and b/obj/Debug/net5.0/rmutr-report.dll differ diff --git a/obj/Debug/net5.0/rmutr-report.genruntimeconfig.cache b/obj/Debug/net5.0/rmutr-report.genruntimeconfig.cache index cd61800..cb0391e 100644 --- a/obj/Debug/net5.0/rmutr-report.genruntimeconfig.cache +++ b/obj/Debug/net5.0/rmutr-report.genruntimeconfig.cache @@ -1 +1 @@ -25bc6a5eaedb2db86355a587eb0689ad31009d02 +1d39a36735b2d72fa7731390686302bd2991a9b8 diff --git a/obj/Debug/net5.0/rmutr-report.pdb b/obj/Debug/net5.0/rmutr-report.pdb index 4bf284f..88eb136 100644 Binary files a/obj/Debug/net5.0/rmutr-report.pdb and b/obj/Debug/net5.0/rmutr-report.pdb differ diff --git a/obj/project.assets.json b/obj/project.assets.json index f93e50e..be91294 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -2656,23 +2656,21 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj", + "projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj", "projectName": "rmutr-report", - "projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj", + "projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\", + "outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ - "C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config", + "C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config", "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], "originalTargetFrameworks": [ "net5.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, "https://api.nuget.org/v3/index.json": {}, "https://nuget.71dev.com/v3/index.json": {} }, @@ -2723,7 +2721,8 @@ "net47", "net471", "net472", - "net48" + "net48", + "net481" ], "assetTargetFallback": true, "warn": true, @@ -2735,7 +2734,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json" } } } diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index 67a0e50..6cc94f3 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "ld3XUBMt7hWviMWWbzS6pftfBZqMEnMMMSiHyQX4BvPR7kNwuvNc5rIul0W7R4TmrX07qw13XjoJTc3twojz7Q==", + "dgSpecHash": "O6hdQD8TLIEMSSrdxCHAsit1/meyTWfeR8dBAp9PaCWfNWii09E8hOh9mRYXjOIy2UQRQnWgcqC35WIi+4tZCg==", "success": true, - "projectFilePath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj", + "projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj", "expectedPackageFiles": [ "C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512", "C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512", diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index 41b4e33..b837c45 100644 --- a/obj/project.packagespec.json +++ b/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj","projectName":"rmutr-report","projectPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj","outputPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"ExcelDataReader":{"target":"Package","version":"[3.7.0-develop00310, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"SeventyOneDev.Utilities":{"target":"Package","version":"[1.10.12, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[5.6.3, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.0.7, )"}},"imports":["net461","net462","net47","net471","net472","net48"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\5.0.100\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj","projectName":"rmutr-report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"ExcelDataReader":{"target":"Package","version":"[3.7.0-develop00310, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"SeventyOneDev.Utilities":{"target":"Package","version":"[1.10.12, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[5.6.3, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.0.7, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 5fd870e..a273fdc 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16801886891459267 \ No newline at end of file +16818903208146125 \ No newline at end of file diff --git a/obj/rmutr-report.csproj.nuget.dgspec.json b/obj/rmutr-report.csproj.nuget.dgspec.json index f469239..9a6d522 100644 --- a/obj/rmutr-report.csproj.nuget.dgspec.json +++ b/obj/rmutr-report.csproj.nuget.dgspec.json @@ -1,29 +1,27 @@ { "format": 1, "restore": { - "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj": {} + "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj": {} }, "projects": { - "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj": { + "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj", + "projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj", "projectName": "rmutr-report", - "projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr-report.csproj", + "projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr-report.csproj", "packagesPath": "C:\\Users\\USER\\.nuget\\packages\\", - "outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\", + "outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ - "C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config", + "C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config", "C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config", "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], "originalTargetFrameworks": [ "net5.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, "https://api.nuget.org/v3/index.json": {}, "https://nuget.71dev.com/v3/index.json": {} }, @@ -74,7 +72,8 @@ "net47", "net471", "net472", - "net48" + "net48", + "net481" ], "assetTargetFallback": true, "warn": true, @@ -86,7 +85,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.100\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json" } } } diff --git a/obj/rmutr-report.csproj.nuget.g.props b/obj/rmutr-report.csproj.nuget.g.props index 1dba744..8ba7c32 100644 --- a/obj/rmutr-report.csproj.nuget.g.props +++ b/obj/rmutr-report.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\USER\.nuget\packages\ PackageReference - 6.4.0 + 6.5.0 diff --git a/wwwroot/reports/budget_summary_report.frx b/wwwroot/reports/budget_summary_report.frx new file mode 100644 index 0000000..378366f --- /dev/null +++ b/wwwroot/reports/budget_summary_report.frx @@ -0,0 +1,1348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +