bug fixed

2023-10-19 12:30:19 +07:00
parent 28f149b579
commit 232969d7cd
31 changed files with 6421 additions and 1575 deletions
--- 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/project.razor.json
+++ b/obj/Debug/net5.0/project.razor.json
--- 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.GeneratedMSBuildEditorConfig.editorconfig
+++ b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
@@ -5,6 +5,7 @@ build_property.UsingMicrosoftNETSdkWeb = true
 build_property.ProjectTypeGuids = 
 build_property.InvariantGlobalization = 
 build_property.PlatformNeutralAssembly = 
+build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = rmutr_report
 build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\
--- a/obj/Debug/net5.0/rmutr_report.assets.cache
+++ b/obj/Debug/net5.0/rmutr_report.assets.cache
--- a/obj/Debug/net5.0/rmutr_report.csproj.AssemblyReference.cache
+++ b/obj/Debug/net5.0/rmutr_report.csproj.AssemblyReference.cache
--- a/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt
+++ b/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt
@@ -172,3 +172,8 @@ C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.xml
 C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.pdb
 C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.genruntimeconfig.cache
 C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\ref\rmutr_report.dll
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\rmutr_report.StaticWebAssets.Pack.cache
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.build.rmutr_report.props
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildMultiTargeting.rmutr_report.props
+C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildTransitive.rmutr_report.props
--- 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.build.rmutr_report.props
+++ b/obj/Debug/net5.0/staticwebassets/msbuild.build.rmutr_report.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
+</Project>
--- a/obj/Debug/net5.0/staticwebassets/msbuild.buildMultiTargeting.rmutr_report.props
+++ b/obj/Debug/net5.0/staticwebassets/msbuild.buildMultiTargeting.rmutr_report.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\rmutr_report.props" />
+</Project>
--- a/obj/Debug/net5.0/staticwebassets/msbuild.buildTransitive.rmutr_report.props
+++ b/obj/Debug/net5.0/staticwebassets/msbuild.buildTransitive.rmutr_report.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\buildMultiTargeting\rmutr_report.props" />
+</Project>
--- 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
--- a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
+++ b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
@@ -0,0 +1 @@
+30ffb1b917a7940f2113a9893d63f0242ae2ce84
--- a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache
--- 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/project.assets.json
+++ b/obj/project.assets.json
@@ -1389,6 +1389,7 @@
      "path": "microsoft.win32.registry/4.4.0",
      "files": [
        ".nupkg.metadata",
+        ".signature.p7s",
        "LICENSE.TXT",
        "THIRD-PARTY-NOTICES.TXT",
        "lib/net46/Microsoft.Win32.Registry.dll",
@@ -1856,6 +1857,7 @@
      "path": "system.security.accesscontrol/4.4.0",
      "files": [
        ".nupkg.metadata",
+        ".signature.p7s",
        "LICENSE.TXT",
        "THIRD-PARTY-NOTICES.TXT",
        "lib/net46/System.Security.AccessControl.dll",
@@ -2010,6 +2012,7 @@
      "path": "system.security.principal.windows/4.4.0",
      "files": [
        ".nupkg.metadata",
+        ".signature.p7s",
        "LICENSE.TXT",
        "THIRD-PARTY-NOTICES.TXT",
        "lib/net46/System.Security.Principal.Windows.dll",
@@ -2219,7 +2222,7 @@
            "privateAssets": "all"
          }
        },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
      }
    }
  }
--- a/obj/project.nuget.cache
+++ b/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
  "version": 2,
-  "dgSpecHash": "TgdSlhcNLrmoGcymKBKtBNUewM9z9QdY0FESfevGdFzEBUl5TotP+ysyCZqFpczcvGDJdBKPRCtfqngiN8LZRQ==",
+  "dgSpecHash": "NaImI9gFxI0nTH5asNNWxixoRKMe4FQEuqAkFpRfxpplhDDwgygsD5A4O/A+g1DCi00G8bAbgPBMUpmKczF09g==",
  "success": true,
  "projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
  "expectedPackageFiles": [
--- a/obj/project.packagespec.json
+++ b/obj/project.packagespec.json
@@ -1 +1 @@
-"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}}
+"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"}}
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -0,0 +1 @@
+16976911551155902
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-16970086664973301
+16976933854287525
--- a/obj/rmutr_report.csproj.nuget.dgspec.json
+++ b/obj/rmutr_report.csproj.nuget.dgspec.json
@@ -77,7 +77,7 @@
              "privateAssets": "all"
            }
          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
        }
      }
    }
--- a/obj/rmutr_report.csproj.nuget.g.props
+++ b/obj/rmutr_report.csproj.nuget.g.props
@@ -7,7 +7,7 @@
    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\USER\.nuget\packages\</NuGetPackageFolders>
    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
    <SourceRoot Include="C:\Users\USER\.nuget\packages\" />
--- a/wwwroot/reports/durable_articles_three.frx
+++ b/wwwroot/reports/durable_articles_three.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="06/27/2023 13:40:41" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="10/19/2023 12:23:54" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="durable_articles_three" ReferenceName="durable_articles_three" DataType="null" Enabled="true">
      <Column Name="budget_year" DataType="System.String"/>
@@ -135,8 +135,8 @@
        </TableRow>
      </TableObject>
    </ReportTitleBand>
-    <DataBand Name="Data1" Top="206.96" Width="831.6">
-      <DataBand Name="Data2" Top="215.47" Width="831.6" Height="47.25" DataSource="data">
+    <DataBand Name="Data1" Top="203.93" Width="831.6">
+      <DataBand Name="Data2" Top="209.41" Width="831.6" Height="47.25" DataSource="data">
        <TableObject Name="Table2" Width="831.6" Height="47.25">
          <TableColumn Name="Column5" Width="406.35"/>
          <TableColumn Name="Column6" Width="132.3"/>
@@ -149,7 +149,7 @@
            <TableCell Name="Cell8" Border.Lines="All" Text="[durable_articles_three.data.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" Font="TH SarabunPSK, 14pt"/>
          </TableRow>
        </TableObject>
-        <DataFooterBand Name="DataFooter1" Top="271.23" Width="831.6" Height="28.35">
+        <DataFooterBand Name="DataFooter1" Top="262.14" Width="831.6" Height="28.35">
          <TableObject Name="Table3" Width="831.6" Height="28.35">
            <TableColumn Name="Column9" Width="406.35"/>
            <TableColumn Name="Column10" Width="132.3"/>
@@ -165,7 +165,7 @@
        </DataFooterBand>
      </DataBand>
    </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="308.09" Width="831.6" Height="623.7">
+    <ReportSummaryBand Name="ReportSummary1" Top="295.97" Width="831.6" Height="623.7">
      <TextObject Name="Text65" Top="340.2" Width="510.3" Height="28.35" Text="6. เหตุผลความจำเป็น" Font="TH SarabunPSK, 16pt, style=Bold"/>
      <TextObject Name="Text66" Top="368.55" Width="831.6" Height="255.15" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.necessity_reason]" AutoWidth="true" WordWrap="false" Font="TH SarabunPSK, 16pt"/>
      <TextObject Name="Text64" Left="28.35" Top="311.85" Width="831.6" Height="28.35" Text="[durable_articles_three.strategy]" Font="TH SarabunPSK, 16pt"/>
@@ -177,7 +177,7 @@
      <TextObject Name="Text58" Left="28.35" Top="94.5" Width="614.25" Height="28.35" Text="[durable_articles_three.durable_from]" Font="TH SarabunPSK, 16pt"/>
      <TextObject Name="Text57" Top="66.15" Width="292.95" Height="28.35" Text="ครุภัณฑ์สั่งจาก" Font="TH SarabunPSK, 16pt, style=Bold, Underline"/>
      <TextObject Name="Text55" Left="28.35" Top="37.8" Width="217.35" Height="28.35" Text="[durable_articles_three.durable_type]" Font="TH SarabunPSK, 16pt"/>
-      <TextObject Name="Text56" Left="245.7" Top="37.8" Width="576.45" Height="28.35" Text="ระบุชื่ออาคาร [durable_articles_three.building_name] ห้อง [durable_articles_three.room_name]" Font="TH SarabunPSK, 16pt"/>
+      <TextObject Name="Text56" Left="245.7" Top="37.8" Width="576.45" Height="28.35" Text="[durable_articles_three.building_name] [durable_articles_three.room_name]" Font="TH SarabunPSK, 16pt"/>
      <TextObject Name="Text54" Top="9.45" Width="292.95" Height="28.35" Text="2. ประเภทครุภัณฑ์" Font="TH SarabunPSK, 16pt, style=Bold"/>
    </ReportSummaryBand>
  </ReportPage>
@@ -210,12 +210,14 @@
    </DataBand>
  </ReportPage>
  <ReportPage Name="Page3" PaperWidth="260" LeftMargin="25" TopMargin="20" RightMargin="15" Watermark.Font="Arial, 60pt">
-    <DataBand Name="Data7" Width="831.6" Height="170.1" DataSource="durable_articles_three">
+    <PageHeaderBand Name="PageHeader1" Width="831.6" Height="28.35">
      <TextObject Name="Text1" Width="812.7" Height="28.35" Text="9. อธิบายหลักการทำงานของครุภัณฑ์พร้อมรูปภาพประกอบ" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <TextObject Name="Text100" Left="28.35" Top="28.35" Width="812.7" Height="28.35" Text="คำอธิบายรวม" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <TextObject Name="Text101" Left="28.35" Top="56.7" Width="812.7" Height="85.05" Text="[durable_articles_three.description_included]" Font="TH SarabunPSK, 16pt"/>
-      <TextObject Name="Text102" Left="28.35" Top="141.75" Width="812.7" Height="28.35" Text="คำอธิบายเพิ่มเติม" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data9" Top="174.59" Width="831.6" Height="311.85" DataSource="descript_more">
+    </PageHeaderBand>
+    <DataBand Name="Data7" Top="33.83" Width="831.6" Height="141.75">
+      <TextObject Name="Text100" Left="28.35" Width="812.7" Height="28.35" Text="คำอธิบายรวม" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <TextObject Name="Text101" Left="28.35" Top="28.35" Width="812.7" Height="85.05" Text="[durable_articles_three.description_included]" Font="TH SarabunPSK, 16pt"/>
+      <TextObject Name="Text102" Left="28.35" Top="113.4" Width="812.7" Height="28.35" Text="คำอธิบายเพิ่มเติม" Font="TH SarabunPSK, 16pt, style=Bold"/>
+      <DataBand Name="Data9" Top="181.06" Width="831.6" Height="311.85" DataSource="descript_more">
        <PictureObject Name="Picture1" Top="37.8" Width="831.6" Height="179.55" Anchor="Top, Bottom, Left, Right" CanGrow="true" CanShrink="true" DataColumn="durable_articles_three.descript_more.image_description"/>
        <TextObject Name="Text103" Left="28.35" Top="226.8" Width="831.6" Height="85.05" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.descript_more.remark]" AutoWidth="true" WordWrap="false" Font="TH SarabunPSK, 16pt"/>
        <TextObject Name="Text134" Left="28.35" Width="831.6" Height="37.8" Text="[durable_articles_three.descript_more.descript]" Font="TH SarabunPSK, 16pt"/>
--- 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="10/06/2023 10:59:47" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="10/19/2023 12:22:52" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
      <Column Name="faculty" DataType="System.String"/>
@@ -297,35 +297,37 @@
    </BusinessObjectDataSource>
  </Dictionary>
  <ReportPage Name="Page1" PaperWidth="220" Watermark.Font="Arial, 60pt">
-    <DataBand Name="Data35" Width="756" Height="198.45">
-      <TextObject Name="Text45" Top="170.1" Width="708.75" Height="28.35" Text="1. ชื่อโครงการ : [project_principle_rationale.project]" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <TextObject Name="Text44" Left="103.95" Top="113.4" Width="604.8" Height="28.35" Text="[project_principle_rationale.faculty]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-      <TextObject Name="Text41" Top="113.4" Width="103.95" Height="28.35" Text="หน่วยงาน/คณะ :" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <TextObject Name="Text42" Left="56.7" Top="85.05" Width="652.05" Height="28.35" Text="[project_principle_rationale.project]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-      <TextObject Name="Text40" Top="56.7" Width="708.75" Height="28.35" Text="ผลผลิต : [project_principle_rationale.product]" Font="TH Sarabun New, 16pt, style=Bold"/>
+    <PageHeaderBand Name="PageHeader1" Width="756" Height="198.45">
      <TextObject Name="Text197" Width="756" Height="28.35" Text="แบบฟอร์มการเขียนโครงการอนุรักษ์พันธุกรรมพืชอันเนื่องมาจากพระราชดำริฯ" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
      <TextObject Name="Text198" Top="28.35" Width="756" Height="28.35" Text="สมเด็จพระเทพรัตนราชสุดาฯ สยามบรมราชกุมารี" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text40" Top="56.7" Width="708.75" Height="28.35" Text="ผลผลิต : [project_principle_rationale.product]" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text42" Left="56.7" Top="85.05" Width="652.05" Height="28.35" Text="[project_principle_rationale.project]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+      <TextObject Name="Text44" Left="103.95" Top="113.4" Width="604.8" Height="28.35" Text="[project_principle_rationale.faculty]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+      <TextObject Name="Text41" Top="113.4" Width="103.95" Height="28.35" Text="หน่วยงาน/คณะ :" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text199" Top="141.75" Width="708.75" Height="28.35" Text="ส่วนที่ 1 สถานภาพโครงการ" HorzAlign="Center" Font="TH Sarabun New, 14pt, style=Bold, Underline"/>
-      <DataBand Name="Data1" Top="203.93" Width="756" Height="28.35" DataSource="activity">
+      <TextObject Name="Text45" Top="170.1" Width="708.75" Height="28.35" Text="1. ชื่อโครงการ : [project_principle_rationale.project]" Font="TH Sarabun New, 14pt, style=Bold"/>
+    </PageHeaderBand>
+    <DataBand Name="Data35" Top="203.93" Width="756">
+      <DataBand Name="Data1" Top="209.41" Width="756" Height="28.35" DataSource="activity">
        <TextObject Name="Text200" Width="708.75" Height="28.35" Text="[project_principle_rationale.activity.activity]" Font="TH Sarabun New, 14pt"/>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data2" Top="237.76" Width="756" Height="179.55">
+    <DataBand Name="Data2" Top="243.24" Width="756" Height="179.55">
      <TextObject Name="Text201" Width="708.75" Height="28.35" Text="2.ลักษณะกิจกรรมโครงการ [project_principle_rationale.together_with]" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text202" Top="28.35" Width="708.75" Height="122.85" Text="3.หลักการและเหตุผล : [project_principle_rationale.principles_reasons]" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text203" Top="151.2" Width="708.75" Height="28.35" Text="4.วัตถุประสงค์" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data3" Top="422.79" Width="756" Height="28.35" DataSource="sixth">
-        <TextObject Name="Text73" Width="756" Height="28.35" Text="[project_principle_rationale.sixth.objective]" Font="TH Sarabun New, 14pt"/>
+      <DataBand Name="Data3" Top="428.27" Width="756" Height="189" DataSource="sixth">
+        <TextObject Name="Text73" Width="756" Height="189" Text="[project_principle_rationale.sixth.objective]" AutoShrink="FontSize" AutoShrinkMinSize="9" Font="TH Sarabun New, 14pt"/>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data43" Top="456.62" Width="756" Height="37.8">
+    <DataBand Name="Data43" Top="622.75" Width="756" Height="37.8">
      <TextObject Name="Text204" Width="708.75" Height="28.35" Text="5.ความสอดคล้องกับยุทธศาสตร์การพัฒนามหาวิทยาลัย" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data44" Top="499.9" Width="756" Height="94.5" DataSource="eighth">
+      <DataBand Name="Data44" Top="666.03" Width="756" Height="94.5" DataSource="eighth">
        <TextObject Name="Text139" Left="18.9" Top="47.25" Width="708.75" Height="47.25" Text="[project_principle_rationale.eighth.measure]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" Font="TH Sarabun New, 14pt"/>
        <TextObject Name="Text84" Left="18.9" Width="708.75" Height="47.25" Text="[project_principle_rationale.eighth.strategic_issues]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH Sarabun New, 14pt"/>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data4" Top="599.88" Width="756" Height="170.1">
+    <DataBand Name="Data4" Top="766.01" Width="756" Height="170.1">
      <TextObject Name="Text98" Width="708.75" Height="28.35" Text="6.ความสอดคล้องกับยุทธศาสตร์ คณะ/หน่วยงานที่เสนอขอ" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text99" Left="18.9" Top="28.35" Width="718.2" Height="28.35" Text="ประเด็นยุทธศาสตร์ที่ [project_principle_rationale.strategic_issues_thirteenth]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
      <TextObject Name="Text100" Left="18.9" Top="56.7" Width="718.2" Height="28.35" Text="เรื่อง [project_principle_rationale.subject_thirteenth]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
@@ -333,13 +335,13 @@
      <TextObject Name="Text205" Top="113.4" Width="708.75" Height="28.35" Text="7.ความสอดคล้องกับเป้าหมายการให้บริการกระทรวง" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text95" Left="18.9" Top="141.75" Width="718.2" Height="28.35" Text="[project_principle_rationale.subject_eleventh]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
    </DataBand>
-    <DataBand Name="Data45" Top="775.46" Width="756" Height="56.7">
+    <DataBand Name="Data45" Top="941.59" Width="756" Height="56.7">
      <TextObject Name="Text207" Width="708.75" Height="28.35" Text="8.ความสอดคล้องกับเป้าหมายการให้บริการหน่วยงาน" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text97" Left="18.9" Top="28.35" Width="718.2" Height="28.35" Text="[project_principle_rationale.subject_twelfth]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
    </DataBand>
-    <DataBand Name="Data50" Top="837.64" Width="756" Height="37.8">
+    <DataBand Name="Data50" Top="1003.77" Width="756" Height="37.8">
      <TextObject Name="Text209" Width="708.75" Height="28.35" Text="9.ผู้รับผิดชอบโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data51" Top="880.92" Width="756" Height="141.75" DataSource="twenty_fours">
+      <DataBand Name="Data51" Top="1047.04" Width="756" Height="141.75" DataSource="twenty_fours">
        <TextObject Name="Text289" Left="18.9" Top="113.4" Width="737.1" Height="28.35" Text="[project_principle_rationale.twenty_four.twenty_fours.text6]" Font="TH Sarabun New, 14pt">
          <Formats>
            <NumberFormat/>
@@ -924,20 +926,20 @@
      </TableObject>
      <TextObject Name="Text248" Width="756" Height="28.35" Text="แบบฟอร์มการเขียนโครงการอนุรักษ์พันธุกรรมพืชอันเนื่องมาจากพระราชดำริฯ" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
      <TextObject Name="Text249" Top="28.35" Width="756" Height="28.35" Text="สมเด็จพระเทพรัตนราชสุดาฯ สยามบรมราชกุมารี" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data27" Top="147.23" Width="756" Height="28.35" DataSource="eighteenth_thai">
-        <TableObject Name="Table38" Left="56.7" Width="642.6" Height="28.35">
+      <DataBand Name="Data27" Top="147.23" Width="756" Height="56.7" DataSource="eighteenth_thai">
+        <TableObject Name="Table38" Left="56.7" Width="642.6" Height="56.7">
          <TableColumn Name="Column178" Width="359.1"/>
          <TableColumn Name="Column179" Width="151.2"/>
          <TableColumn Name="Column180" Width="132.3"/>
-          <TableRow Name="Row48" Height="28.35">
-            <TableCell Name="Cell228" Text="[project_principle_rationale.eighteenth_thai.target]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell229" Text="[project_principle_rationale.eighteenth_thai.positive]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell230" Text="[project_principle_rationale.eighteenth_thai.negative]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+          <TableRow Name="Row48" Height="56.7">
+            <TableCell Name="Cell228" Text="[project_principle_rationale.eighteenth_thai.target]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell229" Text="[project_principle_rationale.eighteenth_thai.positive]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell230" Text="[project_principle_rationale.eighteenth_thai.negative]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
          </TableRow>
        </TableObject>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data28" Top="181.06" Width="756" Height="85.05">
+    <DataBand Name="Data28" Top="209.41" Width="756" Height="85.05">
      <TextObject Name="Text234" Width="661.5" Height="28.35" Text="21.ผลกระทบที่เกิดจากโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TableObject Name="Table22" Left="56.7" Top="28.35" Width="642.6" Height="56.7">
        <TableColumn Name="Column98" Width="359.1"/>
@@ -955,31 +957,33 @@
          <TableCell Name="Cell151" Border.Lines="Top" Fill.Color="Gainsboro" Text="เชิงลบ (Negative)" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
        </TableRow>
      </TableObject>
-      <DataBand Name="Data29" Top="271.59" Width="756" Height="28.35" DataSource="nineteenth_thai">
-        <TableObject Name="Table41" Left="56.7" Width="642.6" Height="28.35">
+      <DataBand Name="Data29" Top="299.94" Width="756" Height="75.6" DataSource="nineteenth_thai">
+        <TableObject Name="Table41" Left="56.7" Width="642.6" Height="75.6">
          <TableColumn Name="Column185" Width="359.1"/>
          <TableColumn Name="Column186" Width="151.2"/>
          <TableColumn Name="Column187" Width="132.3"/>
-          <TableRow Name="Row51" Height="28.35">
-            <TableCell Name="Cell235" Text="[project_principle_rationale.nineteenth_thai.target]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell236" Text="[project_principle_rationale.nineteenth_thai.positive]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell237" Text="[project_principle_rationale.nineteenth_thai.negative]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+          <TableRow Name="Row51" Height="75.6">
+            <TableCell Name="Cell235" Text="[project_principle_rationale.nineteenth_thai.target]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell236" Text="[project_principle_rationale.nineteenth_thai.positive]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell237" Text="[project_principle_rationale.nineteenth_thai.negative]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
          </TableRow>
        </TableObject>
      </DataBand>
    </DataBand>
  </ReportPage>
  <ReportPage Name="Page7" PaperWidth="220" Watermark.Font="Arial, 60pt">
-    <DataBand Name="Data30" Width="756" Height="85.05">
-      <TextObject Name="Text1" Top="56.7" Width="661.5" Height="28.35" Text="22. ตารางกำหนดการดำเนินโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
+    <PageHeaderBand Name="PageHeader2" Width="756" Height="85.05">
      <TextObject Name="Text250" Width="756" Height="28.35" Text="แบบฟอร์มการเขียนโครงการอนุรักษ์พันธุกรรมพืชอันเนื่องมาจากพระราชดำริฯ" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
      <TextObject Name="Text251" Top="28.35" Width="756" Height="28.35" Text="สมเด็จพระเทพรัตนราชสุดาฯ สยามบรมราชกุมารี" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data31" Top="90.53" Width="756" Height="141.75" DataSource="twenty_fifth">
+      <TextObject Name="Text1" Top="56.7" Width="661.5" Height="28.35" Text="22. ตารางกำหนดการดำเนินโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
+    </PageHeaderBand>
+    <DataBand Name="Data30" Top="90.53" Width="756">
+      <DataBand Name="Data31" Top="96.01" Width="756" Height="141.75" DataSource="twenty_fifth">
        <TextObject Name="Text167" Left="28.35" Width="661.5" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity_display_name]" Font="TH Sarabun New, 14pt, style=Bold"/>
        <TextObject Name="Text168" Left="28.35" Top="28.35" Width="661.5" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activitys]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
        <TextObject Name="Text169" Left="28.35" Top="56.7" Width="661.5" Height="28.35" Text="[project_principle_rationale.twenty_fifth.dates]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
        <TextObject Name="Text170" Left="28.35" Top="85.05" Width="661.5" Height="47.25" Text="[project_principle_rationale.twenty_fifth.locations]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
-        <DataBand Name="Data32" Top="281.04" Width="756" Height="47.25" DataSource="twenty_fifth_data_detail">
+        <DataBand Name="Data32" Top="286.52" Width="756" Height="47.25" DataSource="twenty_fifth_data_detail">
          <TableObject Name="Table25" Width="756" Height="47.25">
            <TableColumn Name="Column105" Width="132.3"/>
            <TableColumn Name="Column106" Width="189"/>
@@ -992,7 +996,7 @@
              <TableCell Name="Cell158" Border.Lines="All" Text="[project_principle_rationale.twenty_fifth.twenty_fifth_data_detail.lecturer]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
            </TableRow>
          </TableObject>
-          <DataHeaderBand Name="DataHeader2" Top="237.76" Width="756" Height="37.8">
+          <DataHeaderBand Name="DataHeader2" Top="243.24" Width="756" Height="37.8">
            <TableObject Name="Table26" Width="756" Height="37.8">
              <TableColumn Name="Column109" Width="132.3"/>
              <TableColumn Name="Column110" Width="189"/>
@@ -1009,10 +1013,10 @@
        </DataBand>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data33" Top="333.77" Width="756" Height="66.15">
-      <TextObject Name="Text235" Top="9.45" Width="661.5" Height="28.35" Text="23. แนบรายละเอียดการดำเนินโครงการกิจกรรมย่อย" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <TextObject Name="Text236" Left="28.35" Top="37.8" Width="151.2" Height="28.35" Text="กรุณาคลิกลิงค์เพื่อเปิดไฟล์" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <TextObject Name="Text237" Left="179.55" Top="37.8" Width="576.45" Height="28.35" Hyperlink.Expression="[project_principle_rationale.url_file3]" Text="[project_principle_rationale.url_file3]" Font="TH Sarabun New, 14pt"/>
-    </DataBand>
+    <ReportSummaryBand Name="ReportSummary1" Top="339.25" Width="756" Height="56.7">
+      <TextObject Name="Text236" Left="28.35" Top="28.35" Width="151.2" Height="28.35" Text="กรุณาคลิกลิงค์เพื่อเปิดไฟล์" Font="TH Sarabun New, 14pt, style=Bold"/>
+      <TextObject Name="Text235" Width="661.5" Height="28.35" Text="23. แนบรายละเอียดการดำเนินโครงการกิจกรรมย่อย" Font="TH Sarabun New, 14pt, style=Bold"/>
+      <TextObject Name="Text237" Left="179.55" Top="28.35" Width="576.45" Height="28.35" Hyperlink.Expression="[project_principle_rationale.url_file3]" Text="[project_principle_rationale.url_file3]" Font="TH Sarabun New, 14pt"/>
+    </ReportSummaryBand>
  </ReportPage>
 </Report>
--- 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="10/10/2023 12:59:05" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="10/19/2023 12:23:01" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
      <Column Name="faculty" DataType="System.String"/>
@@ -295,34 +295,36 @@
    </BusinessObjectDataSource>
  </Dictionary>
  <ReportPage Name="Page1" PaperWidth="220" PaperHeight="300" Watermark.Font="Arial, 60pt">
-    <DataBand Name="Data35" Width="756" Height="198.45">
-      <TextObject Name="Text45" Top="170.1" Width="708.75" Height="28.35" Text="1. ชื่อโครงการ : [project_principle_rationale.project]" Font="TH Sarabun New, 14pt, style=Bold"/>
+    <PageHeaderBand Name="PageHeader1" Width="756" Height="170.1">
+      <TextObject Name="Text252" Left="652.05" Width="103.95" Height="18.9" Text="แบบ ง.5 - (2)" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text197" Top="9.45" Width="756" Height="28.35" Text="แบบฟอร์มการเขียนโครงการภายใต้ยุทธศาสตร์สำคัญของประเทศ" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text40" Top="56.7" Width="708.75" Height="28.35" Text="ผลผลิต : โครงการพัฒนาและผลิตกำลังคนของประเทศเพื่อรองรับนโยบาย Thailand 4.0" Font="TH Sarabun New, 16pt, style=Bold"/>
      <TextObject Name="Text44" Left="103.95" Top="85.05" Width="604.8" Height="28.35" Text="[project_principle_rationale.faculty]" Font="TH Sarabun New, 14pt"/>
      <TextObject Name="Text41" Top="85.05" Width="103.95" Height="28.35" Text="หน่วยงาน/คณะ :" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <TextObject Name="Text40" Top="56.7" Width="708.75" Height="28.35" Text="ผลผลิต : โครงการพัฒนาและผลิตกำลังคนของประเทศเพื่อรองรับนโยบาย Thailand 4.0" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <TextObject Name="Text197" Top="9.45" Width="756" Height="28.35" Text="แบบฟอร์มการเขียนโครงการภายใต้ยุทธศาสตร์สำคัญของประเทศ" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
      <TextObject Name="Text199" Top="113.4" Width="708.75" Height="28.35" Text="ส่วนที่ 1 สถานภาพโครงการ" HorzAlign="Center" Font="TH Sarabun New, 14pt, style=Bold, Underline"/>
-      <TextObject Name="Text252" Left="652.05" Width="103.95" Height="18.9" Text="แบบ ง.5 - (2)" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data1" Top="203.93" Width="756" Height="28.35" DataSource="activity">
+      <TextObject Name="Text45" Top="141.75" Width="708.75" Height="28.35" Text="1. ชื่อโครงการ : [project_principle_rationale.project]" Font="TH Sarabun New, 14pt, style=Bold"/>
+    </PageHeaderBand>
+    <DataBand Name="Data35" Top="175.58" Width="756">
+      <DataBand Name="Data1" Top="181.06" Width="756" Height="28.35" DataSource="activity">
        <TextObject Name="Text200" Width="708.75" Height="28.35" Text="[project_principle_rationale.activity.activity]" Font="TH Sarabun New, 14pt"/>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data2" Top="237.76" Width="756" Height="179.55">
+    <DataBand Name="Data2" Top="214.89" Width="756" Height="179.55">
      <TextObject Name="Text201" Width="708.75" Height="28.35" Text="2.ลักษณะกิจกรรมโครงการ [project_principle_rationale.together_with]" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text202" Top="28.35" Width="708.75" Height="122.85" Text="3.หลักการและเหตุผล : [project_principle_rationale.principles_reasons]" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text203" Top="151.2" Width="708.75" Height="28.35" Text="4.วัตถุประสงค์" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data9" Top="422.79" Width="756" Height="28.35" DataSource="sixth">
-        <TextObject Name="Text73" Width="756" Height="28.35" Text="[project_principle_rationale.sixth.objective]" Font="TH Sarabun New, 14pt"/>
+      <DataBand Name="Data9" Top="399.92" Width="756" Height="151.2" DataSource="sixth">
+        <TextObject Name="Text73" Width="756" Height="151.2" Text="[project_principle_rationale.sixth.objective]" AutoShrink="FontSize" AutoShrinkMinSize="9" Font="TH Sarabun New, 14pt"/>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data4" Top="456.62" Width="756" Height="28.35">
+    <DataBand Name="Data4" Top="556.6" Width="756" Height="28.35">
      <TextObject Name="Text204" Width="708.75" Height="28.35" Text="5.ความสอดคล้องกับยุทธศาสตร์การพัฒนามหาวิทยาลัย" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data26" Top="490.45" Width="756" Height="94.5" DataSource="eighth">
+      <DataBand Name="Data26" Top="590.43" Width="756" Height="94.5" DataSource="eighth">
        <TextObject Name="Text139" Left="18.9" Top="47.25" Width="708.75" Height="47.25" Text="[project_principle_rationale.eighth.measure]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" Font="TH Sarabun New, 14pt"/>
        <TextObject Name="Text84" Left="18.9" Width="708.75" Height="47.25" Text="[project_principle_rationale.eighth.strategic_issues]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH Sarabun New, 14pt"/>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data3" Top="590.43" Width="756" Height="179.55">
+    <DataBand Name="Data3" Top="690.41" Width="756" Height="179.55">
      <TextObject Name="Text205" Top="122.85" Width="708.75" Height="28.35" Text="7.ความสอดคล้องกับเป้าหมายการให้บริการกระทรวง" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text98" Width="708.75" Height="28.35" Text="6.ความสอดคล้องกับยุทธศาสตร์ คณะ/หน่วยงานที่เสนอขอ" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text99" Left="18.9" Top="37.8" Width="718.2" Height="28.35" Text="ประเด็นยุทธศาสตร์ที่ [project_principle_rationale.strategic_issues_thirteenth]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
@@ -330,13 +332,13 @@
      <TextObject Name="Text101" Left="18.9" Top="94.5" Width="718.2" Height="28.35" Text="กลยุทธ์ [project_principle_rationale.strategy_thirteenth]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
      <TextObject Name="Text95" Left="18.9" Top="151.2" Width="718.2" Height="28.35" Text="[project_principle_rationale.subject_eleventh]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
    </DataBand>
-    <DataBand Name="Data27" Top="775.46" Width="756" Height="56.7">
+    <DataBand Name="Data27" Top="875.44" Width="756" Height="56.7">
      <TextObject Name="Text207" Width="708.75" Height="28.35" Text="8.ความสอดคล้องกับเป้าหมายการให้บริการหน่วยงาน" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TextObject Name="Text97" Left="18.9" Top="28.35" Width="718.2" Height="28.35" Text="[project_principle_rationale.subject_twelfth]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
    </DataBand>
-    <DataBand Name="Data29" Top="837.64" Width="756" Height="28.35" DataSource="twenty_four">
+    <DataBand Name="Data29" Top="937.61" Width="756" Height="28.35" DataSource="twenty_four">
      <TextObject Name="Text209" Width="708.75" Height="28.35" Text="9.ผู้รับผิดชอบโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <DataBand Name="Data49" Top="871.47" Width="756" Height="141.75" DataSource="twenty_fours">
+      <DataBand Name="Data49" Top="971.44" Width="756" Height="141.75" DataSource="twenty_fours">
        <TextObject Name="Text289" Left="18.9" Top="113.4" Width="737.1" Height="28.35" Text="[project_principle_rationale.twenty_four.twenty_fours.text6]" Font="TH Sarabun New, 14pt">
          <Formats>
            <NumberFormat/>
@@ -909,20 +911,20 @@
          <TableCell Name="Cell227" Border.Lines="Top" Text="เชิงลบ (Negative)" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
        </TableRow>
      </TableObject>
-      <DataBand Name="Data16" Top="205.44" Width="756" Height="28.35" DataSource="eighteenth_thai">
-        <TableObject Name="Table38" Left="56.7" Width="642.6" Height="28.35">
+      <DataBand Name="Data16" Top="205.44" Width="756" Height="56.7" DataSource="eighteenth_thai">
+        <TableObject Name="Table38" Left="56.7" Width="642.6" Height="56.7">
          <TableColumn Name="Column178" Width="359.1"/>
          <TableColumn Name="Column179" Width="151.2"/>
          <TableColumn Name="Column180" Width="132.3"/>
-          <TableRow Name="Row48" Height="28.35">
-            <TableCell Name="Cell228" Text="[project_principle_rationale.eighteenth_thai.target]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell229" Text="[project_principle_rationale.eighteenth_thai.positive]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell230" Text="[project_principle_rationale.eighteenth_thai.negative]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+          <TableRow Name="Row48" Height="56.7">
+            <TableCell Name="Cell228" Text="[project_principle_rationale.eighteenth_thai.target]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell229" Text="[project_principle_rationale.eighteenth_thai.positive]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell230" Text="[project_principle_rationale.eighteenth_thai.negative]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
          </TableRow>
        </TableObject>
      </DataBand>
    </DataBand>
-    <DataBand Name="Data22" Top="239.27" Width="756" Height="85.05">
+    <DataBand Name="Data22" Top="267.62" Width="756" Height="85.05">
      <TextObject Name="Text281" Width="661.5" Height="28.35" Text="19.ผลกระทบที่เกิดจากโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
      <TableObject Name="Table39" Left="56.7" Top="28.35" Width="642.6" Height="56.7">
        <TableColumn Name="Column181" Width="359.1"/>
@@ -940,31 +942,33 @@
          <TableCell Name="Cell234" Border.Lines="Top" Fill.Color="Gainsboro" Text="เชิงลบ (Negative)" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
        </TableRow>
      </TableObject>
-      <DataBand Name="Data23" Top="329.8" Width="756" Height="28.35" DataSource="nineteenth_thai">
-        <TableObject Name="Table41" Left="56.7" Width="642.6" Height="28.35">
+      <DataBand Name="Data23" Top="358.15" Width="756" Height="56.7" DataSource="nineteenth_thai">
+        <TableObject Name="Table41" Left="56.7" Width="642.6" Height="56.7">
          <TableColumn Name="Column185" Width="359.1"/>
          <TableColumn Name="Column186" Width="151.2"/>
          <TableColumn Name="Column187" Width="132.3"/>
-          <TableRow Name="Row51" Height="28.35">
-            <TableCell Name="Cell235" Text="[project_principle_rationale.nineteenth_thai.target]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell236" Text="[project_principle_rationale.nineteenth_thai.positive]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell237" Text="[project_principle_rationale.nineteenth_thai.negative]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+          <TableRow Name="Row51" Height="56.7">
+            <TableCell Name="Cell235" Text="[project_principle_rationale.nineteenth_thai.target]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell236" Text="[project_principle_rationale.nineteenth_thai.positive]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell237" Text="[project_principle_rationale.nineteenth_thai.negative]" AutoShrink="FontSize" AutoShrinkMinSize="10" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
          </TableRow>
        </TableObject>
      </DataBand>
    </DataBand>
  </ReportPage>
  <ReportPage Name="Page6" PaperWidth="220" Watermark.Font="Arial, 60pt">
-    <DataBand Name="Data30" Width="756" Height="66.15">
-      <TextObject Name="Text1" Top="37.8" Width="661.5" Height="28.35" Text="20. ตารางกำหนดการดำเนินโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <TextObject Name="Text282" Top="9.45" Width="756" Height="28.35" Text="แบบฟอร์มการเขียนโครงการภายใต้ยุทธศาสตร์สำคัญของประเทศ" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+    <PageHeaderBand Name="PageHeader2" Width="756" Height="66.15">
      <TextObject Name="Text283" Left="652.05" Width="103.95" Height="18.9" Text="แบบ ง.5 - (2)" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data31" Top="71.63" Width="756" Height="141.75" DataSource="twenty_fifth">
+      <TextObject Name="Text282" Top="9.45" Width="756" Height="28.35" Text="แบบฟอร์มการเขียนโครงการภายใต้ยุทธศาสตร์สำคัญของประเทศ" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text1" Top="37.8" Width="661.5" Height="28.35" Text="20. ตารางกำหนดการดำเนินโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
+    </PageHeaderBand>
+    <DataBand Name="Data30" Top="71.63" Width="756">
+      <DataBand Name="Data31" Top="77.11" Width="756" Height="141.75" DataSource="twenty_fifth">
        <TextObject Name="Text167" Left="28.35" Width="661.5" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity_display_name]" Font="TH Sarabun New, 14pt, style=Bold"/>
        <TextObject Name="Text168" Left="28.35" Top="28.35" Width="661.5" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activitys]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
        <TextObject Name="Text169" Left="28.35" Top="56.7" Width="661.5" Height="28.35" Text="[project_principle_rationale.twenty_fifth.dates]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
        <TextObject Name="Text170" Left="28.35" Top="85.05" Width="661.5" Height="47.25" Text="[project_principle_rationale.twenty_fifth.locations]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
-        <DataBand Name="Data32" Top="262.14" Width="756" Height="47.25" DataSource="twenty_fifth_data_detail">
+        <DataBand Name="Data32" Top="267.62" Width="756" Height="47.25" DataSource="twenty_fifth_data_detail">
          <TableObject Name="Table25" Width="756" Height="47.25">
            <TableColumn Name="Column105" Width="132.3"/>
            <TableColumn Name="Column106" Width="189"/>
@@ -977,7 +981,7 @@
              <TableCell Name="Cell158" Border.Lines="All" Text="[project_principle_rationale.twenty_fifth.twenty_fifth_data_detail.lecturer]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
            </TableRow>
          </TableObject>
-          <DataHeaderBand Name="DataHeader2" Top="218.86" Width="756" Height="37.8">
+          <DataHeaderBand Name="DataHeader2" Top="224.34" Width="756" Height="37.8">
            <TableObject Name="Table26" Width="756" Height="37.8">
              <TableColumn Name="Column109" Width="132.3"/>
              <TableColumn Name="Column110" Width="189"/>