diff --git a/server/AyaNova/Controllers/ReportController.cs b/server/AyaNova/Controllers/ReportController.cs index 8e7ddf5f..d1972cca 100644 --- a/server/AyaNova/Controllers/ReportController.cs +++ b/server/AyaNova/Controllers/ReportController.cs @@ -188,7 +188,7 @@ namespace AyaNova.Api.Controllers /// From route path /// [HttpPost("data")] - public async Task GetReportData([FromBody] ReportDataParameter reportDataParam, ApiVersion apiVersion) + public async Task GetReportData([FromBody] DataListSelection reportDataParam, ApiVersion apiVersion) { if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index acc52214..57b5d5db 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -316,7 +316,7 @@ namespace AyaNova.Biz //REPORT DATA //Data fetched to return to report designer for Client report design usage - public async Task GetReportData(ReportDataParameter reportDataParam, AuthorizationRoles overrideRoles = AuthorizationRoles.NoRole) + public async Task GetReportData(DataListSelection reportDataParam, AuthorizationRoles overrideRoles = AuthorizationRoles.NoRole) { var log = AyaNova.Util.ApplicationLogging.CreateLogger("ReportBiz::GetReportData"); AuthorizationRoles effectiveRoles = CurrentUserRoles; @@ -381,7 +381,7 @@ namespace AyaNova.Biz //Get data - var ReportData = await GetReportData(new ReportDataParameter() { ObjectType = report.ObjectType, SelectedRowIds = reportParam.SelectedRowIds, DataListKey = reportParam.DataListKey, ListView = reportParam.ListView }); + var ReportData = await GetReportData(new DataListSelection() { ObjectType = report.ObjectType, SelectedRowIds = reportParam.SelectedRowIds, DataListKey = reportParam.DataListKey, ListView = reportParam.ListView }); //initialization log.LogDebug("Initializing report system"); diff --git a/server/AyaNova/models/dto/DataListSelection.cs b/server/AyaNova/models/dto/DataListSelection.cs new file mode 100644 index 00000000..f79e0105 --- /dev/null +++ b/server/AyaNova/models/dto/DataListSelection.cs @@ -0,0 +1,15 @@ +using AyaNova.Biz; +using Newtonsoft.Json.Linq; +namespace AyaNova.Models +{ + public class DataListSelection + { + 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 + + } + + +} diff --git a/server/AyaNova/models/dto/ReportingModels.cs b/server/AyaNova/models/dto/RenderReportParameter.cs similarity index 59% rename from server/AyaNova/models/dto/ReportingModels.cs rename to server/AyaNova/models/dto/RenderReportParameter.cs index 9fea3879..26525c19 100644 --- a/server/AyaNova/models/dto/ReportingModels.cs +++ b/server/AyaNova/models/dto/RenderReportParameter.cs @@ -2,15 +2,7 @@ using AyaNova.Biz; using Newtonsoft.Json.Linq; namespace AyaNova.Models { - public class ReportDataParameter - { - 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 - - } - + public class RenderReportParameter { public long ReportId { get; set; }