diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs index f3ef20aa..515afb41 100644 --- a/server/AyaNova/biz/ContractBiz.cs +++ b/server/AyaNova/biz/ContractBiz.cs @@ -478,8 +478,9 @@ MULTIPLE discount / markup ITEMS //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { @@ -554,11 +555,11 @@ MULTIPLE discount / markup ITEMS // IMPORT EXPORT // - public async Task GetExportData(long[] idList) + public async Task GetExportData(dataListSelectedRequest) { //for now just re-use the report data code //this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time - return await GetReportData(idList); + return await GetReportData(dataListSelectedRequest); } @@ -672,6 +673,8 @@ MULTIPLE discount / markup ITEMS }//end of process notifications + + diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs index 0d3b9ba1..6f46e11a 100644 --- a/server/AyaNova/biz/CustomerBiz.cs +++ b/server/AyaNova/biz/CustomerBiz.cs @@ -355,8 +355,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { @@ -531,7 +532,7 @@ namespace AyaNova.Biz await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct); //SPECIFIC EVENTS FOR THIS OBJECT - Customer o = (Customer)proposedObj; + Customer o = (Customer)proposedObj; //## DELETED EVENTS //any event added below needs to be removed, so @@ -543,7 +544,7 @@ namespace AyaNova.Biz //## CREATED / MODIFIED EVENTS if (ayaEvent == AyaEvent.Created || ayaEvent == AyaEvent.Modified) - { + { //# CONTRACT EXPIRY { diff --git a/server/AyaNova/biz/CustomerNoteBiz.cs b/server/AyaNova/biz/CustomerNoteBiz.cs index ed1898a1..da764bc0 100644 --- a/server/AyaNova/biz/CustomerNoteBiz.cs +++ b/server/AyaNova/biz/CustomerNoteBiz.cs @@ -186,8 +186,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/CustomerServiceRequestBiz.cs b/server/AyaNova/biz/CustomerServiceRequestBiz.cs index ff3e45db..0b97cca4 100644 --- a/server/AyaNova/biz/CustomerServiceRequestBiz.cs +++ b/server/AyaNova/biz/CustomerServiceRequestBiz.cs @@ -319,8 +319,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs index 59fdd063..4758e8b7 100644 --- a/server/AyaNova/biz/HeadOfficeBiz.cs +++ b/server/AyaNova/biz/HeadOfficeBiz.cs @@ -315,8 +315,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/IReportAbleObject.cs b/server/AyaNova/biz/IReportAbleObject.cs index e1016db4..c8b30990 100644 --- a/server/AyaNova/biz/IReportAbleObject.cs +++ b/server/AyaNova/biz/IReportAbleObject.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using AyaNova.Models; using Newtonsoft.Json.Linq; namespace AyaNova.Biz { @@ -10,7 +11,7 @@ namespace AyaNova.Biz //Get items indicated in id list in report format //called by ReportBiz rendering code - Task GetReportData(long[] idList); + Task GetReportData(DataListSelectedRequest dataListSelectedRequest); const int REPORT_DATA_BATCH_SIZE = 100; } diff --git a/server/AyaNova/biz/LoanUnitBiz.cs b/server/AyaNova/biz/LoanUnitBiz.cs index 6f3ac6ca..f8c209b7 100644 --- a/server/AyaNova/biz/LoanUnitBiz.cs +++ b/server/AyaNova/biz/LoanUnitBiz.cs @@ -275,8 +275,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/MemoBiz.cs b/server/AyaNova/biz/MemoBiz.cs index 3d90452a..05002c1c 100644 --- a/server/AyaNova/biz/MemoBiz.cs +++ b/server/AyaNova/biz/MemoBiz.cs @@ -272,8 +272,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/PartAssemblyBiz.cs b/server/AyaNova/biz/PartAssemblyBiz.cs index 00650abf..b94487ed 100644 --- a/server/AyaNova/biz/PartAssemblyBiz.cs +++ b/server/AyaNova/biz/PartAssemblyBiz.cs @@ -322,8 +322,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/PartBiz.cs b/server/AyaNova/biz/PartBiz.cs index 07037c05..4059ddea 100644 --- a/server/AyaNova/biz/PartBiz.cs +++ b/server/AyaNova/biz/PartBiz.cs @@ -498,8 +498,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/PartInventoryBiz.cs b/server/AyaNova/biz/PartInventoryBiz.cs index e968ae6c..3a479bdb 100644 --- a/server/AyaNova/biz/PartInventoryBiz.cs +++ b/server/AyaNova/biz/PartInventoryBiz.cs @@ -272,8 +272,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/PartWarehouseBiz.cs b/server/AyaNova/biz/PartWarehouseBiz.cs index 7358ba58..325cd767 100644 --- a/server/AyaNova/biz/PartWarehouseBiz.cs +++ b/server/AyaNova/biz/PartWarehouseBiz.cs @@ -280,8 +280,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/ProjectBiz.cs b/server/AyaNova/biz/ProjectBiz.cs index 0a8ffb49..d292f951 100644 --- a/server/AyaNova/biz/ProjectBiz.cs +++ b/server/AyaNova/biz/ProjectBiz.cs @@ -268,8 +268,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index 91d2e821..7dd641f5 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -670,8 +670,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/ReminderBiz.cs b/server/AyaNova/biz/ReminderBiz.cs index 3aad1c7a..fc04b4f8 100644 --- a/server/AyaNova/biz/ReminderBiz.cs +++ b/server/AyaNova/biz/ReminderBiz.cs @@ -265,8 +265,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index 9441c355..d1498ab1 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -364,7 +364,7 @@ namespace AyaNova.Biz log.LogDebug($"Instantiating biz object handler for {selectedRequest.AType}"); var biz = BizObjectFactory.GetBizObject(selectedRequest.AType, ct, UserId, CurrentUserRoles, UserTranslationId); log.LogDebug($"Fetching data for {selectedRequest.SelectedRowIds.Length} {selectedRequest.AType} items"); - return await ((IReportAbleObject)biz).GetReportData(selectedRequest.SelectedRowIds); + return await ((IReportAbleObject)biz).GetReportData(selectedRequest); } diff --git a/server/AyaNova/biz/ReviewBiz.cs b/server/AyaNova/biz/ReviewBiz.cs index cc866a8e..d78c797e 100644 --- a/server/AyaNova/biz/ReviewBiz.cs +++ b/server/AyaNova/biz/ReviewBiz.cs @@ -326,8 +326,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/ServiceBankBiz.cs b/server/AyaNova/biz/ServiceBankBiz.cs index b48bba5d..840d5e91 100644 --- a/server/AyaNova/biz/ServiceBankBiz.cs +++ b/server/AyaNova/biz/ServiceBankBiz.cs @@ -264,7 +264,7 @@ // //////////////////////////////////////////////////////////////////////////////////////////////// // //REPORTING // // -// public async Task GetReportData(long[] idList) +// public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) // { // JArray ReportData = new JArray(); // while (idList.Any()) diff --git a/server/AyaNova/biz/ServiceRateBiz.cs b/server/AyaNova/biz/ServiceRateBiz.cs index a0d4219e..ef4504b5 100644 --- a/server/AyaNova/biz/ServiceRateBiz.cs +++ b/server/AyaNova/biz/ServiceRateBiz.cs @@ -299,8 +299,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/TaskGroupBiz.cs b/server/AyaNova/biz/TaskGroupBiz.cs index b1c245e2..0831d6a5 100644 --- a/server/AyaNova/biz/TaskGroupBiz.cs +++ b/server/AyaNova/biz/TaskGroupBiz.cs @@ -284,8 +284,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/TaxCodeBiz.cs b/server/AyaNova/biz/TaxCodeBiz.cs index f4c05c4b..20950170 100644 --- a/server/AyaNova/biz/TaxCodeBiz.cs +++ b/server/AyaNova/biz/TaxCodeBiz.cs @@ -330,8 +330,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/TravelRateBiz.cs b/server/AyaNova/biz/TravelRateBiz.cs index 18d906e4..a8818ca6 100644 --- a/server/AyaNova/biz/TravelRateBiz.cs +++ b/server/AyaNova/biz/TravelRateBiz.cs @@ -295,8 +295,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/UnitBiz.cs b/server/AyaNova/biz/UnitBiz.cs index f1dbcb17..0850c6c7 100644 --- a/server/AyaNova/biz/UnitBiz.cs +++ b/server/AyaNova/biz/UnitBiz.cs @@ -294,8 +294,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/UnitModelBiz.cs b/server/AyaNova/biz/UnitModelBiz.cs index 65891853..bb655fd9 100644 --- a/server/AyaNova/biz/UnitModelBiz.cs +++ b/server/AyaNova/biz/UnitModelBiz.cs @@ -276,8 +276,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index fc7e3b5e..2607cf21 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -996,8 +996,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/VendorBiz.cs b/server/AyaNova/biz/VendorBiz.cs index cdd328c9..10556777 100644 --- a/server/AyaNova/biz/VendorBiz.cs +++ b/server/AyaNova/biz/VendorBiz.cs @@ -312,8 +312,9 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 0de72376..0f8db3fe 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -347,7 +347,7 @@ namespace AyaNova.Biz } //Fulfil report request for data - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { //NOTE: Report widget is a superset of biz object widget //Biz objects will add and needed linked records here as extra fields with the data included @@ -356,6 +356,7 @@ namespace AyaNova.Biz //REMEMBER: there is a name display format system and it should honour that so that the report //displays a user the same as it would display in the UI in an input form, no surprises + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) { @@ -370,7 +371,7 @@ namespace AyaNova.Biz //usertypes var UserTypesEnumList = await AyaNova.Api.Controllers.EnumListController.GetEnumList( StringUtil.TrimTypeName(typeof(UserType).ToString()), - UserTranslationId, + UserTranslationId, CurrentUserRoles); foreach (Widget w in orderedList) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 4e30437d..5d9b48a7 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -763,10 +763,10 @@ namespace AyaNova.Biz //////////////////////////////////////////////////////////////////////////////////////////////// //REPORTING // - public async Task GetReportData(long[] idList) + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) { - + var idList = dataListSelectedRequest.SelectedRowIds; JArray ReportData = new JArray(); while (idList.Any()) {