External Asset Owner
@@ -30,7 +106,7 @@
- {{ item.status | translate }}
+ {{ itemCurrentStatus(item) | translate }}
diff --git a/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss b/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss
index ed728df88..339354702 100644
--- a/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss
+++ b/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss
@@ -1,6 +1,10 @@
-.container {
+.tab-container {
padding-bottom: 2%;
+ h3 {
+ margin: 1% auto;
+ }
+
.transaction-buttons {
padding-bottom: 1rem;
padding-top: 1rem;
@@ -9,6 +13,12 @@
}
}
+ .asset-transfer-container {
+ border: 1px solid;
+ padding: 1%;
+ margin-bottom: 20px;
+ }
+
table {
width: 100%;
@@ -33,3 +43,5 @@
margin: 0 2%;
line-height: 25px;
}
+
+
diff --git a/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.ts b/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.ts
index 6de51d5d4..3ee3bc753 100644
--- a/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.ts
+++ b/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.ts
@@ -16,6 +16,7 @@ export class ExternalAssetOwnerTabComponent implements OnInit {
loanTransferColumns: string[] = ['status', 'effectiveFrom', 'ownerExternalId', 'transferExternalId', 'settlementDate', 'purchasePriceRatio', 'actions'];
currentItem: any;
+ existActiveTransfer = false;
constructor(private route: ActivatedRoute,
private router: Router,
@@ -24,7 +25,10 @@ export class ExternalAssetOwnerTabComponent implements OnInit {
) {
this.route.data.subscribe((data: { loanTransfersData: any, activeTransferData: any }) => {
this.loanTransfersData = data.loanTransfersData.empty ? [] : data.loanTransfersData.content;
- this.activeTransferData = data.activeTransferData || {};
+ this.activeTransferData = data.activeTransferData || null;
+ this.existActiveTransfer = (data.activeTransferData && data.activeTransferData.transferId != null);
+ console.log(this.existActiveTransfer);
+ console.log(this.activeTransferData);
});
}
@@ -35,6 +39,13 @@ export class ExternalAssetOwnerTabComponent implements OnInit {
}
}
+ itemCurrentStatus(item: any): string {
+ if (item.status === 'BUYBACK' && item.effectiveTo === '9999-12-31') {
+ return item.status + ' PENDING';
+ }
+ return item.status;
+ }
+
itemStatus(status: string): string {
return 'status-' + status.toLowerCase();
}