Bug Fixed

Controllers/durable_articles_three.Controller.cs

@@ -9,6 +9,7 @@ using FastReport.Export.Mht;
 using FastReport.Export.OoXML;
 using FastReport.Export.Pdf;
 using Microsoft.AspNetCore.Mvc;
+using OfficeOpenXml;
 using rmutr_report.Models;
 using Swashbuckle.AspNetCore.Annotations;
 
@@ -65,14 +66,6 @@ namespace rmutr_report.Controllers
                     stream.Seek(0, SeekOrigin.Begin);
                     return File(stream, "application/pdf");
 
-                case "xls":
-                case "xlsx":
-                    Excel2007Export excel = new Excel2007Export();
-                    excel.ShowProgress = true; 
-                    excel.PageBreaks = true; 
-                    report.Export(excel, stream);
-                    stream.Seek(0, SeekOrigin.Begin);
-                    return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
                     break;
                 case "mht":
                     MHTExport mht = new MHTExport();
@@ -86,14 +79,54 @@ namespace rmutr_report.Controllers
                     stream.Seek(0, SeekOrigin.Begin);
                     return File(stream, "text/csv");
                     break;
-                case "doc" : case "docx":
+                case "doc":
+                case "docx":
                     Word2007Export word = new Word2007Export();
                     report.Export(word, stream);
                     stream.Seek(0, SeekOrigin.Begin);
                     return File(stream, "appllication/vnd.ms-word");
                     break;
+                case "xls":
+                case "xlsx":
+                    Excel2007Export excelExport = new Excel2007Export
+                    {
+                        ShowProgress = true,
+                        PageBreaks = true
+                    };
+                    report.Export(excelExport, stream);
+
+                    stream.Seek(0, SeekOrigin.Begin);
+                    using (var package = new ExcelPackage(stream))
+                    {
+                        ExcelWorksheet worksheet = package.Workbook.Worksheets[0];
+
+                        if (worksheet.Dimension != null)
+                        {
+                            //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+                            worksheet.Cells[worksheet.Dimension.Address].Style.WrapText = true;
                         }
 
+                        package.Save();
+                    }
+
+                    stream.Seek(0, SeekOrigin.Begin);
+                    return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+
+            }
+            // static double GetTextHeight(string text, double fontSize, bool wrapText)
+        // {
+        //     if (string.IsNullOrEmpty(text))
+        //         return 0;
+        //
+        //     
+        //     const double lineHeightFactor = 1.2;
+        //
+        //     int lines = wrapText ? text.Split(new[] { '\n' }, StringSplitOptions.None).Length : 1;
+        //     return lines * (fontSize * lineHeightFactor); 
+        // }
+
+
+
         return Ok();
         }
 

obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs

@@ -13,7 +13,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+438286ba8b5971a78baa3b8940d590103c830170")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+41fa5d139899cc18306e905b36a359608ad04928")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache

@@ -1 +1 @@
-0b74fadfa0f1ddcddcc69a25e09f2f20d2bbbedec97a5ba107b0f1ccf9a8585d
+b92c5c7fedc5f70a29e89e367583aee2ac12b796317b141207cd395662939416

obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs

@@ -13,7 +13,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+438286ba8b5971a78baa3b8940d590103c830170")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+41fa5d139899cc18306e905b36a359608ad04928")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache

@@ -1 +1 @@
-0b74fadfa0f1ddcddcc69a25e09f2f20d2bbbedec97a5ba107b0f1ccf9a8585d
+b92c5c7fedc5f70a29e89e367583aee2ac12b796317b141207cd395662939416

obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache

@@ -1 +1 @@
-1eedcf7419825c64b7b8057a14ab5041b9352f93f3cfd2f4dd4c8eb43ab3254d
+2a44f2b4a8538ca223dc93088d3dc8438b519f5c35f27c5fd6146dc8b03c441c

obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8d0a705eb05b7d31a5543fad875abccdcc0dec6fa2790db8f635c6c6cfa76d95
+839c9e7f0873da70dfcac7ef6998ba9642d45b9afb515631acc12aaf50522c14

obj/Debug/netcoreapp3.1/rmutr_report.csproj.FileListAbsolute.txt

@@ -265,3 +265,27 @@ D:\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.dll
 D:\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.xml
 D:\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.pdb
 D:\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\rmutr_report.genruntimeconfig.cache
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\EPPlus.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Extensions.Configuration.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Extensions.Configuration.Abstractions.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Extensions.Configuration.FileExtensions.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Extensions.Configuration.Json.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Extensions.FileProviders.Abstractions.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Extensions.FileProviders.Physical.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Extensions.FileSystemGlobbing.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Extensions.Primitives.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.IO.RecyclableMemoryStream.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.Text.Encoding.CodePages.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\unix\lib\netcoreapp3.0\System.Drawing.Common.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win\lib\netcoreapp3.0\System.Drawing.Common.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\EPPlus.Interfaces.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\EPPlus.System.Drawing.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\Microsoft.Bcl.AsyncInterfaces.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.ComponentModel.Annotations.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.Formats.Asn1.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.Runtime.CompilerServices.Unsafe.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.Security.Cryptography.Cng.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.Security.Cryptography.Pkcs.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.Text.Encodings.Web.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\System.Text.Json.dll
+D:\RiderProjects\rmutr_report\bin\Debug\netcoreapp3.1\runtimes\win\lib\netcoreapp3.0\System.Security.Cryptography.Cng.dll

obj/project.nuget.cache

@@ -1,25 +1,38 @@
 {
   "version": 2,
-  "dgSpecHash": "16tUroaUnyk5DfcJ5uBUBqnWQdJVLseeVEqVv/Cyf3Fb6M56ufMMvsiWe4T15e3sdaOLJ3FAzeg9i1qBG2/6Jg==",
+  "dgSpecHash": "imHgriiCjMHjV66Gbxeii1xTKkLhG/eM4BKxf1zGc+fEecF8EUG2gv4LvD8fsrpHzLumpjV9tPWp8quqGklCvQ==",
   "success": true,
   "projectFilePath": "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
   "expectedPackageFiles": [
     "C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\epplus\\7.2.2\\epplus.7.2.2.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\epplus.interfaces\\6.1.1\\epplus.interfaces.6.1.1.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\epplus.system.drawing\\6.1.1\\epplus.system.drawing.6.1.1.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\excelnumberformat\\1.1.0\\excelnumberformat.1.1.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\fastreport.compat\\2021.2.0\\fastreport.compat.2021.2.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\fastreport.core\\2021.3.0\\fastreport.core.2021.3.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\fastreport.datavisualization\\2021.2.0\\fastreport.datavisualization.2021.2.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\8.0.0\\microsoft.bcl.asyncinterfaces.8.0.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\2.9.4\\microsoft.codeanalysis.analyzers.2.9.4.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.common\\3.3.1\\microsoft.codeanalysis.common.3.3.1.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.csharp\\3.3.1\\microsoft.codeanalysis.csharp.3.3.1.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.visualbasic\\3.3.1\\microsoft.codeanalysis.visualbasic.3.3.1.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\microsoft.netcore.platforms\\3.0.0\\microsoft.netcore.platforms.3.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.configuration\\8.0.0\\microsoft.extensions.configuration.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\8.0.0\\microsoft.extensions.configuration.abstractions.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\8.0.0\\microsoft.extensions.configuration.fileextensions.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.configuration.json\\8.0.0\\microsoft.extensions.configuration.json.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\8.0.0\\microsoft.extensions.fileproviders.abstractions.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\8.0.0\\microsoft.extensions.fileproviders.physical.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\8.0.0\\microsoft.extensions.filesystemglobbing.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.primitives\\8.0.0\\microsoft.extensions.primitives.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.io.recyclablememorystream\\3.0.0\\microsoft.io.recyclablememorystream.3.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.9\\microsoft.netcore.platforms.3.1.9.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\microsoft.win32.registry\\4.4.0\\microsoft.win32.registry.4.4.0.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\microsoft.win32.systemevents\\4.6.0\\microsoft.win32.systemevents.4.6.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\microsoft.win32.systemevents\\4.7.0\\microsoft.win32.systemevents.4.7.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\runtime.win-arm64.runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.win-arm64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\runtime.win-x64.runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.win-x64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
@@ -29,20 +42,25 @@
     "C:\\Users\\USER\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\system.collections.immutable\\1.5.0\\system.collections.immutable.1.5.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.componentmodel.annotations\\5.0.0\\system.componentmodel.annotations.5.0.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\system.data.sqlclient\\4.4.3\\system.data.sqlclient.4.4.3.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\system.drawing.common\\4.6.1\\system.drawing.common.4.6.1.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.drawing.common\\4.7.3\\system.drawing.common.4.7.3.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.formats.asn1\\8.0.0\\system.formats.asn1.8.0.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\system.io.packaging\\4.7.0\\system.io.packaging.4.7.0.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\system.reflection.metadata\\1.6.0\\system.reflection.metadata.1.6.0.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.5.2\\system.runtime.compilerservices.unsafe.4.5.2.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\system.security.accesscontrol\\4.4.0\\system.security.accesscontrol.4.4.0.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\system.security.cryptography.pkcs\\4.5.2\\system.security.cryptography.pkcs.4.5.2.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.security.cryptography.pkcs\\8.0.0\\system.security.cryptography.pkcs.8.0.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\system.security.permissions\\4.4.0\\system.security.permissions.4.4.0.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\system.security.principal.windows\\4.4.0\\system.security.principal.windows.4.4.0.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\system.text.encoding.codepages\\4.5.1\\system.text.encoding.codepages.4.5.1.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512",
-    "C:\\Users\\USER\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.3\\system.threading.tasks.extensions.4.5.3.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.text.encodings.web\\8.0.0\\system.text.encodings.web.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.text.json\\8.0.0\\system.text.json.8.0.0.nupkg.sha512",
+    "C:\\Users\\USER\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512",
     "C:\\Users\\USER\\.nuget\\packages\\system.windows.extensions\\4.6.0\\system.windows.extensions.4.6.0.nupkg.sha512"
   ],
   "logs": []

obj/project.packagespec.json

@@ -1 +1 @@
-"restore":{"projectUniqueName":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"D:\\RiderProjects\\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":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"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\\8.0.203\\RuntimeIdentifierGraph.json"}}
+"restore":{"projectUniqueName":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"D:\\RiderProjects\\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":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"EPPlus":{"target":"Package","version":"[7.2.2, )"},"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\\8.0.203\\RuntimeIdentifierGraph.json"}}

obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17265608288848838
+17265722909247533

obj/rider.project.restore.info

@@ -1 +1 @@
-17265637091769413
+17266322247535166

obj/rmutr_report.csproj.nuget.dgspec.json

@@ -46,6 +46,10 @@
               "target": "Package",
               "version": "[0.96.0, )"
             },
+            "EPPlus": {
+              "target": "Package",
+              "version": "[7.2.2, )"
+            },
             "FastReport.Core": {
               "target": "Package",
               "version": "[2021.3.0, )"

obj/rmutr_report.csproj.nuget.g.targets

@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(NuGetPackageRoot)system.text.encodings.web\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets" Condition="Exists('$(NuGetPackageRoot)system.text.encodings.web\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets')" />
+    <Import Project="$(NuGetPackageRoot)system.text.json\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Json.targets')" />
+    <Import Project="$(NuGetPackageRoot)system.text.encoding.codepages\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encoding.CodePages.targets" Condition="Exists('$(NuGetPackageRoot)system.text.encoding.codepages\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encoding.CodePages.targets')" />
+    <Import Project="$(NuGetPackageRoot)system.formats.asn1\8.0.0\buildTransitive\netcoreapp2.0\System.Formats.Asn1.targets" Condition="Exists('$(NuGetPackageRoot)system.formats.asn1\8.0.0\buildTransitive\netcoreapp2.0\System.Formats.Asn1.targets')" />
+    <Import Project="$(NuGetPackageRoot)system.security.cryptography.pkcs\8.0.0\buildTransitive\netcoreapp2.0\System.Security.Cryptography.Pkcs.targets" Condition="Exists('$(NuGetPackageRoot)system.security.cryptography.pkcs\8.0.0\buildTransitive\netcoreapp2.0\System.Security.Cryptography.Pkcs.targets')" />
     <Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.primitives\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Primitives.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.primitives\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Primitives.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.filesystemglobbing\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileSystemGlobbing.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.filesystemglobbing\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileSystemGlobbing.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.fileproviders.abstractions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileProviders.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.fileproviders.abstractions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileProviders.Abstractions.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.fileproviders.physical\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileProviders.Physical.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.fileproviders.physical\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileProviders.Physical.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.abstractions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.abstractions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.Abstractions.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.fileextensions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.FileExtensions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.fileextensions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.FileExtensions.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.json\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.Json.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.json\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.Json.targets')" />
   </ImportGroup>
 </Project>

rmutr_report.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 <ItemGroup>
   <PackageReference Include="ClosedXML" Version="0.96.0" />
+  <PackageReference Include="EPPlus" Version="7.2.2" />
   <PackageReference Include="FastReport.Core" Version="2021.3.0" />
   <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />

wwwroot/reports/durable_articles_three.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="09/17/2024 16:09:38" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="09/18/2024 11:02:10" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="durable_articles_three" ReferenceName="durable_articles_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -214,8 +214,8 @@
       </DataBand>
     </DataBand>
   </ReportPage>
-  <ReportPage Name="Page4" PaperWidth="270" PaperHeight="600" LeftMargin="25" TopMargin="20" RightMargin="15" Watermark.Font="Arial, 60pt" UnlimitedHeight="true" UnlimitedWidth="true">
+  <ReportPage Name="Page4" PaperWidth="260" PaperHeight="600" LeftMargin="25" TopMargin="20" RightMargin="15" Watermark.Font="Arial, 60pt">
-    <ReportTitleBand Name="ReportTitle3" Width="869.4" Height="28.35">
+    <ReportTitleBand Name="ReportTitle3" Width="831.6" Height="28.35">
       <TextObject Name="Text2" Width="945" Height="28.35" Text="10. คุณลักษณะเฉพาะ (Specification)" Font="TH Sarabun New, 16pt, style=Bold">
         <Formats>
           <NumberFormat/>
@@ -225,7 +225,7 @@
         </Formats>
       </TextObject>
     </ReportTitleBand>
-    <DataBand Name="Data3" Top="32.65" Width="869.4" Height="28.35" DataSource="specification_data">
+    <DataBand Name="Data3" Top="32.65" Width="831.6" Height="28.35" DataSource="specification_data">
       <TextObject Name="Text3" Width="945" Height="28.35" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.specification_data.list]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH Sarabun New, 16pt, style=Bold">
         <Formats>
           <NumberFormat/>
@@ -234,10 +234,10 @@
           <GeneralFormat/>
         </Formats>
       </TextObject>
-      <DataBand Name="Data8" Top="65.3" Width="869.4" Height="37.8" CanGrow="true" CanShrink="true" DataSource="data_detail">
+      <DataBand Name="Data8" Top="65.3" Width="831.6" Height="37.8" CanGrow="true" CanShrink="true" DataSource="data_detail">
         <TextObject Name="Text7" Width="945" Height="37.8" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.specification_data.data_detail.list]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH Sarabun New, 16pt"/>
-        <DataBand Name="Data21" Top="107.4" Width="869.4" Height="37.8" CanGrow="true" CanShrink="true" DataSource="data_detail2">
+        <DataBand Name="Data21" Top="107.4" Width="831.6" Height="37.8" CanGrow="true" CanShrink="true" DataSource="data_detail2">
-          <TextObject Name="Text8" Width="1105.65" Height="37.8" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.specification_data.data_detail.data_detail2.attribute]" Font="TH Sarabun New, 16pt"/>
+          <TextObject Name="Text8" Width="945" Height="37.8" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.specification_data.data_detail.data_detail2.attribute]" Font="TH Sarabun New, 16pt"/>
         </DataBand>
       </DataBand>
     </DataBand>
@@ -361,21 +361,21 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data16" Top="140.9" Width="831.6" Height="151.2" DataSource="durable_articles_three">
+    <DataBand Name="Data16" Top="140.9" Width="831.6" Height="85.05" DataSource="durable_articles_three">
       <TextObject Name="Text6" Width="831.6" Height="28.35" Text="13. คำชี้แจงอื่นๆ เพื่อประกอบการพิจารณา" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <TextObject Name="Text9" Top="28.35" Width="831.6" Height="94.5" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.other_clarifications]" AutoWidth="true" WordWrap="false" Font="TH Sarabun New, 16pt"/>
+      <TextObject Name="Text9" Top="28.35" Width="831.6" Height="28.35" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.other_clarifications]" AutoWidth="true" Font="TH Sarabun New, 16pt"/>
-      <TextObject Name="Text10" Top="122.85" Width="831.6" Height="28.35" Text="14. ข้อมูลใบเสนอราคา" Font="TH Sarabun New, 16pt, style=Bold"/>
+      <TextObject Name="Text10" Top="56.7" Width="831.6" Height="28.35" Text="14. ข้อมูลใบเสนอราคา" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data17" Top="296.4" Width="831.6" Height="28.35" DataSource="quotation">
+      <DataBand Name="Data17" Top="230.25" Width="831.6" Height="28.35" DataSource="quotation">
         <TextObject Name="Text12" Width="831.6" Height="28.35" Text="[durable_articles_three.quotation.company] วงเงิน [durable_articles_three.quotation.limit_price] บาท" AutoShrink="FontSize" AutoShrinkMinSize="14" Font="TH Sarabun New, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data18" Top="329.05" Width="831.6" Height="56.7">
+    <DataBand Name="Data18" Top="262.9" Width="831.6" Height="56.7">
       <TextObject Name="Text122" Width="831.6" Height="28.35" Text="15. การวิเคราะห์ครุภัณฑ์ตามวัตถุประสงค์ " Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text123" Top="28.35" Width="831.6" Height="28.35" Text="[durable_articles_three.cases]" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data19" Top="390.06" Width="831.6" Height="160.65" DataSource="invest_detail">
+      <DataBand Name="Data19" Top="323.91" Width="831.6" Height="85.05" DataSource="invest_detail">
-        <TextObject Name="Text124" Width="869.4" Height="28.35" Text="[durable_articles_three.invest_detail.list]" Font="TH Sarabun New, 16pt, style=Bold"/>
+        <TextObject Name="Text124" Width="831.6" Height="28.35" Text="[durable_articles_three.invest_detail.list]" Font="TH Sarabun New, 16pt, style=Bold"/>
-        <TextObject Name="Text133" Top="85.05" Width="888.3" Height="75.6" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.invest_detail.remark]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH Sarabun New, 16pt"/>
+        <TextObject Name="Text133" Top="28.35" Width="831.6" Height="28.35" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.invest_detail.remark]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH Sarabun New, 16pt"/>
-        <TextObject Name="Text132" Top="28.35" Width="869.4" Height="56.7" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.invest_detail.answer]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH Sarabun New, 16pt"/>
+        <TextObject Name="Text132" Top="56.7" Width="831.6" Height="28.35" CanGrow="true" CanShrink="true" CanBreak="false" Text="[durable_articles_three.invest_detail.answer]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="16" WordWrap="false" Font="TH Sarabun New, 16pt"/>
       </DataBand>
     </DataBand>
   </ReportPage>