From 14cf3e4081f45db05145e8c8ce3c9a8158fbf091 Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Tue, 18 Jun 2024 18:45:05 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=8AUpdate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Models/budget/operating_expenses.cs                 |  2 ++
 obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs       |  2 +-
 .../net5.0/rmutr_report.AssemblyInfoInputs.cache    |  2 +-
 wwwroot/reports/operating_expenses.frx              | 13 ++++++++-----
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Models/budget/operating_expenses.cs b/Models/budget/operating_expenses.cs
index c89e067..a85e5ee 100644
--- a/Models/budget/operating_expenses.cs
+++ b/Models/budget/operating_expenses.cs
@@ -10,6 +10,8 @@ namespace rmutr_report.Models
         // public string agency { get; set; }
         // public string area { get; set; }
         public string text { get; set; }
+        public string faculty_name_th { get; set; }
+        public string budget_location_name_th { get; set; }
         public string request_year { get; set; }
         public decimal? total_amount { get; set; }
         public List<operating_expenses_detail> data { get; set; }
diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
index 401a217..be7e8cc 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3094fae4b712eca121cc30b04c1ccf45a9636912")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0a4fd17b6527db143382165c7dd7e34d579f7df9")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
index 01638d9..68cadaf 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-ed2783f80d214d6bb90290841cf7165830baa6719ee399db3ba9c4a2b9791914
+c0641e23d30d896b8be212b2d5ae3dffa0ed63bf190ef1a7c17199b0b460852b
diff --git a/wwwroot/reports/operating_expenses.frx b/wwwroot/reports/operating_expenses.frx
index 7c2dff5..7041211 100644
--- a/wwwroot/reports/operating_expenses.frx
+++ b/wwwroot/reports/operating_expenses.frx
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="03/05/2024 13:59:46" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="06/18/2024 18:43:33" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="operating_expenses" ReferenceName="operating_expenses" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
       <Column Name="plan" DataType="System.String"/>
       <Column Name="text" DataType="System.String"/>
+      <Column Name="faculty_name_th" DataType="System.String"/>
+      <Column Name="budget_location_name_th" DataType="System.String"/>
       <Column Name="request_year" DataType="System.String"/>
       <Column Name="total_amount" DataType="System.Decimal"/>
       <BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
@@ -17,8 +19,8 @@
     </BusinessObjectDataSource>
   </Dictionary>
   <ReportPage Name="ค่าใช้จ่ายดำเนินงาน" PaperWidth="310" Watermark.Font="Arial, 60pt">
-    <DataBand Name="Data1" Width="1096.2" Height="151.2">
-      <TableObject Name="Table1" Top="94.5" Width="1096.24" Height="56.7">
+    <DataBand Name="Data1" Width="1096.2" Height="179.55">
+      <TableObject Name="Table1" Top="122.85" Width="1096.24" Height="56.7">
         <TableColumn Name="Column1" Width="66.17"/>
         <TableColumn Name="Column2" Width="500.87"/>
         <TableColumn Name="Column3" Width="160.65"/>
@@ -30,10 +32,11 @@
           <TableCell Name="Cell4" Border.Lines="All" Text="สรุปคำชี้แจง" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TextObject Name="Text3" Top="56.7" Width="1096.2" Height="28.35" Text="หน่วย : [operating_expenses.total_amount] บาท" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text3" Top="85.05" Width="1096.2" Height="28.35" Text="หน่วย : [operating_expenses.total_amount] บาท" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text2" Top="28.35" Width="1096.2" Height="28.35" Text="[operating_expenses.text]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text1" Width="1096.2" Height="28.35" Text="ปีงบประมาณ [operating_expenses.budget_year] [operating_expenses.plan]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data2" Top="155.91" Width="1096.2" Height="37.8" DataSource="data">
+      <TextObject Name="Text4" Top="56.7" Width="1105.65" Height="28.35" Text="[operating_expenses.faculty_name_th] [operating_expenses.budget_location_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <DataBand Name="Data2" Top="183.72" Width="1096.2" Height="37.8" DataSource="data">
         <TableObject Name="Table2" Width="1096.24" Height="37.8">
           <TableColumn Name="Column15" Width="66.17"/>
           <TableColumn Name="Column16" Width="500.87"/>