diff --git a/server/AyaNova/DataList/PartInventoryRequestDataList.cs b/server/AyaNova/DataList/PartInventoryRequestDataList.cs index ba1489f6..7ace2af5 100644 --- a/server/AyaNova/DataList/PartInventoryRequestDataList.cs +++ b/server/AyaNova/DataList/PartInventoryRequestDataList.cs @@ -8,7 +8,7 @@ namespace AyaNova.DataList { public PartInventoryRequestDataList() { - DefaultListAType = AyaType.PurchaseOrder; + DefaultListAType = AyaType.PartInventoryRequestDataList; SQLFrom = "from viewworkorder " + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + "left join acustomer on (viewworkorder.customerid=acustomer.id) " diff --git a/server/AyaNova/biz/AyaType.cs b/server/AyaNova/biz/AyaType.cs index 6abe9860..fba174f7 100644 --- a/server/AyaNova/biz/AyaType.cs +++ b/server/AyaNova/biz/AyaType.cs @@ -167,7 +167,8 @@ namespace AyaNova.Biz [CoreBizObject] PMItemUnit = 88, PMItemOutsideService = 89, - PartInventoryDataList = 90//for list/reporting only, synthetic object + PartInventoryDataList = 90,//for list/reporting only, synthetic object + PartInventoryRequestDataList = 91//for list/reporting only, synthetic object diff --git a/server/AyaNova/biz/BizObjectFactory.cs b/server/AyaNova/biz/BizObjectFactory.cs index bd293099..f3084e0f 100644 --- a/server/AyaNova/biz/BizObjectFactory.cs +++ b/server/AyaNova/biz/BizObjectFactory.cs @@ -63,6 +63,8 @@ namespace AyaNova.Biz return new PartInventoryBiz(ct, userId, translationId, roles); case AyaType.PartInventoryDataList: return new PartInventoryDataListBiz(ct, userId, translationId, roles); + case AyaType.PartInventoryRequestDataList: + return new PartInventoryRequestDataListBiz(ct, userId, translationId, roles); case AyaType.Project: diff --git a/server/AyaNova/biz/BizRoles.cs b/server/AyaNova/biz/BizRoles.cs index fb3f5d12..b8c16bb6 100644 --- a/server/AyaNova/biz/BizRoles.cs +++ b/server/AyaNova/biz/BizRoles.cs @@ -257,8 +257,24 @@ namespace AyaNova.Biz Select = AuthorizationRoles.All }); + ///////////////////////////////////////////////////////////////// + //PartInventoryRequestDataList + // same as PO + // + roles.Add(AyaType.PartInventoryRequestDataList, new BizRoleSet() + { + Change = AuthorizationRoles.Inventory + | AuthorizationRoles.BizAdmin + | AuthorizationRoles.Accounting, + ReadFullRecord = AuthorizationRoles.Service + | AuthorizationRoles.InventoryRestricted + | AuthorizationRoles.BizAdminRestricted + | AuthorizationRoles.ServiceRestricted, + Select = AuthorizationRoles.All + }); + //////////////////////////////////////////////////////////// //Project // diff --git a/server/AyaNova/biz/PartInventoryRequestDataListBiz.cs b/server/AyaNova/biz/PartInventoryRequestDataListBiz.cs new file mode 100644 index 00000000..7d983b6e --- /dev/null +++ b/server/AyaNova/biz/PartInventoryRequestDataListBiz.cs @@ -0,0 +1,104 @@ +using System; +using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using System.Linq; +using AyaNova.Util; +using AyaNova.Api.ControllerHelpers; +using AyaNova.Models; +using Newtonsoft.Json.Linq; +using System.Collections.Generic; + +namespace AyaNova.Biz +{ + internal class PartInventoryRequestDataListBiz : BizObject, IReportAbleObject, IExportAbleObject + { + internal PartInventoryRequestDataListBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles) + { + ct = dbcontext; + UserId = currentUserId; + UserTranslationId = userTranslationId; + CurrentUserRoles = UserRoles; + BizType = AyaType.PartInventoryRequestDataList; + } + + internal static PartInventoryRequestDataListBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext = null) + { + if (httpContext != null) + return new PartInventoryRequestDataListBiz(ct, UserIdFromContext.Id(httpContext.Items), UserTranslationIdFromContext.Id(httpContext.Items), UserRolesFromContext.Roles(httpContext.Items)); + else + return new PartInventoryRequestDataListBiz(ct, 1, ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID, AuthorizationRoles.BizAdmin); + } + + + + + //////////////////////////////////////////////////////////////////////////////////////////////// + //REPORTING + // + public async Task GetReportData(DataListSelectedRequest dataListSelectedRequest) + { + var idList = dataListSelectedRequest.SelectedRowIds; + JArray ReportData = new JArray(); + while (idList.Any()) + { + var batch = idList.Take(IReportAbleObject.REPORT_DATA_BATCH_SIZE); + idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray(); + //query for this batch, comes back in db natural order unfortunately + var batchResults = await ct.ViewPartRequestList.AsNoTracking().Where(z => batch.Contains(z.RequestId)).ToArrayAsync(); + //order the results back into original + var orderedList = from id in batch join z in batchResults on id equals z.RequestId select z; + + //cache frequent viz data + var AyaTypesEnumList = await AyaNova.Api.Controllers.EnumListController.GetEnumList( + StringUtil.TrimTypeName(typeof(AyaType).ToString()), + UserTranslationId, + CurrentUserRoles); + // using (var command = ct.Database.GetDbConnection().CreateCommand()) + // { + // ct.Database.OpenConnection(); + + foreach (ViewPartRequestList w in orderedList) + { + //await PopulateVizFields(w, AyaTypesEnumList, command); + var jo = JObject.FromObject(w); + ReportData.Add(jo); + } + //} + } + return ReportData; + } + + // //populate viz fields from provided object + // private async Task PopulateVizFields(VPartInventoryList o, List ayaTypesEnumList, System.Data.Common.DbCommand cmd) + // { + // o.PartViz = await ct.Part.AsNoTracking().Where(x => x.Id == o.PartId).Select(x => x.PartNumber).FirstOrDefaultAsync(); + // o.PartWarehouseViz = await ct.PartWarehouse.AsNoTracking().Where(x => x.Id == o.PartWarehouseId).Select(x => x.Name).FirstOrDefaultAsync(); + // if (o.SourceType != null) + // o.SourceTypeViz = ayaTypesEnumList.Where(x => x.Id == (long)o.SourceType).Select(x => x.Name).First(); + // if (o.SourceType != null && o.SourceId != null) + // o.SourceViz = BizObjectNameFetcherDirect.Name((AyaType)o.SourceType, (long)o.SourceId, cmd); + + // } + + //////////////////////////////////////////////////////////////////////////////////////////////// + // IMPORT EXPORT + // + public async Task GetExportData(DataListSelectedRequest 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(dataListSelectedRequest); + } + + + + + + + ///////////////////////////////////////////////////////////////////// + + }//eoc + + +}//eons +