From d24ac73eb6a84b9782a89ece7242baf7e7e2e5ae Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Mon, 4 Mar 2024 13:05:34 +0700
Subject: [PATCH] Bug Fixed

---
 Models/budget/project_principle_rationale.cs        |  1 +
 .../reports/plant_genetic_conservation_project.frx  | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Models/budget/project_principle_rationale.cs b/Models/budget/project_principle_rationale.cs
index bd30f52..a5d7b4f 100644
--- a/Models/budget/project_principle_rationale.cs
+++ b/Models/budget/project_principle_rationale.cs
@@ -75,6 +75,7 @@ namespace rmutr_report.Models
         public string text4 { get; set; }  //ข้อ 21
         public string text5 { get; set; }  //ข้อ 21
         public string text6 { get; set; }  //ข้อ 21
+        public string activity_description { get; set; }  //ข้อ 21 พันธุกรรมพืช
         public List<twenty_two_data> twenty_two { get; set; }   //ข้อ 22
         public List<twenty_three_data> twenty_three { get; set; }   //ข้อ 23
         public List<twenty_four_data> twenty_four { get; set; }   //ข้อ 24
diff --git a/wwwroot/reports/plant_genetic_conservation_project.frx b/wwwroot/reports/plant_genetic_conservation_project.frx
index 5cd6ba8..f41d3ad 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/04/2024 12:37:16" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="03/04/2024 13:05:19" 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"/>
@@ -38,6 +38,7 @@
       <Column Name="land_building" DataType="System.Decimal"/>
       <Column Name="operational_activitie" DataType="System.String"/>
       <Column Name="evaluation" DataType="System.String"/>
+      <Column Name="activity_description" DataType="System.String"/>
       <BusinessObjectDataSource Name="sixth" DataType="null" Enabled="true">
         <Column Name="objective" DataType="System.String"/>
       </BusinessObjectDataSource>
@@ -926,7 +927,7 @@
     </DataBand>
     <DataBand Name="Data14" Top="264.56" Width="756" Height="226.8">
       <TextObject Name="Text225" Width="756" Height="28.35" Text="21. รูปแบบกิจกรรมการดำเนินงาน" Font="TH Sarabun New, 14pt, style=Bold"/>
-      <TextObject Name="Text226" Top="28.35" Width="756" Height="85.05" Text="[project_principle_rationale.operational_activitie]" Font="TH Sarabun New, 14pt"/>
+      <TextObject Name="Text226" Top="28.35" Width="756" Height="85.05" Text="[project_principle_rationale.activity_description]" Font="TH Sarabun New, 14pt"/>
       <TextObject Name="Text227" Top="113.4" Width="756" Height="28.35" Text="22. การประเมินผล" Font="TH Sarabun New, 14pt, style=Bold"/>
       <TextObject Name="Text228" Top="141.75" Width="756" Height="85.05" Text="[project_principle_rationale.evaluation]" Font="TH Sarabun New, 14pt"/>
     </DataBand>
@@ -1120,13 +1121,13 @@
       <TextObject Name="Text251" Top="28.35" Width="878.85" Height="28.35" Text="สมเด็จพระเทพรัตนราชสุดาฯ สยามบรมราชกุมารี" HorzAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text1" Top="56.7" Width="878.85" Height="28.35" Text="28. ตารางกำหนดการดำเนินโครงการ" Font="TH Sarabun New, 14pt, style=Bold"/>
     </PageHeaderBand>
-    <DataBand Name="Data30" Top="90.11" Width="1247.4">
-      <DataBand Name="Data31" Top="95.18" Width="1247.4" Height="141.75" DataSource="twenty_fifth">
+    <DataBand Name="Data30" Top="89.76" Width="1247.4">
+      <DataBand Name="Data31" Top="94.46" Width="1247.4" Height="141.75" DataSource="twenty_fifth">
         <TextObject Name="Text167" Width="878.85" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity_display_name]" Font="TH Sarabun New, 14pt, style=Bold"/>
         <TextObject Name="Text168" Top="28.35" Width="878.85" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activitys]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
         <TextObject Name="Text169" Top="56.7" Width="878.85" Height="28.35" Text="[project_principle_rationale.twenty_fifth.dates]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
         <TextObject Name="Text170" Top="85.05" Width="878.85" Height="47.25" Text="[project_principle_rationale.twenty_fifth.locations]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
-        <DataBand Name="Data32" Top="284.85" Width="1247.4" Height="47.25" DataSource="twenty_fifth_data_detail">
+        <DataBand Name="Data32" Top="283.42" Width="1247.4" Height="47.25" DataSource="twenty_fifth_data_detail">
           <TableObject Name="Table25" Width="878.85" Height="47.25">
             <TableColumn Name="Column105" Width="132.3"/>
             <TableColumn Name="Column106" Width="189"/>
@@ -1139,7 +1140,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 Sarabun New, 12pt"/>
             </TableRow>
           </TableObject>
-          <DataHeaderBand Name="DataHeader2" Top="241.99" Width="1247.4" Height="37.8">
+          <DataHeaderBand Name="DataHeader2" Top="240.92" Width="1247.4" Height="37.8">
             <TableObject Name="Table26" Width="878.85" Height="37.8">
               <TableColumn Name="Column109" Width="132.3"/>
               <TableColumn Name="Column110" Width="189"/>