From c9c73cb4544c441599d9b62281c8ddd2b67229d8 Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Fri, 28 Oct 2022 14:08:31 +0700 Subject: [PATCH] fix logo image --- Controllers/KPI.Controller.cs | 1 + Controllers/Summary.Controller.cs | 11 ++++++----- wwwroot/{ => reports}/Logo-RMUTR.png | Bin 3 files changed, 7 insertions(+), 5 deletions(-) rename wwwroot/{ => reports}/Logo-RMUTR.png (100%) diff --git a/Controllers/KPI.Controller.cs b/Controllers/KPI.Controller.cs index 2bb8103..9a64baf 100644 --- a/Controllers/KPI.Controller.cs +++ b/Controllers/KPI.Controller.cs @@ -230,5 +230,6 @@ namespace rmutr_report.Controllers "kpi_" + date + ".xlsx"); } } + } } \ No newline at end of file diff --git a/Controllers/Summary.Controller.cs b/Controllers/Summary.Controller.cs index d31bb72..d377c40 100644 --- a/Controllers/Summary.Controller.cs +++ b/Controllers/Summary.Controller.cs @@ -77,7 +77,7 @@ namespace rmutr_report.Controllers { var workbook = new XLWorkbook(); var ws = workbook.Worksheets.Add("รายการครุภัณฑ์"); - var imagePath = @"C:\Users\Mercedes Benz\Documents\rmutr_report\wwwroot\Logo-RMUTR.png"; + var imagePath = _setting.report_path + @"Logo-RMUTR.png"; ws.AddPicture(imagePath).MoveTo(ws.Cell("A1")).Scale(0.27); ws.Range("A1:P1").Merge().Value = "สรุปแผนความต้องการ รายการครุภัณฑ์ ของมหาวิทยาลัยเทคโนโลยีราชมงคลรัตนโกสินทร์"; @@ -200,10 +200,10 @@ namespace rmutr_report.Controllers ws.Column(14).Width = 10; ws.Column(15).Width = 10; ws.Column(16).Width = 50; - + int row = 5; int no = 1; - + foreach (var equipments in summary_of_equipments) { if (summary_of_equipments != null) @@ -312,7 +312,7 @@ namespace rmutr_report.Controllers } } } - + using (var stream = new MemoryStream()) { workbook.SaveAs(stream); @@ -408,6 +408,7 @@ namespace rmutr_report.Controllers return Ok(); } + [HttpPost, Route("reports/summary_building_construction/{type}")] [ApiExplorerSettings(GroupName = "reports")] public IActionResult GetSum2Report([FromRoute] string type, @@ -416,7 +417,7 @@ namespace rmutr_report.Controllers { var workbook = new XLWorkbook(); var ws = workbook.Worksheets.Add("รายการก่อสร้างอาคาร"); - var imagePath = @"C:\Users\Mercedes Benz\Documents\rmutr_report\wwwroot\Logo-RMUTR.png"; + var imagePath = _setting.report_path + @"Logo-RMUTR.png"; ws.AddPicture(imagePath).MoveTo(ws.Cell("A1")).Scale(0.3); ws.Range("A4:A6").Merge().Value = "ลำดับความสำคัญ(1)"; ws.Range("A4:A6").Style.Alignment.WrapText = true; diff --git a/wwwroot/Logo-RMUTR.png b/wwwroot/reports/Logo-RMUTR.png similarity index 100% rename from wwwroot/Logo-RMUTR.png rename to wwwroot/reports/Logo-RMUTR.png