From a944fb10e15a82f3914ceb5674138b339ead0b29 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 3 Sep 2021 23:48:41 +0000 Subject: [PATCH] --- server/AyaNova/biz/BizObjectFactory.cs | 5 ++- server/AyaNova/biz/ContractBiz.cs | 2 +- server/AyaNova/biz/CustomerBiz.cs | 2 +- server/AyaNova/biz/CustomerNoteBiz.cs | 2 +- .../AyaNova/biz/CustomerServiceRequestBiz.cs | 2 +- server/AyaNova/biz/HeadOfficeBiz.cs | 2 +- server/AyaNova/biz/ISearchAbleObject.cs | 2 +- server/AyaNova/biz/LoanUnitBiz.cs | 2 +- server/AyaNova/biz/MemoBiz.cs | 2 +- server/AyaNova/biz/PMBiz.cs | 2 +- server/AyaNova/biz/PartAssemblyBiz.cs | 2 +- server/AyaNova/biz/PartBiz.cs | 2 +- server/AyaNova/biz/PartInventoryBiz.cs | 2 +- server/AyaNova/biz/PartWarehouseBiz.cs | 2 +- server/AyaNova/biz/ProjectBiz.cs | 2 +- server/AyaNova/biz/PurchaseOrderBiz.cs | 2 +- server/AyaNova/biz/QuoteBiz.cs | 2 +- server/AyaNova/biz/QuoteStatusBiz.cs | 2 +- server/AyaNova/biz/ReminderBiz.cs | 2 +- server/AyaNova/biz/ReportBiz.cs | 2 +- server/AyaNova/biz/ReviewBiz.cs | 2 +- server/AyaNova/biz/Search.cs | 2 +- server/AyaNova/biz/ServiceBankBiz.cs | 2 +- server/AyaNova/biz/ServiceRateBiz.cs | 2 +- server/AyaNova/biz/TaskGroupBiz.cs | 2 +- server/AyaNova/biz/TaxCodeBiz.cs | 2 +- server/AyaNova/biz/TravelRateBiz.cs | 2 +- server/AyaNova/biz/UnitBiz.cs | 2 +- server/AyaNova/biz/UnitMeterReadingBiz.cs | 2 +- server/AyaNova/biz/UnitModelBiz.cs | 2 +- server/AyaNova/biz/UserBiz.cs | 2 +- server/AyaNova/biz/VendorBiz.cs | 2 +- server/AyaNova/biz/WidgetBiz.cs | 2 +- server/AyaNova/biz/WorkOrderBiz.cs | 43 +++++++++++++++---- .../AyaNova/biz/WorkOrderItemPriorityBiz.cs | 2 +- server/AyaNova/biz/WorkOrderItemStatusBiz.cs | 2 +- server/AyaNova/biz/WorkOrderStatusBiz.cs | 2 +- 37 files changed, 73 insertions(+), 45 deletions(-) diff --git a/server/AyaNova/biz/BizObjectFactory.cs b/server/AyaNova/biz/BizObjectFactory.cs index f3084e0f..23b2d688 100644 --- a/server/AyaNova/biz/BizObjectFactory.cs +++ b/server/AyaNova/biz/BizObjectFactory.cs @@ -63,7 +63,7 @@ namespace AyaNova.Biz return new PartInventoryBiz(ct, userId, translationId, roles); case AyaType.PartInventoryDataList: return new PartInventoryDataListBiz(ct, userId, translationId, roles); - case AyaType.PartInventoryRequestDataList: + case AyaType.PartInventoryRequestDataList: return new PartInventoryRequestDataListBiz(ct, userId, translationId, roles); @@ -128,6 +128,9 @@ namespace AyaNova.Biz return new PMBiz(ct, userId, translationId, roles, UserType.Service); //--- + case AyaType.WorkOrderStatus: + return new WorkOrderStatusBiz(ct, userId, translationId, roles); + case AyaType.Reminder: return new ReminderBiz(ct, userId, translationId, roles); case AyaType.Review: diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs index 5e16252f..25c1f0a2 100644 --- a/server/AyaNova/biz/ContractBiz.cs +++ b/server/AyaNova/biz/ContractBiz.cs @@ -261,7 +261,7 @@ MULTIPLE discount / markup ITEMS await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs index a9052e04..3b657a45 100644 --- a/server/AyaNova/biz/CustomerBiz.cs +++ b/server/AyaNova/biz/CustomerBiz.cs @@ -222,7 +222,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/CustomerNoteBiz.cs b/server/AyaNova/biz/CustomerNoteBiz.cs index 95fee497..504eb37d 100644 --- a/server/AyaNova/biz/CustomerNoteBiz.cs +++ b/server/AyaNova/biz/CustomerNoteBiz.cs @@ -160,7 +160,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/CustomerServiceRequestBiz.cs b/server/AyaNova/biz/CustomerServiceRequestBiz.cs index 214f7116..652f47a5 100644 --- a/server/AyaNova/biz/CustomerServiceRequestBiz.cs +++ b/server/AyaNova/biz/CustomerServiceRequestBiz.cs @@ -228,7 +228,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs index 4edb437e..93677019 100644 --- a/server/AyaNova/biz/HeadOfficeBiz.cs +++ b/server/AyaNova/biz/HeadOfficeBiz.cs @@ -205,7 +205,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/ISearchAbleObject.cs b/server/AyaNova/biz/ISearchAbleObject.cs index 3bde15cd..0a395317 100644 --- a/server/AyaNova/biz/ISearchAbleObject.cs +++ b/server/AyaNova/biz/ISearchAbleObject.cs @@ -9,7 +9,7 @@ namespace AyaNova.Biz //get all text for the object that would have been indexed for search //called by search::GetInfoAsync as a result of a user requesting a search result sumary - Task GetSearchResultSummary(long id); + Task GetSearchResultSummary(long id, AyaType specificType); } diff --git a/server/AyaNova/biz/LoanUnitBiz.cs b/server/AyaNova/biz/LoanUnitBiz.cs index 3946463b..1f5f57c5 100644 --- a/server/AyaNova/biz/LoanUnitBiz.cs +++ b/server/AyaNova/biz/LoanUnitBiz.cs @@ -191,7 +191,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/MemoBiz.cs b/server/AyaNova/biz/MemoBiz.cs index e63c6dfa..432ad222 100644 --- a/server/AyaNova/biz/MemoBiz.cs +++ b/server/AyaNova/biz/MemoBiz.cs @@ -177,7 +177,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs index 2456edba..72d62214 100644 --- a/server/AyaNova/biz/PMBiz.cs +++ b/server/AyaNova/biz/PMBiz.cs @@ -582,7 +582,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await ct.PM.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);//# NOTE intentionally not calling quote get async here, don't need the whole graph var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/PartAssemblyBiz.cs b/server/AyaNova/biz/PartAssemblyBiz.cs index 6882cc7c..49207960 100644 --- a/server/AyaNova/biz/PartAssemblyBiz.cs +++ b/server/AyaNova/biz/PartAssemblyBiz.cs @@ -216,7 +216,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/PartBiz.cs b/server/AyaNova/biz/PartBiz.cs index 9208ab25..2caed511 100644 --- a/server/AyaNova/biz/PartBiz.cs +++ b/server/AyaNova/biz/PartBiz.cs @@ -385,7 +385,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/PartInventoryBiz.cs b/server/AyaNova/biz/PartInventoryBiz.cs index b679acfd..9963a2a2 100644 --- a/server/AyaNova/biz/PartInventoryBiz.cs +++ b/server/AyaNova/biz/PartInventoryBiz.cs @@ -149,7 +149,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/PartWarehouseBiz.cs b/server/AyaNova/biz/PartWarehouseBiz.cs index d9c47744..0f362f8e 100644 --- a/server/AyaNova/biz/PartWarehouseBiz.cs +++ b/server/AyaNova/biz/PartWarehouseBiz.cs @@ -190,7 +190,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/ProjectBiz.cs b/server/AyaNova/biz/ProjectBiz.cs index a3dde959..eca45df9 100644 --- a/server/AyaNova/biz/ProjectBiz.cs +++ b/server/AyaNova/biz/ProjectBiz.cs @@ -191,7 +191,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/PurchaseOrderBiz.cs b/server/AyaNova/biz/PurchaseOrderBiz.cs index 86c41a0d..799c5dae 100644 --- a/server/AyaNova/biz/PurchaseOrderBiz.cs +++ b/server/AyaNova/biz/PurchaseOrderBiz.cs @@ -334,7 +334,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs index 64422d26..a2fdaf8d 100644 --- a/server/AyaNova/biz/QuoteBiz.cs +++ b/server/AyaNova/biz/QuoteBiz.cs @@ -559,7 +559,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await ct.Quote.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);//# NOTE intentionally not calling quote get async here, don't need the whole graph var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/QuoteStatusBiz.cs b/server/AyaNova/biz/QuoteStatusBiz.cs index 8a7ea347..bdeb9278 100644 --- a/server/AyaNova/biz/QuoteStatusBiz.cs +++ b/server/AyaNova/biz/QuoteStatusBiz.cs @@ -143,7 +143,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/ReminderBiz.cs b/server/AyaNova/biz/ReminderBiz.cs index 9db6a951..27602e6e 100644 --- a/server/AyaNova/biz/ReminderBiz.cs +++ b/server/AyaNova/biz/ReminderBiz.cs @@ -193,7 +193,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs index 3b596c58..97ab3721 100644 --- a/server/AyaNova/biz/ReportBiz.cs +++ b/server/AyaNova/biz/ReportBiz.cs @@ -261,7 +261,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/ReviewBiz.cs b/server/AyaNova/biz/ReviewBiz.cs index 15b773f4..929530bb 100644 --- a/server/AyaNova/biz/ReviewBiz.cs +++ b/server/AyaNova/biz/ReviewBiz.cs @@ -191,7 +191,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/Search.cs b/server/AyaNova/biz/Search.cs index 6db8b2e5..a95bbaae 100644 --- a/server/AyaNova/biz/Search.cs +++ b/server/AyaNova/biz/Search.cs @@ -270,7 +270,7 @@ namespace AyaNova.Biz ISearchAbleObject o = (ISearchAbleObject)BizObjectFactory.GetBizObject(ayaType, ct, userId, currentUserRoles, translationId); //get extract - var searchParams = await o.GetSearchResultSummary(id); + var searchParams = await o.GetSearchResultSummary(id, ayaType); //extract and rank here ExtractAndRank er = new ExtractAndRank(); diff --git a/server/AyaNova/biz/ServiceBankBiz.cs b/server/AyaNova/biz/ServiceBankBiz.cs index a25eb4dd..90a8160f 100644 --- a/server/AyaNova/biz/ServiceBankBiz.cs +++ b/server/AyaNova/biz/ServiceBankBiz.cs @@ -147,7 +147,7 @@ // await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); // } -// public async Task GetSearchResultSummary(long id) +// public async Task GetSearchResultSummary(long id, AyaType specificType) // { // var obj = await GetAsync(id,false); // var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/ServiceRateBiz.cs b/server/AyaNova/biz/ServiceRateBiz.cs index d77ad5b0..f2b6e61d 100644 --- a/server/AyaNova/biz/ServiceRateBiz.cs +++ b/server/AyaNova/biz/ServiceRateBiz.cs @@ -198,7 +198,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/TaskGroupBiz.cs b/server/AyaNova/biz/TaskGroupBiz.cs index 108fb4f0..41b9f4d9 100644 --- a/server/AyaNova/biz/TaskGroupBiz.cs +++ b/server/AyaNova/biz/TaskGroupBiz.cs @@ -198,7 +198,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/TaxCodeBiz.cs b/server/AyaNova/biz/TaxCodeBiz.cs index 4e432dff..26673399 100644 --- a/server/AyaNova/biz/TaxCodeBiz.cs +++ b/server/AyaNova/biz/TaxCodeBiz.cs @@ -192,7 +192,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/TravelRateBiz.cs b/server/AyaNova/biz/TravelRateBiz.cs index 7d8e5e72..8da140e6 100644 --- a/server/AyaNova/biz/TravelRateBiz.cs +++ b/server/AyaNova/biz/TravelRateBiz.cs @@ -198,7 +198,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/UnitBiz.cs b/server/AyaNova/biz/UnitBiz.cs index c4a9a376..27e96d7d 100644 --- a/server/AyaNova/biz/UnitBiz.cs +++ b/server/AyaNova/biz/UnitBiz.cs @@ -157,7 +157,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/UnitMeterReadingBiz.cs b/server/AyaNova/biz/UnitMeterReadingBiz.cs index 477031b2..cf17b145 100644 --- a/server/AyaNova/biz/UnitMeterReadingBiz.cs +++ b/server/AyaNova/biz/UnitMeterReadingBiz.cs @@ -83,7 +83,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/UnitModelBiz.cs b/server/AyaNova/biz/UnitModelBiz.cs index fa95546c..24d7c037 100644 --- a/server/AyaNova/biz/UnitModelBiz.cs +++ b/server/AyaNova/biz/UnitModelBiz.cs @@ -190,7 +190,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index 96f7e6bc..51a30cdd 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -643,7 +643,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/VendorBiz.cs b/server/AyaNova/biz/VendorBiz.cs index 0dc6e002..919ca5d4 100644 --- a/server/AyaNova/biz/VendorBiz.cs +++ b/server/AyaNova/biz/VendorBiz.cs @@ -188,7 +188,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index 0ff479e6..76782968 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -252,7 +252,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index b7f05cc6..f7d0b8dd 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -617,12 +617,36 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { - var obj = await ct.WorkOrder.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);//# NOTE intentionally not calling workorder get async here, don't need the whole graph - var SearchParams = new Search.SearchIndexProcessObjectParameters(); - DigestSearchText(obj, SearchParams); - return SearchParams; + switch (specificType) + { + case AyaType.WorkOrder: + var obj = await ct.WorkOrder.AsNoTracking().SingleOrDefaultAsync(z => z.Id == id);//# NOTE intentionally not calling workorder get async here, don't need the whole graph + var SearchParams = new Search.SearchIndexProcessObjectParameters(); + DigestSearchText(obj, SearchParams); + return SearchParams; + case AyaType.WorkOrderItem: + return await ItemGetSearchResultSummary(id); + case AyaType.WorkOrderItemExpense: + return await ExpenseGetSearchResultSummary(id); + case AyaType.WorkOrderItemLabor: + return await LaborGetSearchResultSummary(id); + case AyaType.WorkOrderItemLoan: + return await LoanGetSearchResultSummary(id); + case AyaType.WorkOrderItemPart: + return await PartGetSearchResultSummary(id); + case AyaType.WorkOrderItemTask: + return await TaskGetSearchResultSummary(id); + case AyaType.WorkOrderItemTravel: + return await TravelGetSearchResultSummary(id); + case AyaType.WorkOrderItemOutsideService: + return await OutsideServiceGetSearchResultSummary(id); + case AyaType.WorkOrderItemUnit: + return await UnitGetSearchResultSummary(id); + default: + return null; + } } public void DigestSearchText(WorkOrder obj, Search.SearchIndexProcessObjectParameters searchParams) @@ -4591,8 +4615,9 @@ namespace AyaNova.Biz o.PurchaseOrderDateViz = po.OrderedDate; o.PurchaseOrderExpectedDateViz = po.ExpectedReceiveDate; - if(o.RequestedByUserId!=null){ - o.RequestedByUserViz=await ct.User.AsNoTracking().Where(x => x.Id == o.RequestedByUserId).Select(x => x.Name).FirstOrDefaultAsync(); + if (o.RequestedByUserId != null) + { + o.RequestedByUserViz = await ct.User.AsNoTracking().Where(x => x.Id == o.RequestedByUserId).Select(x => x.Name).FirstOrDefaultAsync(); } } } @@ -4652,8 +4677,8 @@ namespace AyaNova.Biz //UGLY workaround kind of, in order to avoid some poitem fuckery related to the dual reciprocal link between woitempartrequests adn poitems //set the new item received quantity to zero if there is no poitemid (this is because the db itself will set the poitemid if the poitem is delete but not update the quantity received) - if(proposedObj.PurchaseOrderItemId==null && proposedObj.Received!=0) - proposedObj.Received=0;//not a biz rule but a biz adaptation + if (proposedObj.PurchaseOrderItemId == null && proposedObj.Received != 0) + proposedObj.Received = 0;//not a biz rule but a biz adaptation //Any form customizations to validate? var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(z => z.FormKey == AyaType.WorkOrderItemPartRequest.ToString()); diff --git a/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs b/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs index 7cf11567..ac598cd8 100644 --- a/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs +++ b/server/AyaNova/biz/WorkOrderItemPriorityBiz.cs @@ -173,7 +173,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/WorkOrderItemStatusBiz.cs b/server/AyaNova/biz/WorkOrderItemStatusBiz.cs index 28b079a0..1b37972c 100644 --- a/server/AyaNova/biz/WorkOrderItemStatusBiz.cs +++ b/server/AyaNova/biz/WorkOrderItemStatusBiz.cs @@ -173,7 +173,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters(); diff --git a/server/AyaNova/biz/WorkOrderStatusBiz.cs b/server/AyaNova/biz/WorkOrderStatusBiz.cs index f991d2c4..b07b2487 100644 --- a/server/AyaNova/biz/WorkOrderStatusBiz.cs +++ b/server/AyaNova/biz/WorkOrderStatusBiz.cs @@ -173,7 +173,7 @@ namespace AyaNova.Biz await Search.ProcessUpdatedObjectKeywordsAsync(SearchParams); } - public async Task GetSearchResultSummary(long id) + public async Task GetSearchResultSummary(long id, AyaType specificType) { var obj = await GetAsync(id, false); var SearchParams = new Search.SearchIndexProcessObjectParameters();