From 1ad6246b8d89a0aa28a70b9dd45e22dcbf003028 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Tue, 30 Jul 2024 11:36:27 -0700 Subject: [PATCH] Bug fix for export --- Server/ApiControllers/ExportController.cs | 2 +- Static/js/export.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/ApiControllers/ExportController.cs b/Server/ApiControllers/ExportController.cs index f63ab16..06dbdf2 100644 --- a/Server/ApiControllers/ExportController.cs +++ b/Server/ApiControllers/ExportController.cs @@ -98,7 +98,7 @@ public class ExportController : Controller, IExportController public IActionResult GetCSVExport(int toolTypeId, [FromQuery] string? datebegin, [FromQuery] string? dateend, [FromQuery] string? filename) { string r = _ExportRepository.GetCSVExport(_MetrologyRepository, toolTypeId, datebegin, dateend); - return File(r, "application/octet-stream", filename); + return Content(r); } } \ No newline at end of file diff --git a/Static/js/export.js b/Static/js/export.js index faa2c70..b6488bb 100644 --- a/Static/js/export.js +++ b/Static/js/export.js @@ -20,7 +20,7 @@ function getParams() { function postExport() { parms = getParams(); var toolTypeID = $("#ToolType").igCombo("value"); - var url = _apiUrl + "/Export/" + toolTypeID + "/export"; + var url = _apiUrl + "/Export/" + toolTypeID + "/csv"; $.get(url, parms, function (data) { var blob = new Blob([data], { type: "text/plain;charset=utf-8",