This commit is contained in:
@@ -186,18 +186,28 @@ namespace AyaNova.Api.Controllers
|
||||
public class ObjectReportDataParameter
|
||||
{
|
||||
public AyaType ObjectType { get; set; }
|
||||
public long[] ObjectIdArray { 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
|
||||
/// </summary>
|
||||
/// <param name="reportDataParam">report id and object id values for object type specified in report template</param>
|
||||
/// <param name="reportDataParam">Data required for report</param>
|
||||
/// <param name="apiVersion">From route path</param>
|
||||
/// <returns></returns>
|
||||
[HttpPost("object-report-data")]
|
||||
public async Task<IActionResult> GetReportData([FromBody] ObjectReportDataParameter reportDataParam, ApiVersion apiVersion)
|
||||
{
|
||||
/*{
|
||||
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
|
||||
|
||||
}*/
|
||||
if (!serverState.IsOpen)
|
||||
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
|
||||
ReportBiz biz = ReportBiz.GetBiz(ct, HttpContext);
|
||||
@@ -205,7 +215,22 @@ namespace AyaNova.Api.Controllers
|
||||
if (!ModelState.IsValid)
|
||||
return BadRequest(new ApiErrorResponse(ModelState));
|
||||
|
||||
var reportData = await biz.GetReportData(reportDataParam.ObjectType, reportDataParam.ObjectIdArray);
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
if (reportData == null)
|
||||
return BadRequest(new ApiErrorResponse(biz.Errors));
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user