diff --git a/Models/budget/expenditure_budget_proposal.cs b/Models/budget/expenditure_budget_proposal.cs index a225aa5..2fcc7c8 100644 --- a/Models/budget/expenditure_budget_proposal.cs +++ b/Models/budget/expenditure_budget_proposal.cs @@ -5,39 +5,31 @@ namespace rmutr_report.Models public class expenditure_budget_proposal { public string budget_year { get; set; } - // public decimal? budget_amount { get; set; } - // public decimal? total_amount_1 { get; set; } - // public decimal? total_amount_2 { get; set; } - public List group_header { get; set; } + public decimal? total_budget { get; set; } + public List projects { get; set; } } - public class group_headers - { - public string list_1 { get; set; } - public string list_2 { get; set; } - public string rowno { get; set; } - public string list_3 { get; set; } - public decimal? budget_amount { get; set; } - public decimal? total_amount_1 { get; set; } - public decimal? total_amount_2 { get; set; } - public List header { get; set; } - - } - - public class expenditure_budget_proposal_headers + public class proposal_initial_project { public string rowno { get; set; } - public string header { get; set; } - public decimal? budget_amount { get; set; } - public List data { get; set; } - + public string project_name_th { get; set; } + public decimal? total_budget { get; set; } + public List types { get; set; } } - public class expenditure_budget_proposal_headers2 + public class proposal_initial_type { - public string list { get; set; } + public string type_name { get; set; } + public decimal? total_budget { get; set; } + public List lists { get; set; } + + } + + public class proposal_initial_list + { + public string list_name { get; set; } public decimal? target_group_count { get; set; } public string target_group_unit { get; set; } public decimal? time_count { get; set; } @@ -46,15 +38,12 @@ namespace rmutr_report.Models public string budget_unit { get; set; } public decimal? quantity { get; set; } public string quantity_unit { get; set; } - public decimal? budget_amount { get; set; } - public List data2 { get; set; } - - + public decimal? total_budget { get; set; } + public List details { get; set; } } - - public class expenditure_budget_proposal_headers3 + public class proposal_initial_detail { - public string list { get; set; } + public string detail_name { get; set; } public decimal? target_group_count { get; set; } public string target_group_unit { get; set; } public decimal? time_count { get; set; } @@ -63,6 +52,6 @@ namespace rmutr_report.Models public string budget_unit { get; set; } public decimal? quantity { get; set; } public string quantity_unit { get; set; } - public decimal? budget_amount { get; set; } + public decimal? total_budget { get; set; } } } \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 10ae48b..2d82c17 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 78d8b09..a67728a 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 0869629..7532c94 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 73fff02..aaecfda 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/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 73c5738..3971710 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 index 73c5738..3971710 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache index fb9b446..480db4d 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -71848fb0924f784d3feacf0461e31c9a513aef6c +03718e4376c42f44a957d0167b63237ffcc1512b diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 10ae48b..2d82c17 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.pdb b/obj/Debug/net5.0/rmutr_report.pdb index 78d8b09..a67728a 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/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props index 860529b..3af2419 100644 --- a/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +++ b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props @@ -304,6 +304,38 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\compensation_head_major.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\compensation_ro_three.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\compensation_ro_three.frx)) + + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\contributions.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\contributions.frx)) + Package rmutr_report @@ -432,6 +464,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\expenditure_budget_proposal.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\expenditure_budget_proposal_old.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\expenditure_budget_proposal_old.frx)) + Package rmutr_report @@ -480,6 +528,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\faculty_council.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\house_rent_ro_three.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\house_rent_ro_three.frx)) + Package rmutr_report @@ -1120,6 +1184,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\other_committee_fee.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\other_compensation.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\other_compensation.frx)) + Package rmutr_report diff --git a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index db5ebbc..0ccbae9 100644 --- a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -c5f222989e07e2a5023c6ece5f0951ac96f2245c +9fdb36bdc21e43e3de61118b3e5b09a1b8490e9e diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 0869629..7532c94 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 73fff02..aaecfda 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props index 6be04d7..3af2419 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +++ b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props @@ -464,6 +464,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\expenditure_budget_proposal.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\expenditure_budget_proposal_old.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\expenditure_budget_proposal_old.frx)) + Package rmutr_report diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index c6747be..0ccbae9 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -645f8f19f3f7269784e8db7e853e5c6df8c222f9 +9fdb36bdc21e43e3de61118b3e5b09a1b8490e9e diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 1ba63a6..6aff16d 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -16992484278328616 \ No newline at end of file +16992659798608142 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 6aff16d..615251e 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16992659798608142 \ No newline at end of file +16993464901126723 \ No newline at end of file diff --git a/wwwroot/reports/expenditure_budget_proposal.frx b/wwwroot/reports/expenditure_budget_proposal.frx index 214921d..aade7ea 100644 --- a/wwwroot/reports/expenditure_budget_proposal.frx +++ b/wwwroot/reports/expenditure_budget_proposal.frx @@ -1,22 +1,40 @@  - + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + } +} + - - - - + + + - - - - - - - - - + + + + + + @@ -25,9 +43,9 @@ - - - + + + @@ -36,7 +54,7 @@ - + @@ -44,7 +62,7 @@ - + @@ -122,9 +140,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -137,46 +181,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -190,20 +296,20 @@ - - - - - - - - - - - + + + + + + + + + + + - + @@ -218,19 +324,19 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -245,16 +351,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/wwwroot/reports/expenditure_budget_proposal_old.frx b/wwwroot/reports/expenditure_budget_proposal_old.frx new file mode 100644 index 0000000..1e9b230 --- /dev/null +++ b/wwwroot/reports/expenditure_budget_proposal_old.frx @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +