From bd223a48aedeb548932a877c20681d0a41e8f64f Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Tue, 28 Nov 2023 15:41:16 +0700
Subject: [PATCH] bug fixed

---
 obj/rider.project.model.nuget.info |  2 +-
 wwwroot/reports/teaching_fee.frx   | 98 ++++++++++++++++--------------
 2 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info
index 624f633..1a98769 100644
--- a/obj/rider.project.model.nuget.info
+++ b/obj/rider.project.model.nuget.info
@@ -1 +1 @@
-17007993899443636
\ No newline at end of file
+17008168824080162
\ No newline at end of file
diff --git a/wwwroot/reports/teaching_fee.frx b/wwwroot/reports/teaching_fee.frx
index eca9b66..5ceee82 100644
--- a/wwwroot/reports/teaching_fee.frx
+++ b/wwwroot/reports/teaching_fee.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/21/2023 16:11:03" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/13/2021 00:11:35" ReportInfo.Modified="11/28/2023 15:40:58" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="teaching_fee_ro_three" ReferenceName="teaching_fee_ro_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -38,91 +38,97 @@
   </Dictionary>
   <ReportPage Name="Page1" PaperWidth="400" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data1" Width="1436.4" Height="160.65">
-      <TableObject Name="Table10" Width="1086.79" Height="160.65">
+      <TableObject Name="Table10" Width="1285.24" Height="160.65">
         <TableColumn Name="Column70" Width="453.62"/>
-        <TableColumn Name="Column71" Width="170.12"/>
-        <TableColumn Name="Column72" Width="463.05"/>
+        <TableColumn Name="Column71" Width="198.47"/>
+        <TableColumn Name="Column72" Width="170.1"/>
+        <TableColumn Name="Column76" Width="463.05"/>
         <TableRow Name="Row10" Height="160.65">
-          <TableCell Name="Cell70" Border.Lines="All" Text="ชื่อรายวิชา" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell71" Border.Lines="All" Text="ผลการ เบิกจ่าย&#13;&#10;จริงปีก่อนหน้า" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
-          <TableCell Name="Cell72" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold">
-            <TextObject Name="Text6" Width="463.05" Height="37.8" Border.Lines="All" Fill.Color="255, 242, 204" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
+          <TableCell Name="Cell70" Border.Lines="All" Text="ชื่อรายวิชา" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+          <TableCell Name="Cell71" Border.Lines="All" Text="ตำแหน่ง" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+          <TableCell Name="Cell72" Border.Lines="All" Text="ผลการ เบิกจ่าย&#13;&#10;จริงปีก่อนหน้า" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
+          <TableCell Name="Cell76" Border.Lines="All" Font="Arial, 10pt">
+            <TextObject Name="Text6" Width="463.05" Height="37.8" Border.Lines="All" Fill.Color="255, 242, 204" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 16pt, style=Bold"/>
           </TableCell>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table2" Left="623.7" Top="37.8" Width="463.09" Height="47.25">
+      <TableObject Name="Table2" Left="822.15" Top="37.8" Width="463.09" Height="47.25">
         <TableColumn Name="Column19" Width="189.02"/>
         <TableColumn Name="Column20" Width="274.07"/>
         <TableRow Name="Row2" Height="47.25">
-          <TableCell Name="Cell19" Border.Lines="All" Text="จำนวนชั่วโมงภาระงานสอนจริง&#13;&#10;/ภาคการศึกษา" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt, style=Bold"/>
-          <TableCell Name="Cell20" Border.Lines="All" Text="ค่าสอน/ภาคการศึกษา" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt, style=Bold"/>
+          <TableCell Name="Cell19" Border.Lines="All" Text="จำนวนชั่วโมงภาระงานสอนจริง&#13;&#10;/ภาคการศึกษา" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
+          <TableCell Name="Cell20" Border.Lines="All" Text="ค่าสอน/ภาคการศึกษา" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table4" Left="623.7" Top="113.4" Width="189.04" Height="47.25">
+      <TableObject Name="Table4" Left="822.15" Top="113.4" Width="189.04" Height="47.25">
         <TableColumn Name="Column31" Width="94.52"/>
         <TableColumn Name="Column32" Width="94.52"/>
         <TableRow Name="Row4" Height="47.25">
-          <TableCell Name="Cell31" Border.Lines="All" Text="ปริญญาตรี" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell32" Border.Lines="All" Text="ปริญญาโท" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell31" Border.Lines="All" Text="ปริญญาตรี" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+          <TableCell Name="Cell32" Border.Lines="Left, Top, Bottom" Text="ปริญญาโท" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table7" Left="812.7" Top="113.4" Width="274.09" Height="47.25">
+      <TableObject Name="Table7" Left="1011.15" Top="113.4" Width="274.09" Height="47.25">
         <TableColumn Name="Column37" Width="94.52"/>
         <TableColumn Name="Column38" Width="94.52"/>
         <TableColumn Name="Column39" Width="85.05"/>
         <TableRow Name="Row7" Height="47.25">
-          <TableCell Name="Cell37" Border.Lines="All" Text="ปริญญาตรี" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell38" Border.Lines="All" Text="ปริญญาโท" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-          <TableCell Name="Cell39" Border.Lines="All" Fill.Color="255, 242, 204" Text="รวม" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+          <TableCell Name="Cell37" Border.Lines="All" Text="ปริญญาตรี" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+          <TableCell Name="Cell38" Border.Lines="All" Text="ปริญญาโท" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+          <TableCell Name="Cell39" Border.Lines="All" Fill.Color="255, 242, 204" Text="รวม" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <TableObject Name="Table11" Left="623.7" Top="85.05" Width="463.09" Height="28.35">
+      <TableObject Name="Table11" Left="822.15" Top="85.05" Width="463.09" Height="28.35">
         <TableColumn Name="Column74" Width="189.02"/>
         <TableColumn Name="Column75" Width="274.07"/>
         <TableRow Name="Row11" Height="28.35">
-          <TableCell Name="Cell74" Border.Lines="All" Text="(1)" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt, style=Bold"/>
-          <TableCell Name="Cell75" Border.Lines="All" Text="(2) = (1) x อัตราค่าสอนต่อชั่วโมง" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 12pt, style=Bold"/>
+          <TableCell Name="Cell74" Border.Lines="All" Text="(1)" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
+          <TableCell Name="Cell75" Border.Lines="All" Text="(2) = (1) x อัตราค่าสอนต่อชั่วโมง" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data2" Top="168.2" Width="1436.4" Height="47.25" DataSource="data">
-        <TableObject Name="Table3" Width="1086.79" Height="47.25">
+      <DataBand Name="Data2" Top="165.36" Width="1436.4" Height="47.25" DataSource="data">
+        <TableObject Name="Table3" Width="1285.24" Height="47.25">
           <TableColumn Name="Column25" Width="56.72"/>
           <TableColumn Name="Column26" Width="396.92"/>
-          <TableColumn Name="Column27" Width="170.1"/>
-          <TableColumn Name="Column28" Width="94.5"/>
+          <TableColumn Name="Column27" Width="198.45"/>
+          <TableColumn Name="Column28" Width="170.1"/>
           <TableColumn Name="Column29" Width="94.5"/>
           <TableColumn Name="Column30" Width="94.5"/>
           <TableColumn Name="Column40" Width="94.5"/>
-          <TableColumn Name="Column41" Width="85.05"/>
+          <TableColumn Name="Column41" Width="94.5"/>
+          <TableColumn Name="Column77" Width="85.05"/>
           <TableRow Name="Row3" Height="47.25">
-            <TableCell Name="Cell25" Border.Lines="All" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell26" Border.Lines="All" Text="[teaching_fee_ro_three.data.display_name]" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell27" Border.Lines="All" Text="[teaching_fee_ro_three.data.disbursement_result]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell28" Border.Lines="All" Text="[teaching_fee_ro_three.data.number_of_hours_ba_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell29" Border.Lines="All" Text="[teaching_fee_ro_three.data.number_of_hours_ma_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell30" Border.Lines="All" Text="[teaching_fee_ro_three.data.teaching_fee_1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell40" Border.Lines="All" Text="[teaching_fee_ro_three.data.teaching_fee_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
-            <TableCell Name="Cell41" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.data.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt"/>
+            <TableCell Name="Cell25" Border.Lines="All" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell26" Border.Lines="All" Text="[teaching_fee_ro_three.data.display_name]" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell27" Border.Lines="All" Text="[teaching_fee_ro_three.data.position]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell28" Border.Lines="All" Text="[teaching_fee_ro_three.data.disbursement_result]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell29" Border.Lines="All" Text="[teaching_fee_ro_three.data.number_of_hours_ba_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell30" Border.Lines="All" Text="[teaching_fee_ro_three.data.number_of_hours_ma_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell40" Border.Lines="All" Text="[teaching_fee_ro_three.data.teaching_fee_1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell41" Border.Lines="All" Text="[teaching_fee_ro_three.data.teaching_fee_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
+            <TableCell Name="Cell77" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.data.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt"/>
           </TableRow>
         </TableObject>
       </DataBand>
-      <DataFooterBand Name="DataFooter1" Top="222.99" Width="1436.4" Height="47.25">
-        <TableObject Name="Table8" Width="1086.79" Height="47.25">
+      <DataFooterBand Name="DataFooter1" Top="217.31" Width="1436.4" Height="47.25">
+        <TableObject Name="Table8" Width="1285.24" Height="47.25">
           <TableColumn Name="Column46" Width="453.62"/>
-          <TableColumn Name="Column47" Width="170.12"/>
-          <TableColumn Name="Column48" Width="94.5"/>
+          <TableColumn Name="Column47" Width="198.47"/>
+          <TableColumn Name="Column48" Width="170.1"/>
           <TableColumn Name="Column49" Width="94.5"/>
           <TableColumn Name="Column50" Width="94.5"/>
           <TableColumn Name="Column51" Width="94.5"/>
-          <TableColumn Name="Column52" Width="85.05"/>
+          <TableColumn Name="Column52" Width="94.5"/>
+          <TableColumn Name="Column78" Width="85.05"/>
           <TableRow Name="Row8" Height="47.25">
-            <TableCell Name="Cell46" Border.Lines="All" Fill.Color="255, 242, 204" Text="รวม" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell47" Border.Lines="All" Fill.Color="255, 242, 204" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell48" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_ba_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell49" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_ma_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell50" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_teaching_fee_1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell51" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_teaching_fee_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
-            <TableCell Name="Cell52" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
+            <TableCell Name="Cell46" Border.Lines="All" Fill.Color="255, 242, 204" Text="รวม" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+            <TableCell Name="Cell47" Border.Lines="All" Fill.Color="255, 242, 204" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+            <TableCell Name="Cell48" Border.Lines="All" Fill.Color="255, 242, 204" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+            <TableCell Name="Cell49" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_ba_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+            <TableCell Name="Cell50" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_ma_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+            <TableCell Name="Cell51" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_teaching_fee_1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+            <TableCell Name="Cell52" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_teaching_fee_2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
+            <TableCell Name="Cell78" Border.Lines="All" Fill.Color="255, 242, 204" Text="[teaching_fee_ro_three.table_1_total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
           </TableRow>
         </TableObject>
       </DataFooterBand>