admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-09-02 21:18:04 +00:00
parent 4a6a71649f
commit ad81e5caa2
6 changed files with 99 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
server/AyaNova/Controllers/ReportController.cs
View File

@@ -183,14 +183,7 @@ namespace AyaNova.Api.Controllers
//======================================================================================================
public class ObjectReportDataParameter
{
public AyaType ObjectType { get; set; }
public long[] SelectedRowIds { get; set; }
public string DataListKey { get; set; }
public string ListView { get; set; }//optional, if null or empty will use default list view built into DataList
}
/// <summary>
/// Get data from id list in format used by report designer
@@ -215,20 +208,22 @@ namespace AyaNova.Api.Controllers
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
Newtonsoft.Json.Linq.JArray reportData = null;
if (reportDataParam.SelectedRowIds.Length > 0)
{
//pre-selected id values
reportData = await biz.GetReportData(reportDataParam.ObjectType, reportDataParam.SelectedRowIds);
}
else
{
//get from datalist values
//get the list of id's from the data list view
var rowIds = await AyaNova.DataList.DataListFetcher.GetIdListResponseAsync(reportDataParam.DataListKey, reportDataParam.ListView, ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items), log);
//now get the report data
reportData = await biz.GetReportData(reportDataParam.ObjectType, rowIds);
}
// Newtonsoft.Json.Linq.JArray reportData = null;
// if (reportDataParam.SelectedRowIds.Length > 0)
// {
// //pre-selected id values
// reportData = await biz.GetReportData(reportDataParam.ObjectType, reportDataParam.SelectedRowIds);
// }
// else
// {
// //get from datalist values
// //get the list of id's from the data list view
// var rowIds = await AyaNova.DataList.DataListFetcher.GetIdListResponseAsync(reportDataParam.DataListKey, reportDataParam.ListView, ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items), log);
// //now get the report data
// reportData = await biz.GetReportData(reportDataParam.ObjectType, rowIds);
// }
var reportData=await biz.GetReportData(reportDataParam);
if (reportData == null)
return BadRequest(new ApiErrorResponse(biz.Errors));
@@ -257,7 +252,7 @@ namespace AyaNova.Api.Controllers
var httpConnectionFeature = HttpContext.Features.Get<IHttpConnectionFeature>();
var API_URL = $"http://127.0.0.1:{httpConnectionFeature.LocalPort}/api/v8/";
var result = await biz.RenderReport(reportParam.ReportId, reportParam.ObjectIdArray, API_URL);
var result = await biz.RenderReport(reportParam, API_URL);
if (result == null)
return BadRequest(new ApiErrorResponse(biz.Errors));
else
@@ -265,43 +260,39 @@ namespace AyaNova.Api.Controllers
}
public class RenderReportParameter
{
public long ReportId { get; set; }
public long[] ObjectIdArray { get; set; }
}
[HttpGet("render-test")]
[AllowAnonymous]
public async Task<IActionResult> GetTestReport([FromRoute] string test)
{
if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
// [HttpGet("render-test")]
// [AllowAnonymous]
// public async Task<IActionResult> GetTestReport([FromRoute] string test)
// {
// if (!serverState.IsOpen)
// return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
string outputFile = FileUtil.NewRandomTempFilesFolderFileName;
// string outputFile = FileUtil.NewRandomTempFilesFolderFileName;
switch (test)
{
case "chrome-reddit-to-pdf":
//first test, just render a web page to pdf and return it
//return PhysicalFile(filePath, mimetype, dbObject.DisplayFileName);
outputFile += ".pdf";
//http://www.puppeteersharp.com/api/index.html
//https://github.com/hardkoded/puppeteer-sharp
await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
var browser = await Puppeteer.LaunchAsync(new LaunchOptions
{
Headless = true
});
var page = await browser.NewPageAsync();
await page.GoToAsync("https://github.com/hardkoded/puppeteer-sharp");
// switch (test)
// {
// case "chrome-reddit-to-pdf":
// //first test, just render a web page to pdf and return it
// //return PhysicalFile(filePath, mimetype, dbObject.DisplayFileName);
// outputFile += ".pdf";
// //http://www.puppeteersharp.com/api/index.html
// //https://github.com/hardkoded/puppeteer-sharp
// await new BrowserFetcher().DownloadAsync(BrowserFetcher.DefaultRevision);
// var browser = await Puppeteer.LaunchAsync(new LaunchOptions
// {
// Headless = true
// });
// var page = await browser.NewPageAsync();
// await page.GoToAsync("https://github.com/hardkoded/puppeteer-sharp");
await page.PdfAsync(outputFile);
return PhysicalFile(outputFile, "application/pdf");
}
return NotFound(test);
}
// await page.PdfAsync(outputFile);
// return PhysicalFile(outputFile, "application/pdf");
// }
// return NotFound(test);
// }