-
-
-
- Status
-
-
- {{item.status}}
-
-
-
-
-
- Effective From Date
- {{ item.effectiveFrom | dateFormat }}
-
-
-
- Owner
-
-
-
-
-
- Loan
- {{ item.loan.loanId }}
-
-
-
- Transfer
-
-
-
-
-
- Settlement Date
- {{ item.settlementDate | dateFormat }}
-
-
-
- Purchase Price Ratio
- {{ item.purchasePriceRatio | number }}
-
-
-
- Total Amount
-
-
- {{ item.details.totalOutstanding | number }}
-
-
-
-
-
- Actions
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{record.status}}
+
+
+ Owner ExternalId
+
+
+ Effective From
+ {{ record.effectiveFrom | dateFormat }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Status :
+
+
+
+ {{record.status}}
+
+
+
+ Owner External Id :
+
+
+
+
+
+
+ Settlement Date :
+
+
+ {{record.settlementDate | dateFormat}}
+
+
+ Effective Date :
+
+
+ {{record.effectiveFrom | dateFormat}}
+
+
+
+
+ Details :
+
+
+
+
+
+ Principal Outstanding : {{record.details.totalPrincipalOutstanding | formatNumber}}
+
+
+ Interest Outstanding : {{record.details.totalInterestOutstanding | formatNumber}}
+
+
+ Fees Outstanding : {{record.details.totalFeeChargesOutstanding | formatNumber}}
+
+
+ Penalties Outstanding : {{record.details.totalPenaltyChargesOutstanding | formatNumber}}
+
+
+ Outstanding : {{record.details.totalOutstanding | formatNumber}}
+
+
+ Overpaid : {{record.details.totalOverpaid | formatNumber}}
+
+
+
+
+
+
+
+
+
diff --git a/src/app/organization/investors/investors.component.scss b/src/app/organization/investors/investors.component.scss
index 82de602797..b319a9e03b 100644
--- a/src/app/organization/investors/investors.component.scss
+++ b/src/app/organization/investors/investors.component.scss
@@ -2,39 +2,25 @@
color: black;
}
-.account-action-button{
- min-width: 26px;
- padding: 0 0 3px 0;
- margin: 0 2%;
- line-height: 25px;
+.external-asset-transfer {
+ margin-top: 10px;
+ min-height: 160px;
}
-.item-detail {
- overflow: hidden;
- display: flex;
-}
-
-tr.detail-row {
- height: 0;
-}
-
-tr.element-row:hover {
- cursor: pointer;
-}
+.record {
+ .record-actions{
+ margin-top: 1%;
+ button{
+ margin-right: 1%;
+ }
+ }
+ h3 {
+ margin: 1% auto;
+ }
-tr.element-row:not(.expanded-row):hover {
- background: whitesmoke;
+ p {
+ line-height: 30px;
+ margin-left: 2%;
+ }
}
-tr.element-row:not(.expanded-row):active {
- background: #efefef;
-}
-
-.element-row td {
- border-bottom-width: 0;
-}
-
-.element-detail {
- overflow: hidden;
- display: flex;
-}
diff --git a/src/app/organization/investors/investors.component.ts b/src/app/organization/investors/investors.component.ts
index 2c21e97258..64ff4e4abf 100644
--- a/src/app/organization/investors/investors.component.ts
+++ b/src/app/organization/investors/investors.component.ts
@@ -28,6 +28,7 @@ export class InvestorsComponent implements OnInit {
/** Maximum transaction date allowed. */
maxDate = new Date();
+ searchResults: any[] = [];
searchText = new FormControl('');
effectiveFromDate = new FormControl('');
effectiveToDate = new FormControl('');
@@ -138,11 +139,16 @@ export class InvestorsComponent implements OnInit {
this.totalRows = response.totalElements;
this.existsDataToFilter = (response.totalElements > 0);
this.dataSource.data = response.content;
+ this.searchResults = response.content;
this.isLoading = false;
});
}
+ transform(data: any): any {
+ return data;
+ }
+
pageChanged(event: PageEvent) {
this.pageSize = event.pageSize;
this.currentPage = event.pageIndex;
diff --git a/src/app/reports/run-report/run-report.component.ts b/src/app/reports/run-report/run-report.component.ts
index bd245d0ee0..db6671d1ba 100644
--- a/src/app/reports/run-report/run-report.component.ts
+++ b/src/app/reports/run-report/run-report.component.ts
@@ -233,7 +233,11 @@ export class RunReportComponent implements OnInit {
formattedResponse[newKey] = value['id'];
break;
case 'date':
- formattedResponse[newKey] = this.dateUtils.formatDate(value, this.settingsService.dateFormat);
+ if (this.isTableReport()) {
+ formattedResponse[newKey] = this.dateUtils.formatDate(value, Dates.DEFAULT_DATEFORMAT);
+ } else {
+ formattedResponse[newKey] = this.dateUtils.formatDate(value, this.settingsService.dateFormat);
+ }
this.reportUsesDates = true;
break;
case 'none':
@@ -254,10 +258,14 @@ export class RunReportComponent implements OnInit {
...userResponseValues,
};
if (this.reportUsesDates) {
+ let dateFormat = this.settingsService.dateFormat;
+ if (this.isTableReport()) {
+ dateFormat = Dates.DEFAULT_DATEFORMAT;
+ }
formData = {
...userResponseValues,
locale: this.settingsService.language.code,
- dateFormat: this.settingsService.dateFormat
+ dateFormat: dateFormat
};
}
if (this.reportToBeExportedInRepository) {
diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html
index bb511beb0e..12a0bab323 100644
--- a/src/app/shared/footer/footer.component.html
+++ b/src/app/shared/footer/footer.component.html
@@ -2,22 +2,22 @@
-
+