From bb298508bbb6be80387b1732b490cc9b946c4c45 Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Wed, 12 Oct 2022 11:00:56 +0700
Subject: [PATCH] bug fixed

---
 Models/summary_of_equipment_five_year.cs        |  4 +---
 wwwroot/reports/summary_of_equipment_5_year.frx | 12 +++++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Models/summary_of_equipment_five_year.cs b/Models/summary_of_equipment_five_year.cs
index debeb7c..acf92b1 100644
--- a/Models/summary_of_equipment_five_year.cs
+++ b/Models/summary_of_equipment_five_year.cs
@@ -10,8 +10,6 @@ namespace rmutr_report.Models
         public string budget_year_3 { get; set; }
         public string budget_year_4 { get; set; }
         public string budget_year_5 { get; set; }
-        public decimal?  amount { get; set; }
-        public string company { get; set; }
         public List<summary_of_equipment_five_year_detail> data { get; set; }
     }
 
@@ -29,7 +27,7 @@ namespace rmutr_report.Models
         public decimal? price_3 { get; set; }
         public decimal? price_4 { get; set; }
         public decimal? price_5 { get; set; }
-        public decimal?  amount { get; set; }
+        public decimal? amount { get; set; }
         public string company { get; set; }
         public string description { get; set; }
     }
diff --git a/wwwroot/reports/summary_of_equipment_5_year.frx b/wwwroot/reports/summary_of_equipment_5_year.frx
index a2b58ac..109211d 100644
--- a/wwwroot/reports/summary_of_equipment_5_year.frx
+++ b/wwwroot/reports/summary_of_equipment_5_year.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/07/2022 13:35:22" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="10/12/2022 10:59:36" ReportInfo.CreatorVersion="2022.1.0.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -44,8 +44,6 @@ namespace FastReport
       <Column Name="budget_year_3" DataType="System.String"/>
       <Column Name="budget_year_4" DataType="System.String"/>
       <Column Name="budget_year_5" DataType="System.String"/>
-      <Column Name="amount" DataType="System.Decimal"/>
-      <Column Name="company" DataType="System.String"/>
       <BusinessObjectDataSource Name="data" DataType="null" Enabled="true">
         <Column Name="no" DataType="System.Int32"/>
         <Column Name="list" DataType="System.String"/>
@@ -135,13 +133,13 @@ namespace FastReport
         <TableColumn Name="Column158" Width="85.05"/>
         <TableColumn Name="Column159" Width="85.05"/>
         <TableRow Name="Row21" Height="37.8">
-          <TableCell Name="Cell218" Border.Lines="All" Text="[summary_of_equipment_five_year.amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
-          <TableCell Name="Cell219" Border.Lines="All" Text="[summary_of_equipment_five_year.company]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+          <TableCell Name="Cell218" Border.Lines="All" Text="วงเงิน" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
+          <TableCell Name="Cell219" Border.Lines="All" Text="ชื่อบริษัท" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 11pt"/>
         </TableRow>
       </TableObject>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="222.41" Width="1360.8">
-      <DataBand Name="Data2" Top="227.48" Width="1360.8" Height="47.25" BeforePrintEvent="Data2_BeforePrint" DataSource="data">
+    <DataBand Name="Data1" Top="221.95" Width="1360.8">
+      <DataBand Name="Data2" Top="226.55" Width="1360.8" Height="47.25" BeforePrintEvent="Data2_BeforePrint" DataSource="data">
         <TableObject Name="Table14" Width="1360.8" Height="47.25" Border.Lines="All">
           <TableColumn Name="Column70" Width="47.25"/>
           <TableColumn Name="Column71" Width="311.85"/>