bug fixed

2023-10-11 14:21:20 +07:00
parent c7c1a86edf
commit d7509173f9
20 changed files with 13 additions and 2833 deletions
--- a/bin/Debug/net5.0/rmutr_report.dll
+++ b/bin/Debug/net5.0/rmutr_report.dll
--- a/bin/Debug/net5.0/rmutr_report.pdb
+++ b/bin/Debug/net5.0/rmutr_report.pdb
--- a/obj/Debug/net5.0/ref/rmutr_report.dll
+++ b/obj/Debug/net5.0/ref/rmutr_report.dll
--- a/obj/Debug/net5.0/refint/rmutr_report.dll
+++ b/obj/Debug/net5.0/refint/rmutr_report.dll
--- a/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
+++ b/obj/Debug/net5.0/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
@@ -5,7 +5,6 @@ build_property.UsingMicrosoftNETSdkWeb = true
 build_property.ProjectTypeGuids = 
 build_property.InvariantGlobalization = 
 build_property.PlatformNeutralAssembly = 
-build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = rmutr_report
 build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\
--- a/obj/Debug/net5.0/rmutr_report.assets.cache
+++ b/obj/Debug/net5.0/rmutr_report.assets.cache
--- a/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt
+++ b/obj/Debug/net5.0/rmutr_report.csproj.FileListAbsolute.txt
@@ -172,8 +172,3 @@ C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.xml
 C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.pdb
 C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.genruntimeconfig.cache
 C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\ref\rmutr_report.dll
-C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\rmutr_report.StaticWebAssets.Pack.cache
-C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
-C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.build.rmutr_report.props
-C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildMultiTargeting.rmutr_report.props
-C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\staticwebassets\msbuild.buildTransitive.rmutr_report.props
--- a/obj/Debug/net5.0/rmutr_report.dll
+++ b/obj/Debug/net5.0/rmutr_report.dll
--- a/obj/Debug/net5.0/rmutr_report.pdb
+++ b/obj/Debug/net5.0/rmutr_report.pdb
--- a/obj/Debug/net5.0/staticwebassets/msbuild.build.rmutr_report.props
+++ b/obj/Debug/net5.0/staticwebassets/msbuild.build.rmutr_report.props
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
-</Project>
--- a/obj/Debug/net5.0/staticwebassets/msbuild.buildMultiTargeting.rmutr_report.props
+++ b/obj/Debug/net5.0/staticwebassets/msbuild.buildMultiTargeting.rmutr_report.props
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="..\build\rmutr_report.props" />
-</Project>
--- a/obj/Debug/net5.0/staticwebassets/msbuild.buildTransitive.rmutr_report.props
+++ b/obj/Debug/net5.0/staticwebassets/msbuild.buildTransitive.rmutr_report.props
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="..\buildMultiTargeting\rmutr_report.props" />
-</Project>
--- a/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
+++ b/obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
--- a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
+++ b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
@@ -1 +0,0 @@
-30ffb1b917a7940f2113a9893d63f0242ae2ce84
--- a/obj/project.assets.json
+++ b/obj/project.assets.json
@@ -2219,7 +2219,7 @@
            "privateAssets": "all"
          }
        },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"
      }
    }
  }
--- a/obj/project.nuget.cache
+++ b/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
  "version": 2,
-  "dgSpecHash": "8irQbGlYTk6GhRXUatdtl8V/UPVSHhAKvRA/fBqq4PDWndm+7Mq7ntB5KcbGRVcfyfrzqzd0FCFJywKJHvt+xw==",
+  "dgSpecHash": "TgdSlhcNLrmoGcymKBKtBNUewM9z9QdY0FESfevGdFzEBUl5TotP+ysyCZqFpczcvGDJdBKPRCtfqngiN8LZRQ==",
  "success": true,
  "projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
  "expectedPackageFiles": [
--- a/obj/project.packagespec.json
+++ b/obj/project.packagespec.json
@@ -1 +1 @@
-"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"}}
+"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}}
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-16965661167366202
+16970086664973301
--- a/obj/rmutr_report.csproj.nuget.dgspec.json
+++ b/obj/rmutr_report.csproj.nuget.dgspec.json
@@ -77,7 +77,7 @@
              "privateAssets": "all"
            }
          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.401\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"
        }
      }
    }
--- a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
+++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/23/2023 15:36:43" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="10/11/2023 14:20:11" ReportInfo.CreatorVersion="2021.1.0.0">
  <Dictionary>
    <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue_v2" ReferenceName="budget_expenditure_report_from_revenue_v2" DataType="null" Enabled="true">
      <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -84,21 +84,21 @@
  </Dictionary>
  <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="450" Watermark.Font="Arial, 60pt">
    <DataBand Name="Data2" Width="945" Height="207.9" StartNewPage="true">
-      <LineObject Name="Line1" Left="85.05" Top="198.45" Width="425.25" Diagonal="true"/>
+      <TextObject Name="Text7" Left="85.05" Top="132.3" Width="680.4" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.agency_name_th]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+      <LineObject Name="Line1" Left="85.05" Top="198.45" Width="472.5" Diagonal="true"/>
      <LineObject Name="Line4" Left="765.45" Top="198.45" Width="132.3" Diagonal="true"/>
      <TextObject Name="Text5" Top="170.1" Width="75.6" Height="37.8" Text="ภาค :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <TextObject Name="Text8" Left="85.05" Top="170.1" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.sector]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+      <TextObject Name="Text8" Left="85.05" Top="170.1" Width="670.95" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.sector]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
      <TextObject Name="Text9" Left="765.45" Top="170.1" Width="132.3" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
      <TextObject Name="Text10" Left="897.75" Top="170.1" Width="47.25" Height="37.8" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <LineObject Name="Line2" Left="85.05" Top="160.65" Width="425.25" Diagonal="true"/>
+      <LineObject Name="Line2" Left="85.05" Top="160.65" Width="472.5" Diagonal="true"/>
      <TextObject Name="Text4" Top="132.3" Width="94.5" Height="37.8" Text="หน่วยงาน :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <TextObject Name="Text7" Left="85.05" Top="132.3" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.agency_name_th]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <LineObject Name="Line3" Left="85.05" Top="122.85" Width="425.25" Diagonal="true"/>
+      <LineObject Name="Line3" Left="85.05" Top="122.85" Width="472.5" Diagonal="true"/>
      <TextObject Name="Text3" Top="94.5" Width="75.6" Height="37.8" Text="พื้นที่ :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <TextObject Name="Text6" Left="85.05" Top="94.5" Width="425.25" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.parent_agency_name]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
+      <TextObject Name="Text6" Left="85.05" Top="94.5" Width="680.4" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.parent_agency_name]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
      <TextObject Name="Text2" Top="37.8" Width="945" Height="37.8" Text="( 1 ตุลาคม 2565 - 30 กันยายน 2566 )" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
      <TextObject Name="Text1" Width="945" Height="37.8" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue_v2.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
-      <DataBand Name="Data3" Top="214.25" Width="945" Height="28.35" CanShrink="true" DataSource="details">
+      <DataBand Name="Data3" Top="213.38" Width="945" Height="28.35" CanShrink="true" DataSource="details">
        <TextObject Name="Text11" Width="604.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic1]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="0, 32, 96"/>
        <TextObject Name="Text14" Left="18.9" Width="491.4" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic2]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="32, 55, 100"/>
        <TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="32, 55, 100"/>