diff --git a/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts b/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts index 1727f5c9c254102f719f10f920d9f24395f64382..4ea9e877f58d375811533e0b556e88c6bf7e4c0d 100644 --- a/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts +++ b/src/app/p_resources/admin/resourcePoolManagement/resource-reservation-calendar/resource-reservation-calendar.component.ts @@ -84,7 +84,7 @@ export class ResourceReservationCalendarComponent implements OnInit { this.reservations ).map(function(eventEl: Reservation) { - console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime ) + // console.info("this is event: " + eventEl.id +" " + eventEl.requestedPeriodStartDateTime ) // var result = new Date(eventEl.startDate); // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today diff --git a/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts b/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts index 95b988e08e4f6e31643be2fa5f1043c025d78f39..fd2594f39f3eed330f695050ed4079396b86a418 100644 --- a/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts +++ b/src/app/p_services/admin/orderManagement/list-service-orders/list-service-orders.component.ts @@ -109,7 +109,7 @@ export class ListServiceOrdersComponent implements OnInit { this.serviceOrders ).map(function(eventEl: ServiceOrder) { - console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate ) + // console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate ) // var result = new Date(eventEl.startDate); // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts index 69c43d678ea6f93ee88347b741bd36c09ae098bb..37851f03498204f0f25f09b81d45c69f6894bc77 100644 --- a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts +++ b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.ts @@ -58,8 +58,8 @@ export class PreviewServiceOrderComponent implements OnInit { serviceOrderNotFound: boolean = false finishedLoading: boolean = false - supportingServices: Service[][] = [[]] - + supportingServices: Service[][] = [] + // supportingServices' first array is Order Item Index and second array is SupportingService index of the respective Order Item editMode: boolean = false editModeNotes: boolean = false isAdminUser: boolean = false @@ -122,18 +122,26 @@ export class PreviewServiceOrderComponent implements OnInit { this.checkboxesOrderItemList = [] this.currentItemRelationshipsUrl = [] - this.serviceOrder.orderItem.forEach((orderItem, index) => { + + this.supportingServices = [] + this.serviceOrder.orderItem.forEach((orderItem) => { + + //Expands the length of the array for each Service Order Item + this.supportingServices.push([]) this.checkboxesOrderItemList.push({orderItem: orderItem, isChecked: false}) orderItem.service.serviceCharacteristic.sort(this.sortingService.ascStringSortingFunctionByNameProperty()) - orderItem.service.supportingService.forEach( (supService, serviceIndex) => { - this.retrieveServiceInventory(supService.id).pipe(delay(Math.random()*1000)).subscribe( - data => this.supportingServices[index][serviceIndex] = data + orderItem.service.supportingService.forEach( (supService) => { + this.retrieveServiceInventory(supService.id).subscribe( + data => { + const orderItemIndex = this.serviceOrder.orderItem.findIndex(SOI => orderItem.id === SOI.id) + const supportingServiceIndex = this.serviceOrder.orderItem[orderItemIndex].service.supportingService.findIndex(SupS => supService.id === SupS.id) + this.supportingServices[orderItemIndex][supportingServiceIndex] = data + } ) }) - this.currentItemRelationshipsUrl.push( this.orderService.rootUrl + "/serviceOrdering/v4/serviceOrder/" + this.serviceOrder.id + "/item/" + orderItem.id + "/relationship_graph" ); }) diff --git a/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts b/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts index 8daf914b8e623cfb0a4f57742fd4a7e312d43420..39e0af63c41a3a8bdabc161cc5490182a2c4b1ea 100644 --- a/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts +++ b/src/app/p_services/admin/orderManagement/service-order-calendar/service-order-calendar.component.ts @@ -69,7 +69,7 @@ export class ServiceOrdersCalendarComponent implements OnInit { this.serviceOrders ).map(function(eventEl: ServiceOrder) { - console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate ) + // console.info("this is event: " + eventEl.id +" " + eventEl.requestedStartDate ) // var result = new Date(eventEl.startDate); // var evd = result.toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today