diff --git a/Controllers/building_four.Controller.cs b/Controllers/building_four.Controller.cs index e03baf7..7db7866 100644 --- a/Controllers/building_four.Controller.cs +++ b/Controllers/building_four.Controller.cs @@ -55,36 +55,6 @@ namespace rmutr_report.Controllers } } - // foreach (var bb in building_fours.material_construction_labor1) - // { - // if (bb != null) - // { - // bb.total_amount = bb.material_cost + bb.labor_unit; - // var f = building_fours.material_construction_labor1.Where(d => d.total_amount == d.total_amount) - // .Sum(o => o.total_amount); - // building_fours.material_total_amount1 = f; - // } - // } - // foreach (var bb in building_fours.material_construction_labor2) - // { - // if (bb != null) - // { - // bb.total_amount = bb.material_cost + bb.labor_unit; - // var f = building_fours.material_construction_labor2.Where(d => d.total_amount == d.total_amount) - // .Sum(o => o.total_amount); - // building_fours.material_total_amount2 = f; - // } - // } - // foreach (var bb in building_fours.material_construction_labor3) - // { - // if (bb != null) - // { - // bb.total_amount = bb.material_cost + bb.labor_unit; - // var f = building_fours.material_construction_labor3.Where(d => d.total_amount == d.total_amount) - // .Sum(o => o.total_amount); - // building_fours.material_total_amount3 = f; - // } - // } foreach (var cc in building_fours.budget_limit) { if (cc != null) @@ -157,11 +127,6 @@ namespace rmutr_report.Controllers boqPrice.list = num.Insert(i, ",").Insert(j,","); } } - - if (boqPrice.list=="20000000.0000") - { - boqPrice.list = "20,000,000"; - } } } @@ -249,22 +214,13 @@ namespace rmutr_report.Controllers MemoryStream stream = new MemoryStream(); switch (type) { - case "view": - return File(stream, "application/pdf"); case "pdf": PDFExport pdf = new PDFExport(); report.Export(pdf, stream); stream.Seek(0, SeekOrigin.Begin); return File(stream, "application/pdf"); - - case "xls": - case "xlsx": - Excel2007Export excel = new Excel2007Export(); - report.Export(excel, stream); - stream.Seek(0, SeekOrigin.Begin); - return File(stream, "application/vnd.ms-excel"); - break; - case "mht": +break; + case "mht": MHTExport mht = new MHTExport(); report.Export(mht, stream); stream.Seek(0, SeekOrigin.Begin); @@ -283,6 +239,13 @@ namespace rmutr_report.Controllers stream.Seek(0, SeekOrigin.Begin); return File(stream, "appllication/vnd.ms-word"); break; + case "xls": + case "xlsx": + Excel2007Export excel = new Excel2007Export(); + report.Export(excel, stream); + stream.Seek(0, SeekOrigin.Begin); + return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + } return Ok(); diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 9f63744..5a82fd1 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 7d40e30..9cbb129 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 43a8b52..2e3122f 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+5c4bae857bc7731c03d6f641c4b7ffb07a4df4bd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+62b89761e4408c34432792a460f625f3b1f02621")] [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 f0cf515..33c4330 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -ddf2405b759c6c2ebd7aa655aeb0706a1f3f1f7a3bd1552339b8f59a64ffd20f +af78a55515ddc44785f72674741ae92199a733cc3e3fd8e09e0f802217ac26b2 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 43a8b52..2e3122f 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+5c4bae857bc7731c03d6f641c4b7ffb07a4df4bd")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+62b89761e4408c34432792a460f625f3b1f02621")] [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 f0cf515..33c4330 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -ddf2405b759c6c2ebd7aa655aeb0706a1f3f1f7a3bd1552339b8f59a64ffd20f +af78a55515ddc44785f72674741ae92199a733cc3e3fd8e09e0f802217ac26b2 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index ef3c634..034871b 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -08619e1b8ba5e27a3732f2f406b29a11619bf4ec3fadc7dbee79f3643968f813 +4e66a5d696d08ba89e54f91b44e3502e73b9e9c4972026ea84e08f534fe851c2 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 9f63744..5a82fd1 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 7d40e30..9cbb129 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 4470696..0ccaa65 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 @@ -256,6 +256,22 @@ PreserveNewest $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours.frx)) + + Package + rmutr_report + $(MSBuildThisFileDirectory)..\staticwebassets\ + _content/rmutr_report + reports\building_fours_1.frx + + + + + + + + PreserveNewest + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\building_fours_1.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 5b22b50..1ae2371 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 @@ -13cdb6bff8b6334d2005de7ec93a4a0ae5333f90c9132f14305e07a5ef439f62 +c50bede8becdc099c2f6e83e533c61274065063dd9f82764a97f4e0ec79d5558 diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 792a9ac..ea90f24 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17267381672918703 \ No newline at end of file +17267451316870137 \ No newline at end of file diff --git a/wwwroot/reports/building_fours.frx b/wwwroot/reports/building_fours.frx index 34704d2..0f26449 100644 --- a/wwwroot/reports/building_fours.frx +++ b/wwwroot/reports/building_fours.frx @@ -1,5 +1,5 @@  - + @@ -395,28 +395,28 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + @@ -424,23 +424,23 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -450,31 +450,31 @@ - - - - - - - - + + + + + + + + - - - - - - + + + + + + - + - - + + - - + + @@ -483,7 +483,7 @@ - + @@ -491,18 +491,18 @@ - - - - - + + + + + - + @@ -516,13 +516,13 @@ - + - - + + - - + + @@ -531,7 +531,7 @@ - + @@ -542,45 +542,45 @@ - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + @@ -588,12 +588,12 @@ - - - - - - + + + + + + @@ -601,12 +601,12 @@ - - - - - - + + + + + + @@ -617,26 +617,26 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -698,7 +698,7 @@ - + @@ -756,7 +756,7 @@ - + @@ -769,7 +769,7 @@ - + @@ -797,7 +797,7 @@ - + @@ -859,7 +859,7 @@ - + @@ -876,7 +876,7 @@ - + @@ -944,7 +944,7 @@ - + @@ -1012,7 +1012,7 @@ - + @@ -1029,7 +1029,7 @@ - + @@ -1049,7 +1049,7 @@ - + @@ -1106,7 +1106,7 @@ - + @@ -1119,7 +1119,7 @@ - + @@ -1205,7 +1205,7 @@ - + @@ -1232,7 +1232,7 @@ - + @@ -1304,7 +1304,7 @@ - + @@ -1331,7 +1331,7 @@ - + @@ -1403,7 +1403,7 @@ - + @@ -1430,7 +1430,7 @@ - + @@ -1502,7 +1502,7 @@ - + @@ -1529,7 +1529,7 @@ - + @@ -1601,7 +1601,7 @@ - + @@ -1628,7 +1628,7 @@ - + @@ -1700,7 +1700,7 @@ - + @@ -1727,7 +1727,7 @@ - + @@ -1799,7 +1799,7 @@ - + @@ -1826,7 +1826,7 @@ - + @@ -1898,7 +1898,7 @@ - + @@ -1925,7 +1925,7 @@ - + @@ -1997,7 +1997,7 @@ - + @@ -2024,7 +2024,7 @@ - + @@ -2057,11 +2057,11 @@ - - + + - + @@ -2078,7 +2078,7 @@ - + @@ -2097,13 +2097,13 @@ - + - - - - - + + + + + diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index c314af7..eeb17b3 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -225,7 +225,7 @@ - +