diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index 073605f..2807892 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using DocumentFormat.OpenXml.Office2010.ExcelAc; namespace rmutr_report.Models { @@ -12,6 +13,7 @@ namespace rmutr_report.Models public List activity { get; set; } public string together_with { get; set; } public string strategic_plan { get; set; } //ข้อ 2 + public List project_activity_style { get; set; } //2. ลักษณะกิจกรรมโครงการ public string target_second { get; set; } public string subject_second { get; set; } public string country_reform_plan { get; set; } //ข้อ 3 @@ -85,6 +87,11 @@ namespace rmutr_report.Models public string activity { get; set; } } + public class project_activity_styles + { + public string style { get; set; } + + } public class sixth_data { public string objective{ get; set; } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 092151e..8cb4815 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 058c567..9a9298f 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/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 092151e..8cb4815 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 058c567..9a9298f 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 665663c..94b3406 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 @@ -1664,6 +1664,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\plant_genetic_conservation_project.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\plant_genetic_conservation_project_old.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\plant_genetic_conservation_project_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 0c60265..fadb254 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 @@ -1bc0222191ea46a217e835e2056c22982a61bd8d +48a23f2aa6cf7fe9461bd4b5281978a6a95e8cb8 diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 67de0bb..bf3886d 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -16981427631070175 \ No newline at end of file +16981437352365338 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index bf3886d..902563d 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16981437352365338 \ No newline at end of file +16982482975361382 \ No newline at end of file diff --git a/wwwroot/reports/plant_genetic_conservation_project.frx b/wwwroot/reports/plant_genetic_conservation_project.frx index 8ab6455..192457c 100644 --- a/wwwroot/reports/plant_genetic_conservation_project.frx +++ b/wwwroot/reports/plant_genetic_conservation_project.frx @@ -1,11 +1,14 @@  - + + + + @@ -24,11 +27,11 @@ - - + + @@ -296,53 +299,116 @@ - - + + - - + + + + + + + + + - - + + - - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + + + + + + + + - - - + + + @@ -378,7 +444,7 @@ - + @@ -397,7 +463,7 @@ - + @@ -411,7 +477,7 @@ - + @@ -466,7 +532,7 @@ - + @@ -776,30 +842,30 @@ - + + + - - - + - + - + - + @@ -816,8 +882,8 @@ - - + + @@ -871,7 +937,7 @@ - + @@ -900,15 +966,15 @@ - - + + - + @@ -927,7 +993,7 @@ - + @@ -941,7 +1007,7 @@ - + @@ -958,7 +1024,7 @@ - + @@ -976,7 +1042,7 @@ - + @@ -1014,10 +1080,5 @@ - - - - - diff --git a/wwwroot/reports/plant_genetic_conservation_project_old.frx b/wwwroot/reports/plant_genetic_conservation_project_old.frx new file mode 100644 index 0000000..570964d --- /dev/null +++ b/wwwroot/reports/plant_genetic_conservation_project_old.frx @@ -0,0 +1,1023 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx index b619e83..b138cf1 100644 --- a/wwwroot/reports/project_request_thailands.frx +++ b/wwwroot/reports/project_request_thailands.frx @@ -1,5 +1,5 @@  - + @@ -9,6 +9,9 @@ + + + @@ -303,43 +306,49 @@ + - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - + - + - + @@ -805,8 +814,8 @@ - - + +