From fcc4f79ed1ee782227aa6289dc3c75ab0ca9e831 Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Thu, 26 Jan 2023 08:40:48 +0700
Subject: [PATCH] bug fixed

---
 Models/budget/student_news.cs               | 1 +
 Models/budget/student_news_area.cs          | 1 +
 Models/budget/student_news_year.cs          | 1 +
 wwwroot/reports/student_news_area.frx       | 7 +++++--
 wwwroot/reports/student_news_area_major.frx | 7 +++++--
 wwwroot/reports/student_news_faculty.frx    | 7 +++++--
 wwwroot/reports/student_news_year.frx       | 7 +++++--
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Models/budget/student_news.cs b/Models/budget/student_news.cs
index dca9311..b991cf9 100644
--- a/Models/budget/student_news.cs
+++ b/Models/budget/student_news.cs
@@ -6,6 +6,7 @@ namespace rmutr_report.Models
     {
         public string academic_year_name_th { get; set; }
         public string curriculum_name_th { get; set; }
+        public string data_date { get; set; }
         public List<student_news_faculty_detail> data { get; set; }
         //public string faculty_academy_name_th { get; set; }
     }
diff --git a/Models/budget/student_news_area.cs b/Models/budget/student_news_area.cs
index 74959e4..bdf6e9b 100644
--- a/Models/budget/student_news_area.cs
+++ b/Models/budget/student_news_area.cs
@@ -6,6 +6,7 @@ namespace rmutr_report.Models
     {
         public string academic_year_name_th { get; set; }
         public string curriculum_name_th { get; set; }
+        public string data_date { get; set; }
         public List<student_news_area_detail> data { get; set; }
     }
 
diff --git a/Models/budget/student_news_year.cs b/Models/budget/student_news_year.cs
index 01aee8f..f7c3c7e 100644
--- a/Models/budget/student_news_year.cs
+++ b/Models/budget/student_news_year.cs
@@ -8,6 +8,7 @@ namespace rmutr_report.Models
         public string academic_year_range { get; set; }
         public string academic_year_name_th1 { get; set; }
         public string academic_year_name_th2 { get; set; }
+        public string data_date { get; set; }
         public List<student_news_year_detail> data { get; set; }
     }
 
diff --git a/wwwroot/reports/student_news_area.frx b/wwwroot/reports/student_news_area.frx
index 43efcc1..ef1dc97 100644
--- a/wwwroot/reports/student_news_area.frx
+++ b/wwwroot/reports/student_news_area.frx
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="01/23/2023 22:31:18" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="01/26/2023 08:38:07" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="student_news_area" ReferenceName="student_news_area" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th" DataType="System.String"/>
       <Column Name="curriculum_name_th" DataType="System.String"/>
+      <Column Name="data_date" DataType="System.String"/>
       <BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
         <Column Name="area_name_th" DataType="System.String"/>
         <Column Name="bachelors_degree_science" DataType="System.Decimal"/>
@@ -70,7 +71,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="161.2" Width="718.2" Height="28.35">
+    <ReportSummaryBand Name="ReportSummary1" Top="161.2" Width="718.2" Height="94.5">
       <TableObject Name="Table15" Width="718.2" Height="28.35" Border.Lines="All">
         <TableColumn Name="Column81" Width="37.8"/>
         <TableColumn Name="Column82" Width="302.4"/>
@@ -89,6 +90,8 @@
           <TableCell Name="Cell127" Border.Lines="All" Fill.Color="InactiveCaption" Text="[student_news_area.data.total5]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt, style=Bold"/>
         </TableRow>
       </TableObject>
+      <TextObject Name="Text13" Top="37.8" Width="718.2" Height="28.35" Text="ข้อมูล ณ วันที่ [student_news_area.data_date]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+      <TextObject Name="Text14" Top="66.15" Width="718.2" Height="28.35" Text="ที่มา สำนักส่งเสริมวิชาการและงานทะเบียน" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
     </ReportSummaryBand>
   </ReportPage>
 </Report>
diff --git a/wwwroot/reports/student_news_area_major.frx b/wwwroot/reports/student_news_area_major.frx
index 78bcc5b..80a237d 100644
--- a/wwwroot/reports/student_news_area_major.frx
+++ b/wwwroot/reports/student_news_area_major.frx
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="01/23/2023 22:31:09" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="01/26/2023 08:39:39" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="student_news_area" ReferenceName="student_news_area" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th" DataType="System.String"/>
       <Column Name="curriculum_name_th" DataType="System.String"/>
+      <Column Name="data_date" DataType="System.String"/>
       <BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
         <Column Name="faculty_academy_name_th" DataType="System.String"/>
         <Column Name="bachelors_degree_science" DataType="System.Decimal"/>
@@ -70,7 +71,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="161.2" Width="718.2" Height="28.35">
+    <ReportSummaryBand Name="ReportSummary1" Top="161.2" Width="718.2" Height="94.5">
       <TableObject Name="Table15" Width="718.2" Height="28.35" Border.Lines="All">
         <TableColumn Name="Column81" Width="37.8"/>
         <TableColumn Name="Column82" Width="302.4"/>
@@ -89,6 +90,8 @@
           <TableCell Name="Cell127" Border.Lines="All" Fill.Color="InactiveCaption" Text="[student_news_area.data.total5]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt, style=Bold"/>
         </TableRow>
       </TableObject>
+      <TextObject Name="Text21" Top="66.15" Width="718.2" Height="28.35" Text="ที่มา สำนักส่งเสริมวิชาการและงานทะเบียน" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+      <TextObject Name="Text20" Top="37.8" Width="718.2" Height="28.35" Text="ข้อมูล ณ วันที่ [student_news_area.data_date]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
     </ReportSummaryBand>
   </ReportPage>
 </Report>
diff --git a/wwwroot/reports/student_news_faculty.frx b/wwwroot/reports/student_news_faculty.frx
index 6add570..2ee2f6d 100644
--- a/wwwroot/reports/student_news_faculty.frx
+++ b/wwwroot/reports/student_news_faculty.frx
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="01/23/2023 21:36:29" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="01/26/2023 08:40:07" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="student_news_faculty" ReferenceName="student_news_faculty" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th" DataType="System.String"/>
       <Column Name="curriculum_name_th" DataType="System.String"/>
+      <Column Name="data_date" DataType="System.String"/>
       <BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
         <Column Name="faculty_academy_name_th" DataType="System.String"/>
         <Column Name="bachelors_degree" DataType="System.Decimal"/>
@@ -49,7 +50,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="161.2" Width="718.2" Height="28.35">
+    <ReportSummaryBand Name="ReportSummary1" Top="161.2" Width="718.2" Height="94.5">
       <TableObject Name="Table15" Width="718.2" Height="28.35" Border.Lines="All">
         <TableColumn Name="Column74" Width="37.8"/>
         <TableColumn Name="Column75" Width="491.4"/>
@@ -62,6 +63,8 @@
           <TableCell Name="Cell117" Border.Lines="All" Fill.Color="InactiveCaption" Text="[student_news_faculty.data.total2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt, style=Bold"/>
         </TableRow>
       </TableObject>
+      <TextObject Name="Text21" Top="66.15" Width="718.2" Height="28.35" Text="ที่มา สำนักส่งเสริมวิชาการและงานทะเบียน" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+      <TextObject Name="Text20" Top="37.8" Width="718.2" Height="28.35" Text="ข้อมูล ณ วันที่ [student_news_faculty.data_date]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
     </ReportSummaryBand>
   </ReportPage>
 </Report>
diff --git a/wwwroot/reports/student_news_year.frx b/wwwroot/reports/student_news_year.frx
index 82464b9..f627f64 100644
--- a/wwwroot/reports/student_news_year.frx
+++ b/wwwroot/reports/student_news_year.frx
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="01/23/2023 22:31:00" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="01/26/2023 08:38:55" ReportInfo.CreatorVersion="2022.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="student_news_year" ReferenceName="student_news_year" DataType="null" Enabled="true">
       <Column Name="academic_year_name_th1" DataType="System.String"/>
       <Column Name="academic_year_name_th2" DataType="System.String"/>
       <Column Name="academic_year_range" DataType="System.String"/>
       <Column Name="curriculum_name_th" DataType="System.String"/>
+      <Column Name="data_date" DataType="System.String"/>
       <BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
         <Column Name="faculty_academy_name_th" DataType="System.String"/>
         <Column Name="bachelors_degree_science1" DataType="System.Decimal"/>
@@ -94,7 +95,7 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <ReportSummaryBand Name="ReportSummary1" Top="189.55" Width="793.8" Height="28.35">
+    <ReportSummaryBand Name="ReportSummary1" Top="189.55" Width="793.8" Height="94.5">
       <TableObject Name="Table15" Width="793.8" Height="28.35" Border.Lines="All">
         <TableColumn Name="Column85" Width="37.8"/>
         <TableColumn Name="Column86" Width="302.4"/>
@@ -119,6 +120,8 @@
           <TableCell Name="Cell134" Border.Lines="All" Fill.Color="InactiveCaption" Text="[student_news_year.data.total8]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt, style=Bold"/>
         </TableRow>
       </TableObject>
+      <TextObject Name="Text21" Top="66.15" Width="793.8" Height="28.35" Text="ที่มา สำนักส่งเสริมวิชาการและงานทะเบียน" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
+      <TextObject Name="Text20" Top="37.8" Width="793.8" Height="28.35" Text="ข้อมูล ณ วันที่ [student_news_year.data_date]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
     </ReportSummaryBand>
   </ReportPage>
 </Report>