From 7878d8ae9ecc8945969a700a3b9da9439b83563e Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Fri, 17 Mar 2023 19:07:48 +0700
Subject: [PATCH] update

---
 ...ntGeneticConservationProject.Controller.cs |  6 ++
 .../project_principle_rationale.Controller.cs |  6 ++
 .../project_request_thailand.Controller.cs    |  8 +--
 Models/budget/conservation_project.cs         |  8 ++-
 Models/budget/project_request_thai.cs         |  8 ++-
 .../plant_genetic_conservation_project.frx    | 64 +++++++++++--------
 wwwroot/reports/project_request_thailands.frx | 58 +++++++++--------
 7 files changed, 97 insertions(+), 61 deletions(-)

diff --git a/Controllers/PlantGeneticConservationProject.Controller.cs b/Controllers/PlantGeneticConservationProject.Controller.cs
index 7f6776a..03f27a3 100644
--- a/Controllers/PlantGeneticConservationProject.Controller.cs
+++ b/Controllers/PlantGeneticConservationProject.Controller.cs
@@ -84,6 +84,12 @@ namespace rmutr_report.Controllers
                     stream.Seek(0, SeekOrigin.Begin);
                     return File(stream, "text/csv");
                     break;
+                case "doc": case "docx":
+                    Word2007Export word = new Word2007Export();
+                    report.Export(word, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "appllication/vnd.ms-word");
+                    break;
             }
 
             return Ok();
diff --git a/Controllers/project_principle_rationale.Controller.cs b/Controllers/project_principle_rationale.Controller.cs
index 27ab1c8..e5288b4 100644
--- a/Controllers/project_principle_rationale.Controller.cs
+++ b/Controllers/project_principle_rationale.Controller.cs
@@ -180,6 +180,12 @@ namespace rmutr_report.Controllers
                     stream.Seek(0, SeekOrigin.Begin);
                     return File(stream, "text/csv");
                     break;
+                case "doc": case "docx":
+                    Word2007Export word = new Word2007Export();
+                    report.Export(word, stream);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "appllication/vnd.ms-word");
+                    break;
             }
 
             return Ok();
diff --git a/Controllers/project_request_thailand.Controller.cs b/Controllers/project_request_thailand.Controller.cs
index eae0335..0274c8b 100644
--- a/Controllers/project_request_thailand.Controller.cs
+++ b/Controllers/project_request_thailand.Controller.cs
@@ -77,11 +77,11 @@ namespace rmutr_report.Controllers
                     stream.Seek(0, SeekOrigin.Begin);
                     return File(stream, "multipart/related");
                     break;
-                case "csv":
-                    CSVExport csv = new CSVExport();
-                    report.Export(csv, stream);
+                case "doc": case "docx":
+                    Word2007Export word = new Word2007Export();
+                    report.Export(word, stream);
                     stream.Seek(0, SeekOrigin.Begin);
-                    return File(stream, "text/csv");
+                    return File(stream, "appllication/vnd.ms-word");
                     break;
             }
 
diff --git a/Models/budget/conservation_project.cs b/Models/budget/conservation_project.cs
index a186305..a313930 100644
--- a/Models/budget/conservation_project.cs
+++ b/Models/budget/conservation_project.cs
@@ -343,8 +343,12 @@ namespace rmutr_report.Models
       public string clause3 { get; set; }
       public string percentage1 { get; set; }
       public string percentage2 { get; set; }
-      public string target { get; set; }
-      public string results { get; set; }
+      public string target1 { get; set; }
+      public string target2 { get; set; }
+      public string target3 { get; set; }
+      public string results1 { get; set; }
+      public string results2 { get; set; }
+      public string results3 { get; set; }
       public string clause4 { get; set; }
       public decimal? expenses { get; set; }
   }
diff --git a/Models/budget/project_request_thai.cs b/Models/budget/project_request_thai.cs
index 097125c..c2ab759 100644
--- a/Models/budget/project_request_thai.cs
+++ b/Models/budget/project_request_thai.cs
@@ -94,8 +94,12 @@ namespace rmutr_report.Models
         public string clause3 { get; set; }
         public string percentage1 { get; set; }
         public string percentage2 { get; set; }
-        public string target { get; set; }
-        public string results { get; set; }
+        public string target1 { get; set; }
+        public string target2 { get; set; }
+        public string target3 { get; set; }
+        public string results1 { get; set; }
+        public string results2 { get; set; }
+        public string results3 { get; set; }
         public string clause4 { get; set; }
         public decimal? expenses { get; set; }  
     }
diff --git a/wwwroot/reports/plant_genetic_conservation_project.frx b/wwwroot/reports/plant_genetic_conservation_project.frx
index f595ac9..9ed3f65 100644
--- 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="03/17/2023 14:08:37" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="03/17/2023 19:06:25" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="conservation_project" ReferenceName="conservation_project" DataType="null" Enabled="true">
       <Column Name="faculty" DataType="System.String"/>
@@ -233,8 +233,12 @@
         <Column Name="clause3" DataType="System.String"/>
         <Column Name="percentage1" DataType="System.String"/>
         <Column Name="percentage2" DataType="System.String"/>
-        <Column Name="target" DataType="System.String"/>
-        <Column Name="results" DataType="System.String"/>
+        <Column Name="target1" DataType="System.String"/>
+        <Column Name="target2" DataType="System.String"/>
+        <Column Name="target3" DataType="System.String"/>
+        <Column Name="results1" DataType="System.String"/>
+        <Column Name="results2" DataType="System.String"/>
+        <Column Name="results3" DataType="System.String"/>
         <Column Name="clause4" DataType="System.String"/>
         <Column Name="expenses" DataType="System.Decimal"/>
       </BusinessObjectDataSource>
@@ -300,44 +304,44 @@
       <TextObject Name="Text207" Top="170.1" Width="708.75" Height="28.35" Text="8.ความสอดคล้องกับเป้าหมายการให้บริการหน่วยงาน" Font="TH Sarabun New, 14pt, style=Bold"/>
       <TextObject Name="Text208" Left="47.25" Top="198.45" Width="670.95" Height="28.35" Text="- เรื่อง [conservation_project.consistency_agency]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
       <TextObject Name="Text209" Top="226.8" Width="708.75" Height="28.35" Text="9.ผู้รับผิดชอบโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data5" Top="854.07" Width="756" Height="28.35" DataSource="ninth">
+      <DataBand Name="Data5" Top="854.07" Width="756" Height="198.45" DataSource="ninth">
         <TextObject Name="Text210" Width="718.2" Height="28.35" Text="[conservation_project.ninth.activity]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text211" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text2] [conservation_project.ninth.agency]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text211" Top="56.7" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text2] [conservation_project.ninth.agency]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text212" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text4] [conservation_project.ninth.telephone_number]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text212" Top="113.4" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text4] [conservation_project.ninth.telephone_number]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text213" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text6] [conservation_project.ninth.email]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text213" Top="170.1" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text6] [conservation_project.ninth.email]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text214" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text5] [conservation_project.ninth.mobile_number]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text214" Top="141.75" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text5] [conservation_project.ninth.mobile_number]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text238" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text1] [conservation_project.ninth.responsible_person]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text238" Top="28.35" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text1] [conservation_project.ninth.responsible_person]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text239" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text3] [conservation_project.ninth.area]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text239" Top="85.05" Width="718.2" Height="28.35" Text="[conservation_project.ninth.text3] [conservation_project.ninth.area]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
@@ -898,32 +902,36 @@
     <DataBand Name="Data22" Top="197.99" Width="756" Height="66.15">
       <TextObject Name="Text229" Top="9.45" Width="718.2" Height="28.35" Text="ส่วนที่ 2 ผลที่ได้รับ/ตัวชี้วัด/ผลลัพธ์/ผลกระทบที่เกิดขึ้น" HorzAlign="Center" Font="TH Sarabun New, 14pt, style=Bold, Underline"/>
       <TextObject Name="Text230" Top="37.8" Width="661.5" Height="28.35" Text="18.ผลที่ได้รับจากโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data23" Top="268.63" Width="756" Height="28.35" DataSource="eighteenth">
-        <TextObject Name="Text157" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.activity]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text158" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.text1] [conservation_project.eighteenth.count_unit] [conservation_project.eighteenth.nuai_nap]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text160" Left="47.25" Width="642.6" Height="28.35" Text="[conservation_project.eighteenth.text3] [conservation_project.eighteenth.count_training] [conservation_project.eighteenth.rueang]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text161" Left="47.25" Width="642.6" Height="28.35" Text="[conservation_project.eighteenth.text4] [conservation_project.eighteenth.count_knowledge] [conservation_project.eighteenth.khrang3]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text162" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.clause2]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text164" Left="47.25" Width="718.2" Height="28.35" Text="[conservation_project.eighteenth.text5] [conservation_project.eighteenth.project_start_date] [conservation_project.eighteenth.project_end_date]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text165" Left="47.25" Width="652.05" Height="28.35" Text="[conservation_project.eighteenth.text6] [conservation_project.eighteenth.percentage_finish]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text171" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.clause3]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text172" Left="47.25" Width="652.05" Height="28.35" Text="[conservation_project.eighteenth.text7] [conservation_project.eighteenth.percentage1]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text173" Left="47.25" Width="652.05" Height="28.35" Text="[conservation_project.eighteenth.text8] [conservation_project.eighteenth.percentage2]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text176" Left="47.25" Width="982.8" Height="28.35" Text="[conservation_project.eighteenth.target]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text159" Left="47.25" Width="642.6" Height="28.35" Text="[conservation_project.eighteenth.text2] [conservation_project.eighteenth.count_project] [conservation_project.eighteenth.khrang2]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text163" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.clause1] [conservation_project.eighteenth.count_quantitative] [conservation_project.eighteenth.khrang1]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text177" Left="47.25" Width="689.85" Height="28.35" Text="[conservation_project.eighteenth.clause4] [conservation_project.eighteenth.expenses] [conservation_project.eighteenth.bath]" Font="TH Sarabun New, 14pt">
+      <DataBand Name="Data23" Top="268.63" Width="756" Height="538.65" DataSource="eighteenth">
+        <TextObject Name="Text263" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.activity]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text275" Top="28.35" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.clause1] [conservation_project.eighteenth.count_quantitative] [conservation_project.eighteenth.khrang1]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text274" Left="47.25" Top="85.05" Width="642.6" Height="28.35" Text="[conservation_project.eighteenth.text2] [conservation_project.eighteenth.count_project] [conservation_project.eighteenth.khrang2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text273" Left="47.25" Top="170.1" Width="982.8" Height="28.35" Text="[conservation_project.eighteenth.target1]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text277" Left="47.25" Top="198.45" Width="982.8" Height="28.35" Text="[conservation_project.eighteenth.results1]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text271" Left="47.25" Top="396.9" Width="652.05" Height="28.35" Text="[conservation_project.eighteenth.text7] [conservation_project.eighteenth.percentage1]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text268" Left="47.25" Top="255.15" Width="718.2" Height="28.35" Text="[conservation_project.eighteenth.text5] [conservation_project.eighteenth.project_start_date] [conservation_project.eighteenth.project_end_date]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text266" Left="47.25" Top="141.75" Width="642.6" Height="28.35" Text="[conservation_project.eighteenth.text4] [conservation_project.eighteenth.count_knowledge] [conservation_project.eighteenth.khrang3]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text265" Left="47.25" Top="113.4" Width="642.6" Height="28.35" Text="[conservation_project.eighteenth.text3] [conservation_project.eighteenth.count_training] [conservation_project.eighteenth.rueang]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text264" Left="47.25" Top="56.7" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.text1][conservation_project.eighteenth.count_unit][conservation_project.eighteenth.nuai_nap]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text272" Left="47.25" Top="425.25" Width="652.05" Height="28.35" Text="[conservation_project.eighteenth.text8] [conservation_project.eighteenth.percentage2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text270" Top="368.55" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.clause3]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text269" Left="47.25" Top="283.5" Width="652.05" Height="28.35" Text="[conservation_project.eighteenth.text6] [conservation_project.eighteenth.project_end_date]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text267" Top="226.8" Width="708.75" Height="28.35" Text="[conservation_project.eighteenth.clause2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text285" Left="47.25" Top="311.85" Width="982.8" Height="28.35" Text="[conservation_project.eighteenth.target2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text286" Left="47.25" Top="340.2" Width="982.8" Height="28.35" Text="[conservation_project.eighteenth.results2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text287" Left="47.25" Top="453.6" Width="982.8" Height="28.35" Text="[conservation_project.eighteenth.target3]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text288" Left="47.25" Top="481.95" Width="982.8" Height="28.35" Text="[conservation_project.eighteenth.results3]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text276" Top="510.3" Width="689.85" Height="28.35" Text="[conservation_project.eighteenth.clause4] [conservation_project.eighteenth.expenses] [conservation_project.eighteenth.bath]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text196" Left="47.25" Width="982.8" Height="28.35" Text="[conservation_project.eighteenth.results]" Font="TH Sarabun New, 14pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data24" Top="301.48" Width="756" Height="28.35">
+    <DataBand Name="Data24" Top="811.78" Width="756" Height="28.35">
       <TextObject Name="Text231" Width="661.5" Height="28.35" Text="19.ประเภทของผลผลิตโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data25" Top="334.32" Width="756" Height="28.35" DataSource="nineteenth">
+      <DataBand Name="Data25" Top="844.62" Width="756" Height="28.35" DataSource="nineteenth">
         <TextObject Name="Text232" Width="699.3" Height="28.35" Text="- [conservation_project.nineteenth.type_project]" Font="TH Sarabun New, 14pt"/>
       </DataBand>
     </DataBand>
diff --git a/wwwroot/reports/project_request_thailands.frx b/wwwroot/reports/project_request_thailands.frx
index a89370c..1f5ace6 100644
--- 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="03/17/2023 17:55:25" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="03/17/2023 18:56:48" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="project_request_thai" ReferenceName="project_request_thai" DataType="null" Enabled="true">
       <Column Name="faculty" DataType="System.String"/>
@@ -226,8 +226,12 @@
         <Column Name="clause3" DataType="System.String"/>
         <Column Name="percentage1" DataType="System.String"/>
         <Column Name="percentage2" DataType="System.String"/>
-        <Column Name="target" DataType="System.String"/>
-        <Column Name="results" DataType="System.String"/>
+        <Column Name="target1" DataType="System.String"/>
+        <Column Name="target2" DataType="System.String"/>
+        <Column Name="target3" DataType="System.String"/>
+        <Column Name="results1" DataType="System.String"/>
+        <Column Name="results2" DataType="System.String"/>
+        <Column Name="results3" DataType="System.String"/>
         <Column Name="clause4" DataType="System.String"/>
         <Column Name="expenses" DataType="System.Decimal"/>
       </BusinessObjectDataSource>
@@ -292,44 +296,44 @@
       <TextObject Name="Text207" Top="170.1" Width="708.75" Height="28.35" Text="8.ความสอดคล้องกับเป้าหมายการให้บริการหน่วยงาน" Font="TH Sarabun New, 14pt, style=Bold"/>
       <TextObject Name="Text208" Left="47.25" Top="198.45" Width="670.95" Height="28.35" Text="- เรื่อง [project_request_thai.consistency_agency]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
       <TextObject Name="Text209" Top="226.8" Width="708.75" Height="28.35" Text="9.ผู้รับผิดชอบโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data5" Top="854.07" Width="756" Height="28.35" DataSource="ninth">
+      <DataBand Name="Data5" Top="854.07" Width="756" Height="198.45" DataSource="ninth">
         <TextObject Name="Text210" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.activity]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text211" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text2] [project_request_thai.ninth.agency]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text211" Top="56.7" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text2] [project_request_thai.ninth.agency]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text212" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text4] [project_request_thai.ninth.telephone_number]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text212" Top="113.4" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text4] [project_request_thai.ninth.telephone_number]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text213" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text6] [project_request_thai.ninth.email]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text213" Top="170.1" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text6] [project_request_thai.ninth.email]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text214" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text5] [project_request_thai.ninth.mobile_number]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text214" Top="141.75" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text5] [project_request_thai.ninth.mobile_number]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text238" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text1] [project_request_thai.ninth.responsible_person]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text239" Top="85.05" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text3] [project_request_thai.ninth.area]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text239" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text3] [project_request_thai.ninth.area]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text238" Top="28.35" Width="718.2" Height="28.35" Text="[project_request_thai.ninth.text1] [project_request_thai.ninth.responsible_person]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
@@ -877,27 +881,31 @@
     </DataBand>
     <DataBand Name="Data44" Top="386.53" Width="756" Height="37.8">
       <TextObject Name="Text262" Top="9.45" Width="661.5" Height="28.35" Text="16.ผลที่ได้รับจากโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data45" Top="428.82" Width="756" Height="28.35" DataSource="sixteen">
+      <DataBand Name="Data45" Top="428.82" Width="756" Height="538.65" DataSource="sixteen">
         <TextObject Name="Text263" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.activity]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text264" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.text1] [project_request_thai.sixteen.count_unit] [project_request_thai.sixteen.nuai_nap]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text265" Left="47.25" Width="642.6" Height="28.35" Text="[project_request_thai.sixteen.text3] [project_request_thai.sixteen.count_training] [project_request_thai.sixteen.rueang]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text266" Left="47.25" Width="642.6" Height="28.35" Text="[project_request_thai.sixteen.text4] [project_request_thai.sixteen.count_knowledge] [project_request_thai.sixteen.khrang3]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text267" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.clause2]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text268" Left="47.25" Width="718.2" Height="28.35" Text="[project_request_thai.sixteen.text5] [project_request_thai.sixteen.project_start_date] [project_request_thai.sixteen.project_end_date]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text269" Left="47.25" Width="652.05" Height="28.35" Text="[project_request_thai.sixteen.text6] [project_request_thai.sixteen.percentage_finish]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text270" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.clause3]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text271" Left="47.25" Width="652.05" Height="28.35" Text="[project_request_thai.sixteen.text7] [project_request_thai.sixteen.percentage1]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text272" Left="47.25" Width="652.05" Height="28.35" Text="[project_request_thai.sixteen.text8] [project_request_thai.sixteen.percentage2]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text273" Left="47.25" Width="982.8" Height="28.35" Text="[project_request_thai.sixteen.target]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text274" Left="47.25" Width="642.6" Height="28.35" Text="[project_request_thai.sixteen.text2] [project_request_thai.sixteen.count_project] [project_request_thai.sixteen.khrang2]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text275" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.clause1] [project_request_thai.sixteen.count_quantitative] [project_request_thai.sixteen.khrang1]" Font="TH Sarabun New, 14pt"/>
-        <TextObject Name="Text276" Left="47.25" Width="689.85" Height="28.35" Text="[project_request_thai.sixteen.clause4] [project_request_thai.sixteen.expenses] [project_request_thai.sixteen.bath]" Font="TH Sarabun New, 14pt">
+        <TextObject Name="Text275" Top="28.35" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.clause1] [project_request_thai.sixteen.count_quantitative] [project_request_thai.sixteen.khrang1]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text276" Top="510.3" Width="689.85" Height="28.35" Text="[project_request_thai.sixteen.clause4] [project_request_thai.sixteen.expenses] [project_request_thai.sixteen.bath]" Font="TH Sarabun New, 14pt">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text277" Left="47.25" Width="982.8" Height="28.35" Text="[project_request_thai.sixteen.results]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text274" Left="47.25" Top="85.05" Width="642.6" Height="28.35" Text="[project_request_thai.sixteen.text2] [project_request_thai.sixteen.count_project] [project_request_thai.sixteen.khrang2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text273" Left="47.25" Top="170.1" Width="982.8" Height="28.35" Text="[project_request_thai.sixteen.target1]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text277" Left="47.25" Top="198.45" Width="982.8" Height="28.35" Text="[project_request_thai.sixteen.results1]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text271" Left="47.25" Top="396.9" Width="652.05" Height="28.35" Text="[project_request_thai.sixteen.text7] [project_request_thai.sixteen.percentage1]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text268" Left="47.25" Top="255.15" Width="718.2" Height="28.35" Text="[project_request_thai.sixteen.text5] [project_request_thai.sixteen.project_start_date] [project_request_thai.sixteen.project_end_date]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text266" Left="47.25" Top="141.75" Width="642.6" Height="28.35" Text="[project_request_thai.sixteen.text4] [project_request_thai.sixteen.count_knowledge] [project_request_thai.sixteen.khrang3]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text265" Left="47.25" Top="113.4" Width="642.6" Height="28.35" Text="[project_request_thai.sixteen.text3] [project_request_thai.sixteen.count_training] [project_request_thai.sixteen.rueang]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text264" Left="47.25" Top="56.7" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.text1] [project_request_thai.sixteen.count_unit] [project_request_thai.sixteen.nuai_nap]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text272" Left="47.25" Top="425.25" Width="652.05" Height="28.35" Text="[project_request_thai.sixteen.text8] [project_request_thai.sixteen.percentage2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text270" Top="368.55" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.clause3]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text269" Left="47.25" Top="283.5" Width="652.05" Height="28.35" Text="[project_request_thai.sixteen.text6] [project_request_thai.sixteen.percentage_finish]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text267" Top="226.8" Width="708.75" Height="28.35" Text="[project_request_thai.sixteen.clause2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text285" Left="47.25" Top="311.85" Width="982.8" Height="28.35" Text="[project_request_thai.sixteen.target2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text286" Left="47.25" Top="340.2" Width="982.8" Height="28.35" Text="[project_request_thai.sixteen.results2]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text287" Left="47.25" Top="453.6" Width="982.8" Height="28.35" Text="[project_request_thai.sixteen.target3]" Font="TH Sarabun New, 14pt"/>
+        <TextObject Name="Text288" Left="47.25" Top="481.95" Width="982.8" Height="28.35" Text="[project_request_thai.sixteen.results3]" Font="TH Sarabun New, 14pt"/>
       </DataBand>
     </DataBand>
   </ReportPage>