diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs index fe833b4..f0e295a 100644 --- a/Controllers/project_principle_rationale.Controller.cs +++ b/Controllers/project_principle_rationale.Controller.cs @@ -174,6 +174,21 @@ namespace rmutr_report.Controllers } } + if (project.twenty_fifth != null) + { + foreach (var fifthData in project.twenty_fifth) + { + foreach (var acti in fifthData.activity) + { + fifthData.activitys = acti; + } + foreach (var locat in fifthData.location) + { + fifthData.locations = locat; + } + } + } + var _project = new List() { project }; Report report = new Report(); @@ -371,6 +386,20 @@ namespace rmutr_report.Controllers project.twenty_one = null; } } + if (project.twenty_fifth != null) + { + foreach (var fifthData in project.twenty_fifth) + { + foreach (var acti in fifthData.activity) + { + fifthData.activitys = acti; + } + foreach (var locat in fifthData.location) + { + fifthData.locations = locat; + } + } + } var _project = new List() { project }; diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs index c2e9d9b..d2c4011 100644 --- a/Models/budget/project_principle_rationale.cs +++ b/Models/budget/project_principle_rationale.cs @@ -501,10 +501,12 @@ namespace rmutr_report.Models public class twenty_fifth_data { - public string activity { get; set; } + public List activity { get; set; } + public string activitys { get; set; } public string activity_display_name { get; set; } public string dates { get; set; } - public string location { get; set; } + public List location { get; set; } + public string locations { get; set; } public List twenty_fifth_data_detail { get; set; } } diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 69c8195..578ac95 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 09f224f..687f85a 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 3659cf6..133599d 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 ac624e9..f8a748c 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 a90123e..6796697 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 a90123e..6796697 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 69c8195..578ac95 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 09f224f..687f85a 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 3659cf6..133599d 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 ac624e9..f8a748c 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 bedbff5..d52c201 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16933908491121003 \ No newline at end of file +16934730478373239 \ No newline at end of file diff --git a/wwwroot/reports/project_principle_rationale.frx b/wwwroot/reports/project_principle_rationale.frx index a51d610..401c85d 100644 --- a/wwwroot/reports/project_principle_rationale.frx +++ b/wwwroot/reports/project_principle_rationale.frx @@ -1,5 +1,5 @@  - + @@ -270,10 +270,10 @@ - + - + @@ -895,12 +895,12 @@ - + - - - - + + + + @@ -913,7 +913,7 @@ - + diff --git a/wwwroot/reports/project_principle_rationale_no_activity.frx b/wwwroot/reports/project_principle_rationale_no_activity.frx index ebf7903..5273f54 100644 --- a/wwwroot/reports/project_principle_rationale_no_activity.frx +++ b/wwwroot/reports/project_principle_rationale_no_activity.frx @@ -1,5 +1,5 @@  - + @@ -245,10 +245,10 @@ - + - + @@ -836,12 +836,12 @@ - + - - - - + + + + @@ -854,7 +854,7 @@ - +