diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index 0ace159..b3b4f21 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -303,10 +303,12 @@ namespace rmutr_report.Models { public string header_name1 { get; set; } public string header_name2 { get; set; } - //public string header_name3 { get; set; } + public string header_name3 { get; set; } + public string header_name4 { get; set; } public List nineteenths_expenses1 { get; set; } public List nineteenths_expenses2 { get; set; } - public List nineteenths_expenses3 { get; set; } + public List nineteenths_expenses3 { get; set; } + public List nineteenths_expenses4 { get; set; } } public class nineteenth2_data_details @@ -326,23 +328,23 @@ namespace rmutr_report.Models public decimal? total_amount { get; set; } } - public class nineteenth2_data_details3 - { + // public class nineteenth2_data_details3 + // { - public string header_name3 { get; set; } - public List nineteenths_expenses3_details { get; set; } + //public string header_name3 { get; set; } + //public List nineteenths_expenses3_details { get; set; } - } + //} - public class nineteenths_expenses3_detail - { - public string name { get; set; } - public decimal? amount { get; set; } - public decimal? potion { get; set; } - public decimal? count_person { get; set; } - public decimal? total_amount { get; set; } - } + // public class nineteenths_expenses3_detail + // { + // public string name { get; set; } + // public decimal? amount { get; set; } + // public decimal? potion { get; set; } + // public decimal? count_person { get; set; } + // public decimal? total_amount { get; set; } + // } public class nineteenth_data_detail3 { diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index da1fa74..e8babcb 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 40c4f5f..1414f45 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/font2021.3.0.list b/bin/Debug/netcoreapp3.1/font2021.3.0.list index ebc92da..2017386 100644 --- a/bin/Debug/netcoreapp3.1/font2021.3.0.list +++ b/bin/Debug/netcoreapp3.1/font2021.3.0.list @@ -492,3 +492,5 @@ Yu Gothic UI C:\WINDOWS\Fonts\YuGothM.ttc Yu Gothic C:\WINDOWS\Fonts\YuGothR.ttc 游ゴシック C:\WINDOWS\Fonts\YuGothR.ttc Yu Gothic UI Semilight C:\WINDOWS\Fonts\YuGothR.ttc +Microsoft Uighur-B C:\WINDOWS\Fonts\MSUIGHUB.TTF +Microsoft Uighur C:\WINDOWS\Fonts\MSUIGHUR.TTF diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 302e430..ee103ed 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 4606ac1..2bbb061 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 8b87946..691802b 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 8b87946..691802b 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.dll b/obj/Debug/net5.0/rmutr_report.dll index da1fa74..e8babcb 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 40c4f5f..1414f45 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/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 302e430..ee103ed 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 4606ac1..2bbb061 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/rider.project.restore.info b/obj/rider.project.restore.info index 37c3a68..5ad292e 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16938065948543652 \ No newline at end of file +16939829599595269 \ No newline at end of file diff --git a/wwwroot/reports/project_principle_rationale_1.frx b/wwwroot/reports/project_principle_rationale_1.frx index 09240bb..ec46f88 100644 --- a/wwwroot/reports/project_principle_rationale_1.frx +++ b/wwwroot/reports/project_principle_rationale_1.frx @@ -1,5 +1,5 @@  - + @@ -134,6 +134,8 @@ + + @@ -148,14 +150,18 @@ - - - - - - - - + + + + + + + + + + + + @@ -281,12 +287,12 @@ - - + + - + @@ -310,11 +316,11 @@ - + - + @@ -325,84 +331,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -418,7 +424,7 @@ - + @@ -433,7 +439,7 @@ - + @@ -453,13 +459,13 @@ - + - + - + - + @@ -470,11 +476,11 @@ - + - + - + @@ -483,11 +489,11 @@ - + - + @@ -495,14 +501,14 @@ - - + + - + - + @@ -526,7 +532,7 @@ - + @@ -541,14 +547,14 @@ - + - + - + @@ -572,7 +578,7 @@ - + @@ -589,9 +595,9 @@ - + - + @@ -613,7 +619,7 @@ - + @@ -630,9 +636,9 @@ - - - + + + @@ -654,7 +660,7 @@ - + @@ -662,16 +668,57 @@ - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -686,7 +733,7 @@ - +