diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index d9ef226..59291ab 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2774,6 +2774,13 @@ namespace rmutr_report.Controllers [FromBody] summary_subsidy_projects budget) { int row = 1; + string myStr = budget.budget_project_name_th; + string[] projectname = myStr.Split("ผลผลิต "); + foreach (string projectnames in projectname) + { + budget.budget_project_name_th2 = projectnames; + } + foreach (var detail in budget.data) { if (detail.topic_type == 3) @@ -2785,7 +2792,7 @@ namespace rmutr_report.Controllers { detail.row_no = null; } - } + } var summaryBudget = new List() { budget }; diff --git a/Models/budget/summary_subsidy_projects.cs b/Models/budget/summary_subsidy_projects.cs index 25c9a0c..2ee0881 100644 --- a/Models/budget/summary_subsidy_projects.cs +++ b/Models/budget/summary_subsidy_projects.cs @@ -7,6 +7,7 @@ namespace rmutr_report.Models public string budget_year { get; set; } public string date_range { get; set; } public string budget_project_name_th { get; set; } + public string budget_project_name_th2 { get; set; } public string agency_name_th { get; set; } public string education_level_and_year { get; set; } public string branch_name_th { get; set; } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 7b5b1ad..3921fc3 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 3b20caf..a6f1555 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 7b5b1ad..3921fc3 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 3b20caf..a6f1555 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/wwwroot/reports/summary_subsidy_projects.frx b/wwwroot/reports/summary_subsidy_projects.frx index 3d0dbc9..022da57 100644 --- a/wwwroot/reports/summary_subsidy_projects.frx +++ b/wwwroot/reports/summary_subsidy_projects.frx @@ -1,34 +1,11 @@  - - 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 - { - - - - } -} - + + @@ -100,7 +77,7 @@ namespace FastReport - +