diff --git a/Controllers/durable_articles_three.Controller.cs b/Controllers/durable_articles_three.Controller.cs index 114184a..ffdbd74 100644 --- a/Controllers/durable_articles_three.Controller.cs +++ b/Controllers/durable_articles_three.Controller.cs @@ -75,23 +75,23 @@ namespace rmutr_report.Controllers ShowProgress = true, PageBreaks = true }; - report.Export(excelExport, stream); - - stream.Seek(0, SeekOrigin.Begin); - // using (var package = new ExcelPackage(stream)) + // var textObject3 = report.FindObject("Text3") as FastReport.TextObject; + // var textObject7 = report.FindObject("Text7") as FastReport.TextObject; + // var textObject8 = report.FindObject("Text8") as FastReport.TextObject; + // if (textObject3 != null) // { - // 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(); + // textObject3.WordWrap = true; // } - // - // stream.Seek(0, SeekOrigin.Begin); + // if (textObject7 != null) + // { + // textObject7.WordWrap = true; + // } + // if (textObject8 != null) + // { + // textObject8.WordWrap = true; + //} + report.Export(excelExport, stream); + stream.Seek(0, SeekOrigin.Begin); return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 0e7de94..4f92683 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 7e0589e..da7d8e1 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index 58a0053..6d50651 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs +++ b/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+ad0b43ca48bec5b06b9d28038409fb43c50ccec5")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+106a9782697b2736e57b96f6b7e7cf516eec411c")] [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 8354a4a..f426c82 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -dc5eabf09b58379b53feb30709b996c5032760611cba7922a37905f04ffadfb5 +12f036e5d046ba9b0599463b4a985586778539b6135c07e833f9e63bd06caa19 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 58a0053..6d50651 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs +++ b/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+ad0b43ca48bec5b06b9d28038409fb43c50ccec5")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+106a9782697b2736e57b96f6b7e7cf516eec411c")] [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/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache index 8354a4a..f426c82 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -dc5eabf09b58379b53feb30709b996c5032760611cba7922a37905f04ffadfb5 +12f036e5d046ba9b0599463b4a985586778539b6135c07e833f9e63bd06caa19 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index 2eba7e5..a3c6ecf 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -68de01a6bd7215a94454eb302693f9228d732e4e8151a0ca1a8cd5a493df713b +64159ceab84e820c79b59f2a97adace7158e33caf3827afa4ca495de04705546 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 0e7de94..4f92683 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 7e0589e..da7d8e1 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props index aa97529..f5f4090 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props +++ b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props @@ -576,6 +576,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\durable_articles_three_old.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\durable_articles_three_v1.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\durable_articles_three_v1.frx)) + Package rmutr_report diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index c806e58..87d2cab 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -1e00466f0b88109f048610c7645c46c929b7a4dd3b6d32b115f372c65af39b3a +55bc044448429e1c530fe751e53f25556ac50f37a37299c368138242061eff81 diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index e89f14c..34b4c09 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17267261645160802 \ No newline at end of file +17267305264526060 \ No newline at end of file diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index abb4593..3a7efd5 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -159,7 +159,7 @@ - + @@ -214,9 +214,9 @@ - - - + + + @@ -224,8 +224,8 @@ - - + + @@ -233,10 +233,10 @@ - - - - + + + +