bug fixed

2023-12-07 15:15:17 +07:00
parent 351d61ac8c
commit 54ecb6cf9c
21 changed files with 252 additions and 101 deletions
--- a/Controllers/PlantGeneticConservationProject.Controller.cs
+++ b/Controllers/PlantGeneticConservationProject.Controller.cs
@@ -105,7 +105,25 @@ namespace rmutr_report.Controllers
                        {
                            sixteenthData.activity_table = null;
                        }
+                        if (sixteenthData.total_target != null)
+                        {
+                            project.text1 = "ผลรวมกลุ่มเป้าหมาย  " + sixteenthData.total_target;
+                        }

+                        if (sixteenthData.total_target == null)
+                        {
+                            project.text1 = "ผลรวมกลุ่มเป้าหมาย  -";
+                        }
+
+                        if (sixteenthData.total_board != null)
+                        {
+                            project.text2 = "ผลรวมคณะกรรมการ  " + sixteenthData.total_board;
+                        }
+
+                        if (sixteenthData.total_board == null)
+                        {
+                            project.text2 = "ผลรวมคณะกรรมการ  -";
+                        }
                        t++;
                    }
                }
@@ -131,7 +149,7 @@ namespace rmutr_report.Controllers
                        foreach (var vv in v.seventeenths)
                        {
                            string na = "ครั้งที่ ";
-                            vv.the_time = na + vv.the_time;
+                            vv.the_time = na + "1";
                            //ti++;
                            foreach (var detail in vv.seventeenths2)
                            {
@@ -214,25 +232,7 @@ namespace rmutr_report.Controllers
                    }
                }

-                if (project.total_target != null)
-                {
-                    project.text1 = "ผลรวมกลุ่มเป้าหมาย  " + project.total_target;
-                }
-
-                if (project.total_target == null)
-                {
-                    project.text1 = "ผลรวมกลุ่มเป้าหมาย  -";
-                }
-
-                if (project.total_board != null)
-                {
-                    project.text2 = "ผลรวมคณะกรรมการ  " + project.total_board;
-                }
-
-                if (project.total_board == null)
-                {
-                    project.text2 = "ผลรวมคณะกรรมการ  -";
-                }
+              

                if (project.twenty_one != null)
                {
@@ -366,7 +366,34 @@ namespace rmutr_report.Controllers
                    t++;
                }
            }
+            if (project.twenty_fifth != null)
+            {
+                int t = 1;
+                foreach (var v in project.twenty_fifth)
+                {
+                    foreach (var acti in v.activity)
+                    {
+                        v.activitys = acti;
+                    }

+                    foreach (var locat in v.location)
+                    {
+                        v.locations = locat;
+                    }
+                    string a = "กิจกรรมที่ " + t + " ";
+                    if (v.activity_display_name != null)
+                    {
+                        v.activity_display_name = a + v.activity_display_name;
+                    }
+
+                    if (v.activity_display_name == null)
+                    {
+                        v.activity_display_name = null;
+                    }
+
+                    t++;
+                }
+            }
            var _project = new List<project_principle_rationale>() { project };

            Report report = new Report();
--- a/Controllers/project_principle_rationale.Controller.cs
+++ b/Controllers/project_principle_rationale.Controller.cs
@@ -46,6 +46,7 @@ namespace rmutr_report.Controllers
                        activity = ""
                    });
                }
+
                if (project.ninth != null)
                {
                    foreach (var vv in project.ninth)
@@ -73,7 +74,7 @@ namespace rmutr_report.Controllers
                if (project.sixteenths != null)
                {
                    int t = 1;
-                   
+
                    foreach (var sixteenthData in project.sixteenths)
                    {
                        string a = "กิจกรรมที่ " + t + " ";
@@ -95,6 +96,26 @@ namespace rmutr_report.Controllers
                            sixteenthData.activity_table = null;
                        }

+                        if (sixteenthData.total_target != null)
+                        {
+                            project.text1 = "ผลรวมกลุ่มเป้าหมาย  " + sixteenthData.total_target;
+                        }
+
+                        if (sixteenthData.total_target == null)
+                        {
+                            project.text1 = "ผลรวมกลุ่มเป้าหมาย  -";
+                        }
+
+                        if (sixteenthData.total_board != null)
+                        {
+                            project.text2 = "ผลรวมคณะกรรมการ  " + sixteenthData.total_board;
+                        }
+
+                        if (sixteenthData.total_board == null)
+                        {
+                            project.text2 = "ผลรวมคณะกรรมการ  -";
+                        }
+
                        t++;
                    }
                }
@@ -120,7 +141,7 @@ namespace rmutr_report.Controllers
                        foreach (var vv in v.seventeenths)
                        {
                            string na = "ครั้งที่ ";
-                            vv.the_time = na + vv.the_time;
+                            vv.the_time = na + "1";
                            //ti++;
                            foreach (var detail in vv.seventeenths2)
                            {
@@ -203,25 +224,6 @@ namespace rmutr_report.Controllers
                    }
                }

-                if (project.total_target != null)
-                {
-                    project.text1 = "ผลรวมกลุ่มเป้าหมาย  " + project.total_target;
-                }
-
-                if (project.total_target == null)
-                {
-                    project.text1 = "ผลรวมกลุ่มเป้าหมาย  -";
-                }
-
-                if (project.total_board != null)
-                {
-                    project.text2 = "ผลรวมคณะกรรมการ  " + project.total_board;
-                }
-
-                if (project.total_board == null)
-                {
-                    project.text2 = "ผลรวมคณะกรรมการ  -";
-                }

                if (project.twenty_one != null)
                {
@@ -349,7 +351,6 @@ namespace rmutr_report.Controllers

                if (project.twenty_four != null)
                {
-                    
                    int no = 1;
                    int t = 1;
                    foreach (var v in project.twenty_four)
@@ -358,13 +359,13 @@ namespace rmutr_report.Controllers
                        if (v.activity != null)
                        {
                            v.activity = aa + v.activity;
-                          
                        }

                        if (v.activity == null)
                        {
                            v.activity = null;
                        }
+
                        t++;
                        foreach (var dataDetail in v.twenty_fours)
                        {
@@ -410,9 +411,10 @@ namespace rmutr_report.Controllers

                if (project.twenty_fifth != null)
                {
+                    int t = 1;
                    foreach (var fifthData in project.twenty_fifth)
                    {
-                        foreach (var acti in fifthData.activity)
+                       foreach (var acti in fifthData.activity)
                        {
                            fifthData.activitys = acti;
                        }
@@ -421,6 +423,18 @@ namespace rmutr_report.Controllers
                        {
                            fifthData.locations = locat;
                        }
+                        string a = "กิจกรรมที่ " + t + " ";
+                        if (fifthData.activity_display_name != null)
+                        {
+                            fifthData.activity_display_name = a + fifthData.activity_display_name;
+                        }
+
+                        if (fifthData.activity_display_name == null)
+                        {
+                            fifthData.activity_display_name = null;
+                        }
+
+                        t++;
                    }
                }
            }
--- a/Controllers/project_request_thailand.Controller.cs
+++ b/Controllers/project_request_thailand.Controller.cs
@@ -125,6 +125,25 @@ namespace rmutr_report.Controllers
                        {
                            sixteenthData.activity_table = null;
                        }
+                        if (sixteenthData.total_target != null)
+                        {
+                            project.text1 = "ผลรวมกลุ่มเป้าหมาย  " + sixteenthData.total_target;
+                        }
+
+                        if (sixteenthData.total_target == null)
+                        {
+                            project.text1 = "ผลรวมกลุ่มเป้าหมาย  -";
+                        }
+
+                        if (sixteenthData.total_board != null)
+                        {
+                            project.text2 = "ผลรวมคณะกรรมการ  " + sixteenthData.total_board;
+                        }
+
+                        if (sixteenthData.total_board == null)
+                        {
+                            project.text2 = "ผลรวมคณะกรรมการ  -";
+                        }

                        t++;
                    }
@@ -151,7 +170,7 @@ namespace rmutr_report.Controllers
                        foreach (var vv in v.seventeenths)
                        {
                            string na = "ครั้งที่ ";
-                            vv.the_time = na + vv.the_time;
+                            vv.the_time = na + "1";
                            //ti++;
                            foreach (var detail in vv.seventeenths2)
                            {
@@ -234,26 +253,6 @@ namespace rmutr_report.Controllers
                    }
                }

-                if (project.total_target != null)
-                {
-                    project.text1 = "ผลรวมกลุ่มเป้าหมาย  " + project.total_target;
-                }
-
-                if (project.total_target == null)
-                {
-                    project.text1 = "ผลรวมกลุ่มเป้าหมาย  -";
-                }
-
-                if (project.total_board != null)
-                {
-                    project.text2 = "ผลรวมคณะกรรมการ  " + project.total_board;
-                }
-
-                if (project.total_board == null)
-                {
-                    project.text2 = "ผลรวมคณะกรรมการ  -";
-                }
-
                if (project.twenty_one != null)
                {
                    int t = 1;
@@ -367,6 +366,34 @@ namespace rmutr_report.Controllers
                    t++;
                }
            }
+            if (project.twenty_fifth != null)
+            {
+                int t = 1;
+                foreach (var v in project.twenty_fifth)
+                {
+                    foreach (var acti in v.activity)
+                    {
+                        v.activitys = acti;
+                    }
+
+                    foreach (var locat in v.location)
+                    {
+                        v.locations = locat;
+                    }
+                    string a = "กิจกรรมที่ " + t + " ";
+                    if (v.activity_display_name != null)
+                    {
+                        v.activity_display_name = a + v.activity_display_name;
+                    }
+
+                    if (v.activity_display_name == null)
+                    {
+                        v.activity_display_name = null;
+                    }
+
+                    t++;
+                }
+            }

            var _project = new List<project_principle_rationale>() { project };

--- a/Models/budget/project_principle_rationale.cs
+++ b/Models/budget/project_principle_rationale.cs
@@ -46,13 +46,13 @@ namespace rmutr_report.Models
        public decimal? land_building { get; set; } // ค่าที่ดินและสิ่งก่อสร้าง
        public List<fourteenth_data> fourteenth { get; set; }   //ข้อ 14
        public List<fifteenth_data> fifteenth { get; set; }   //ข้อ 15
-        public int? count_activity { get; set; }  //ข้อ 16
+        //public int? count_activity { get; set; }  //ข้อ 16
        public string text1 { get; set; }  //ข้อ 16
        public string text2 { get; set; }  //ข้อ 16
        public string operational_activitie { get; set; }//ข้อ 15 ง.5-3
        public string evaluation { get; set; }//ข้อ 16 ง.5-3
-        public int? total_target { get; set; }  //ข้อ 16 ผลรวมกลุ่มเป้าหมาย
-        public int? total_board { get; set; }  //ข้อ 16 ผลรวมคณะกรรมการ
+        // public int? total_target { get; set; }  //ข้อ 16 ผลรวมกลุ่มเป้าหมาย
+        // public int? total_board { get; set; }  //ข้อ 16 ผลรวมคณะกรรมการ
        public List<sixteenth_data> sixteenth { get; set; }   //ข้อ 16
        public List<sixteenth_data_detail> sixteenths { get; set; }  //ข้อ 16 detail ตาราง
       
@@ -155,6 +155,9 @@ namespace rmutr_report.Models
    {
        public string activity_table { get; set; }
        public string budget_unit_name_th { get; set; }
+        public int? total_target { get; set; }  //ข้อ 16 ผลรวมกลุ่มเป้าหมาย
+        public int? total_board { get; set; }  //ข้อ 16 ผลรวมคณะกรรมการ
+        public int? count_activity { get; set; }  //ข้อ 16 ผมรวมทั้งหมด
      
        public List<sixteenth_data_details> sixteenths2 { get; set; }
        public decimal? salaya_total { get; set; }
--- a/bin/Debug/net5.0/rmutr_report.dll
+++ b/bin/Debug/net5.0/rmutr_report.dll
--- a/bin/Debug/net5.0/rmutr_report.pdb
+++ b/bin/Debug/net5.0/rmutr_report.pdb
--- a/bin/Debug/netcoreapp3.1/rmutr_report.dll
+++ b/bin/Debug/netcoreapp3.1/rmutr_report.dll
--- a/bin/Debug/netcoreapp3.1/rmutr_report.pdb
+++ b/bin/Debug/netcoreapp3.1/rmutr_report.pdb
--- a/obj/Debug/net5.0/ref/rmutr_report.dll
+++ b/obj/Debug/net5.0/ref/rmutr_report.dll
--- a/obj/Debug/net5.0/refint/rmutr_report.dll
+++ b/obj/Debug/net5.0/refint/rmutr_report.dll
--- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-73f4f2af1cc3f6d90852199db8c00bcd253aa685
+01adf9e42f9a5cd189d448e7f6b6719026d916f6
--- a/obj/Debug/net5.0/rmutr_report.dll
+++ b/obj/Debug/net5.0/rmutr_report.dll
--- a/obj/Debug/net5.0/rmutr_report.pdb
+++ b/obj/Debug/net5.0/rmutr_report.pdb
--- 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
@@ -224,6 +224,22 @@
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours.frx))</OriginalItemSpec>
    </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\calculate_meeting_expenses.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\calculate_meeting_expenses.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\calculate_meeting_expenses.frx))</OriginalItemSpec>
+    </StaticWebAsset>
    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\car_insurance.frx))">
      <SourceType>Package</SourceType>
      <SourceId>rmutr_report</SourceId>
@@ -320,6 +336,22 @@
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\compensation_ro_three.frx))</OriginalItemSpec>
    </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\consultant_compensation.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\consultant_compensation.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\consultant_compensation.frx))</OriginalItemSpec>
+    </StaticWebAsset>
    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\contributions.frx))">
      <SourceType>Package</SourceType>
      <SourceId>rmutr_report</SourceId>
@@ -352,6 +384,22 @@
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction.frx))</OriginalItemSpec>
    </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction_wages.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\control_cost_construction_wages.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\control_cost_construction_wages.frx))</OriginalItemSpec>
+    </StaticWebAsset>
    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\data_line_academic.frx))">
      <SourceType>Package</SourceType>
      <SourceId>rmutr_report</SourceId>
@@ -800,6 +848,22 @@
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\kpi_performance_expenditure_budget.frx))</OriginalItemSpec>
    </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\land_rent.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\land_rent.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\land_rent.frx))</OriginalItemSpec>
+    </StaticWebAsset>
    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\Logo-RMUTR.png))">
      <SourceType>Package</SourceType>
      <SourceId>rmutr_report</SourceId>
@@ -2240,6 +2304,22 @@
      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\service_fee.frx))</OriginalItemSpec>
    </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\service_fee_ro_three.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\service_fee_ro_three.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\service_fee_ro_three.frx))</OriginalItemSpec>
+    </StaticWebAsset>
    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\statement_of_equipment.frx))">
      <SourceType>Package</SourceType>
      <SourceId>rmutr_report</SourceId>
--- a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
+++ b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
@@ -1 +1 @@
-8aa91144802a2244f9777f6b035a014da508a7f0
+dea208d6dcf8aff820dcbc6409c4fd9e41c662bb
--- a/obj/Debug/netcoreapp3.1/rmutr_report.dll
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.dll
--- a/obj/Debug/netcoreapp3.1/rmutr_report.pdb
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.pdb
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-17019334991213918
+17019368780973156
--- a/wwwroot/reports/plant_genetic_conservation_project.frx
+++ b/wwwroot/reports/plant_genetic_conservation_project.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="12/06/2023 16:24:25" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="12/07/2023 14:54:09" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
      <Column Name="budget_year_name_th" DataType="System.String"/>
@@ -69,9 +69,6 @@
      <BusinessObjectDataSource Name="fifteenth" DataType="null" Enabled="true">
        <Column Name="activity" DataType="System.String"/>
      </BusinessObjectDataSource>
-      <Column Name="count_activity" DataType="System.Int32"/>
-      <Column Name="total_target" DataType="System.Int32"/>
-      <Column Name="total_board" DataType="System.Int32"/>
      <Column Name="text1" DataType="System.String"/>
      <Column Name="text2" DataType="System.String"/>
      <BusinessObjectDataSource Name="sixteenth" DataType="null" Enabled="true">
@@ -80,6 +77,9 @@
      <BusinessObjectDataSource Name="sixteenths" DataType="null" Enabled="true">
        <Column Name="activity_table" DataType="System.String"/>
        <Column Name="budget_unit_name_th" DataType="System.String"/>
+        <Column Name="count_activity" DataType="System.Int32"/>
+        <Column Name="total_target" DataType="System.Int32"/>
+        <Column Name="total_board" DataType="System.Int32"/>
        <Column Name="salaya_total" DataType="System.Decimal"/>
        <Column Name="bophitphimuk_total" DataType="System.Decimal"/>
        <Column Name="pohchang_total" DataType="System.Decimal"/>
@@ -457,11 +457,11 @@
      <TextObject Name="Text30" Top="56.7" Width="756" Height="28.35" Text="16. สถานที่ดำเนินงาน" Font="TH SarabunPSK, 14pt, style=Bold"/>
      <TextObject Name="Text240" Width="756" Height="28.35" Text="แบบฟอร์มการเขียนโครงการอนุรักษ์พันธุกรรมพืชอันเนื่องมาจากพระราชดำริฯ" HorzAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
      <TextObject Name="Text241" Top="28.35" Width="756" Height="28.35" Text="สมเด็จพระเทพรัตนราชสุดาฯ สยามบรมราชกุมารี" HorzAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data18" Top="89.76" Width="756" Height="28.35" DataSource="seventeenth">
+      <DataBand Name="Data18" Top="90.11" Width="756" Height="28.35" DataSource="seventeenth">
        <TextObject Name="Text112" Left="9.45" Width="746.55" Height="28.35" Text="[project_principle_rationale.seventeenth.activity]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
-        <DataBand Name="Data19" Top="122.81" Width="756" Height="24.38" DataSource="seventeenths">
+        <DataBand Name="Data19" Top="123.53" Width="756" Height="24.38" DataSource="seventeenths">
          <TextObject Name="Text138" Left="9.45" Top="-3.97" Width="746.55" Height="28.35" Text="[project_principle_rationale.seventeenth.seventeenths.the_time]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
-          <DataBand Name="Data20" Top="151.9" Width="756" Height="58.21" DataSource="seventeenths2">
+          <DataBand Name="Data20" Top="152.97" Width="756" Height="58.21" DataSource="seventeenths2">
            <TextObject Name="Text114" Left="226.8" Top="1.51" Width="283.5" Height="28.35" Text="[project_principle_rationale.seventeenth.seventeenths.seventeenths2.area_province1]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
            <TextObject Name="Text115" Left="510.3" Top="1.51" Width="245.7" Height="28.35" Text="[project_principle_rationale.seventeenth.seventeenths.seventeenths2.location1]" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
            <TextObject Name="Text113" Left="9.45" Top="1.51" Width="217.35" Height="28.35" Text="[project_principle_rationale.seventeenth.seventeenths.seventeenths2.text1]" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
@@ -472,11 +472,11 @@
        </DataBand>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data21" Top="214.81" Width="756" Height="28.35">
+    <DataBand Name="Data21" Top="216.24" Width="756" Height="28.35">
      <TextObject Name="Text39" Width="756" Height="28.35" Text="17. ระยะเวลาในการดำเนินงาน" Font="TH SarabunPSK, 14pt, style=Bold"/>
-      <DataBand Name="Data6" Top="247.87" Width="756" Height="28.35" DataSource="eighteenth">
+      <DataBand Name="Data6" Top="249.66" Width="756" Height="28.35" DataSource="eighteenth">
        <TextObject Name="Text143" Width="756" Height="28.35" Text="[project_principle_rationale.eighteenth.activity]" Font="TH SarabunPSK, 14pt, style=Bold"/>
-        <DataBand Name="Data8" Top="280.93" Width="756" Height="113.4" DataSource="eighteenths">
+        <DataBand Name="Data8" Top="283.07" Width="756" Height="113.4" DataSource="eighteenths">
          <TextObject Name="Text118" Left="9.45" Top="28.35" Width="132.3" Height="28.35" Text="วันที่เริ่มจัดทำโครงการ" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
          <TextObject Name="Text119" Left="141.75" Top="28.35" Width="614.25" Height="28.35" Text="[project_principle_rationale.eighteenth.eighteenths.start_date]" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
          <TextObject Name="Text120" Left="9.45" Top="56.7" Width="132.3" Height="28.35" Text="วันที่เสร็จสิ้นโครงการ" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
@@ -486,9 +486,9 @@
        </DataBand>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data7" Top="399.03" Width="756" Height="28.35">
+    <DataBand Name="Data7" Top="401.53" Width="756" Height="28.35">
      <TextObject Name="Text216" Width="756" Height="28.35" Text="18. กลุ่มเป้าหมายผู้ร่วมโครงการ" Font="TH SarabunPSK, 14pt, style=Bold"/>
-      <DataBand Name="Data10" Top="432.09" Width="756" Height="170.1" DataSource="sixteenths">
+      <DataBand Name="Data10" Top="434.95" Width="756" Height="170.1" DataSource="sixteenths">
        <TableObject Name="Table1" Left="18.9" Top="141.75" Width="718.2" Height="28.35">
          <TableColumn Name="Column1" Width="151.2"/>
          <TableColumn Name="Column2" Width="132.3"/>
@@ -506,9 +506,9 @@
        <TextObject Name="Text137" Width="756" Height="28.35" Text="[project_principle_rationale.sixteenths.activity_table]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
        <TextObject Name="Text188" Top="56.7" Width="774.9" Height="28.35" Text="[project_principle_rationale.text1]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
        <TextObject Name="Text189" Top="85.05" Width="774.9" Height="28.35" Text="[project_principle_rationale.text2]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
-        <TextObject Name="Text361" Top="113.4" Width="774.9" Height="28.35" Text="ผลรวมทั้งหมด [project_principle_rationale.count_activity]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+        <TextObject Name="Text361" Top="113.4" Width="774.9" Height="28.35" Text="ผลรวมทั้งหมด [project_principle_rationale.sixteenths.count_activity]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
        <TextObject Name="Text362" Top="28.35" Width="774.9" Height="28.35" Text="หน่วยนับ [project_principle_rationale.sixteenths.budget_unit_name_th]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
-        <DataBand Name="Data11" Top="606.89" Width="756" Height="28.35" DataSource="sixteenths2">
+        <DataBand Name="Data11" Top="610.11" Width="756" Height="28.35" DataSource="sixteenths2">
          <TableObject Name="Table2" Left="18.9" Width="718.2" Height="28.35">
            <TableColumn Name="Column6" Width="151.2"/>
            <TableColumn Name="Column7" Width="132.3"/>
@@ -523,7 +523,7 @@
              <TableCell Name="Cell10" Border.Lines="All" Text="[project_principle_rationale.sixteenths.sixteenths2.klai_kangwon]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
            </TableRow>
          </TableObject>
-          <DataFooterBand Name="DataFooter1" Top="639.95" Width="756" Height="66.15">
+          <DataFooterBand Name="DataFooter1" Top="643.52" Width="756" Height="66.15">
            <TableObject Name="Table34" Left="18.9" Width="718.2" Height="28.35">
              <TableColumn Name="Column188" Width="151.2"/>
              <TableColumn Name="Column189" Width="132.3"/>
--- a/wwwroot/reports/project_principle_rationale_1.frx
+++ b/wwwroot/reports/project_principle_rationale_1.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="12/06/2023 16:25:13" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="12/07/2023 14:48:16" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
      <Column Name="budget_year_name_th" DataType="System.String"/>
@@ -59,9 +59,6 @@
      <BusinessObjectDataSource Name="fifteenth" DataType="null" Enabled="true">
        <Column Name="activity" DataType="System.String"/>
      </BusinessObjectDataSource>
-      <Column Name="count_activity" DataType="System.Int32"/>
-      <Column Name="total_target" DataType="System.Int32"/>
-      <Column Name="total_board" DataType="System.Int32"/>
      <Column Name="text1" DataType="System.String"/>
      <Column Name="text2" DataType="System.String"/>
      <BusinessObjectDataSource Name="sixteenth" DataType="null" Enabled="true">
@@ -70,6 +67,9 @@
      <BusinessObjectDataSource Name="sixteenths" DataType="null" Enabled="true">
        <Column Name="activity_table" DataType="System.String"/>
        <Column Name="budget_unit_name_th" DataType="System.String"/>
+        <Column Name="count_activity" DataType="System.Int32"/>
+        <Column Name="total_target" DataType="System.Int32"/>
+        <Column Name="total_board" DataType="System.Int32"/>
        <Column Name="salaya_total" DataType="System.Decimal"/>
        <Column Name="bophitphimuk_total" DataType="System.Decimal"/>
        <Column Name="pohchang_total" DataType="System.Decimal"/>
@@ -418,7 +418,7 @@
      <TextObject Name="Text109" Width="774.9" Height="28.35" Text="16. กลุ่มเป้าหมายผู้ร่วมโครงการ" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
      <TextObject Name="Text188" Top="56.7" Width="774.9" Height="28.35" Text="[project_principle_rationale.text1]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
      <TextObject Name="Text189" Top="85.05" Width="774.9" Height="28.35" Text="[project_principle_rationale.text2]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
-      <TextObject Name="Text361" Top="113.4" Width="774.9" Height="28.35" Text="ผลรวมทั้งหมด [project_principle_rationale.count_activity]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+      <TextObject Name="Text361" Top="113.4" Width="774.9" Height="28.35" Text="ผลรวมทั้งหมด [project_principle_rationale.sixteenths.count_activity]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
      <TextObject Name="Text362" Top="28.35" Width="774.9" Height="28.35" Text="หน่วยนับ [project_principle_rationale.sixteenths.budget_unit_name_th]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
      <DataBand Name="Data31" Top="2329.11" Width="774.9" Height="28.35" DataSource="sixteenth">
        <TextObject Name="Text136" Left="28.35" Width="746.55" Height="28.35" Text="[project_principle_rationale.sixteenth.activity]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
--- a/wwwroot/reports/project_request_thailands.frx
+++ b/wwwroot/reports/project_request_thailands.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="12/07/2023 14:12:32" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="12/07/2023 14:54:32" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
      <Column Name="budget_year_name_th" DataType="System.String"/>
@@ -69,9 +69,6 @@
      <BusinessObjectDataSource Name="fifteenth" DataType="null" Enabled="true">
        <Column Name="activity" DataType="System.String"/>
      </BusinessObjectDataSource>
-      <Column Name="count_activity" DataType="System.Int32"/>
-      <Column Name="total_target" DataType="System.Int32"/>
-      <Column Name="total_board" DataType="System.Int32"/>
      <Column Name="text1" DataType="System.String"/>
      <Column Name="text2" DataType="System.String"/>
      <BusinessObjectDataSource Name="sixteenth" DataType="null" Enabled="true">
@@ -80,6 +77,9 @@
      <BusinessObjectDataSource Name="sixteenths" DataType="null" Enabled="true">
        <Column Name="activity_table" DataType="System.String"/>
        <Column Name="budget_unit_name_th" DataType="System.String"/>
+        <Column Name="count_activity" DataType="System.Int32"/>
+        <Column Name="total_target" DataType="System.Int32"/>
+        <Column Name="total_board" DataType="System.Int32"/>
        <Column Name="salaya_total" DataType="System.Decimal"/>
        <Column Name="bophitphimuk_total" DataType="System.Decimal"/>
        <Column Name="pohchang_total" DataType="System.Decimal"/>
@@ -496,7 +496,7 @@
        </TableObject>
        <TextObject Name="Text188" Top="66.15" Width="774.9" Height="28.35" Text="[project_principle_rationale.text1]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
        <TextObject Name="Text189" Top="94.5" Width="774.9" Height="28.35" Text="[project_principle_rationale.text2]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
-        <TextObject Name="Text361" Top="122.85" Width="774.9" Height="28.35" Text="ผลรวมทั้งหมด [project_principle_rationale.count_activity]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+        <TextObject Name="Text361" Top="122.85" Width="774.9" Height="28.35" Text="ผลรวมทั้งหมด [project_principle_rationale.sixteenths.count_activity]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
        <TextObject Name="Text362" Top="37.8" Width="774.9" Height="28.35" Text="หน่วยนับ [project_principle_rationale.sixteenths.budget_unit_name_th]" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
        <DataBand Name="Data11" Top="584.22" Width="1247.4" Height="28.35" DataSource="sixteenths2">
          <TableObject Name="Table2" Left="18.9" Width="718.2" Height="28.35">
@@ -540,7 +540,7 @@
      <TextObject Name="Text255" Top="18.9" Width="1247.4" Height="28.35" Text="แบบฟอร์มการเขียนโครงการภายใต้ยุทธศาสตร์สำคัญของประเทศ" HorzAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
      <TextObject Name="Text256" Left="1124.55" Width="122.85" Height="18.9" Text="แบบ ง.5 - (2)" HorzAlign="Right" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
    </DataBand>
-    <DataBand Name="Data34" Top="80.66" Width="1247.4">
+    <DataBand Name="Data34" Top="80.66" Width="1247.4" DataSource="nineteenth">
      <DataBand Name="Data67" Top="85.73" Width="1247.4" Height="56.7" DataSource="nineteenth_data_header">
        <TextObject Name="Text124" Top="28.35" Width="330.75" Height="28.35" Text="งบประมาณทั้งหมดของกิจกรรม" Font="TH SarabunPSK, 14pt, style=Bold"/>
        <TextObject Name="Text145" Width="774.9" Height="28.35" Text="[project_principle_rationale.nineteenth.nineteenth_data_header.activity]" AutoShrink="FontSize" AutoShrinkMinSize="10" Font="TH SarabunPSK, 14pt, style=Bold"/>
@@ -1109,13 +1109,13 @@
      <TextObject Name="Text282" Top="28.35" Width="1247.4" Height="28.35" Text="แบบฟอร์มการเขียนโครงการภายใต้ยุทธศาสตร์สำคัญของประเทศ" HorzAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
      <TextObject Name="Text1" Top="56.7" Width="1058.4" Height="28.35" Text="27. ตารางกำหนดการดำเนินโครงการ" Font="TH SarabunPSK, 14pt, style=Bold"/>
    </PageHeaderBand>
-    <DataBand Name="Data30" Top="90.24" Width="1247.4">
-      <DataBand Name="Data31" Top="95.44" Width="1247.4" Height="141.75" DataSource="twenty_fifth">
+    <DataBand Name="Data30" Top="90.11" Width="1247.4">
+      <DataBand Name="Data31" Top="95.18" Width="1247.4" Height="141.75" DataSource="twenty_fifth">
        <TextObject Name="Text167" Width="1058.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity_display_name]" Font="TH SarabunPSK, 14pt, style=Bold"/>
        <TextObject Name="Text168" Top="28.35" Width="1058.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activitys]" HorzAlign="Center" Font="TH SarabunPSK, 14pt"/>
        <TextObject Name="Text169" Top="56.7" Width="1058.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.dates]" HorzAlign="Center" Font="TH SarabunPSK, 14pt"/>
        <TextObject Name="Text170" Top="85.05" Width="1058.4" Height="47.25" Text="[project_principle_rationale.twenty_fifth.locations]" HorzAlign="Center" Font="TH SarabunPSK, 14pt"/>
-        <DataBand Name="Data32" Top="285.38" Width="1247.4" Height="47.25" DataSource="twenty_fifth_data_detail">
+        <DataBand Name="Data32" Top="284.85" Width="1247.4" Height="47.25" DataSource="twenty_fifth_data_detail">
          <TableObject Name="Table25" Width="1058.4" Height="47.25">
            <TableColumn Name="Column105" Width="132.3"/>
            <TableColumn Name="Column106" Width="189"/>
@@ -1128,7 +1128,7 @@
              <TableCell Name="Cell158" Border.Lines="All" Text="[project_principle_rationale.twenty_fifth.twenty_fifth_data_detail.lecturer] ([project_principle_rationale.twenty_fifth.twenty_fifth_data_detail.in_out])" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
            </TableRow>
          </TableObject>
-          <DataHeaderBand Name="DataHeader2" Top="242.38" Width="1247.4" Height="37.8">
+          <DataHeaderBand Name="DataHeader2" Top="241.99" Width="1247.4" Height="37.8">
            <TableObject Name="Table26" Width="1058.4" Height="37.8">
              <TableColumn Name="Column109" Width="132.3"/>
              <TableColumn Name="Column110" Width="189"/>