diff --git a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html index 300bf98..fadb4ab 100644 --- a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html +++ b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.html @@ -13,7 +13,7 @@ - {{errorMessage | translate}} diff --git a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.ts b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.ts index d710627..d35f153 100644 --- a/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.ts +++ b/admin-ui/src/app/features/packet-status/packet-status/packet-status.component.ts @@ -21,7 +21,6 @@ export class PacketStatusComponent implements OnInit { // status: 'Completed' // } ]; - hideMatchedRid: boolean = true; showMatchedRid: boolean = false; showSendToPerso: boolean = false; roles: string[] = []; @@ -104,14 +103,26 @@ export class PacketStatusComponent implements OnInit { this.showSendToPerso = this.data.some(item =>item.transactionTypeCode === 'PRINT_SERVICE' && item.statusCode === 'PROCESSED' || item.statusCode === 'COMPLETED'); - this.showMatchedRid = this.data.some(item =>item.transactionTypeCode === 'MANUAL_ADJUDICATION' ); - this.hideMatchedRid = !this.data.some(item =>item.transactionTypeCode === 'MANUAL_ADJUDICATION' - && item.statusCode === 'SUCCESS'); + this.showMatchedRid = this.getShowMatchedRid(this.data); } }); } } + getShowMatchedRid(data: any[]): boolean { + const maList = this.data.filter(item => item.transactionTypeCode === 'MANUAL_ADJUDICATION'); + if (maList.length > 0) { + const latestMA = maList[maList.length - 1]; + if (latestMA.statusCode === 'SUCCESS') { + return false; + } else { + return true; + } + } else { + return false; + } + } + viewMore() { this.showTimeline = !this.showTimeline; }