Skip to content

Commit

Permalink
Search External Asset Owner (#1851)
Browse files Browse the repository at this point in the history 
Co-authored-by: Jose Alberto Hernandez <[email protected]>
  • Loading branch information
@josehernandezfintecheandomx
josehernandezfintecheandomx and Jose Alberto Hernandez authored Aug 27, 2023
1 parent b50ac45 commit 10e84d1
Show file tree
Hide file tree
Showing 11 changed files with 247 additions and 218 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "MPL-2.0",
"scripts": {
"ng": "ng",
"build": "npm run env -s && ng build --prod --output-hashing=none",
"build": "node version.js && npm run env -s && ng build --prod --output-hashing=none",
"build:prod": "node --max-old-space-size=16384 ./node_modules/@angular/cli/bin/ng build --prod --output-hashing=none --base-href=/web-app/",
"start": "npm run env -s && ng serve --aot --proxy-config proxy.conf.js",
"serve:dev": "npm run env -s && ng serve",
Expand Down
5 changes: 3 additions & 2 deletions src/app/clients/clients-view/family-members-tab/family-members-tab.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ <h3>Family Members</h3>

<div fxLayout="row" fxLayoutAlign="flex-end">
<button mat-raised-button color="primary" [routerLink]="['./add']">
<fa-icon icon="plus" class="m-r-10"></fa-icon>Add
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add
</button>
</div>

Expand Down Expand Up @@ -45,7 +46,7 @@ <h3>Family Members</h3>
Martial Status : {{member.maritalStatus}}<br />
Gender : {{member.gender}}<br />
Profession : {{member.profession}}<br />
Date Of Birth : {{member.dateOfBirth | dateFormat}}<br />
Date Of Birth : {{member.dateOfBirth | dateFormat}}<br />
</p>

</mat-expansion-panel>
Expand Down
142 changes: 70 additions & 72 deletions ...w/external-asset-owner-tab/external-asset-transfer/external-asset-transfer.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,72 +1,70 @@
<div fxLayout="row" fxLayoutGap="32px" class="asset-transfer-container">
<table>
<tbody>
<tr>
<td fxFlex="25%" class="m-l-5">
<b>Status :</b>
</td>
<td fxFlex="25%" class="m-l-5 left">
<div [ngClass]="itemStatus(transferData.status)">
<fa-icon icon="stop"></fa-icon>
<span class="m-l-5 status">{{transferData.status}}</span>
</div>
</td>
<td fxFlex="25%" class="m-l-5">
<b>Owner External Id :</b>
</td>
<td fxFlex="25%" class="m-l-5 left">
<mifosx-external-identifier externalId="{{transferData.owner.externalId}}" completed="true"></mifosx-external-identifier>
</td>
</tr>
<tr>
<td fxFlex="25%" class="m-l-5">
<b>Settlement Date :</b>
</td>
<td fxFlex="25%" class="m-l-5">
{{transferData.settlementDate | dateFormat}}
</td>
<td fxFlex="25%" class="m-l-5">
<b>Effective Date :</b>
</td>
<td fxFlex="25%" class="m-l-5">
{{transferData.effectiveFrom | dateFormat}}
</td>
</tr>
<tr>
<td fxFlex="25%" class="m-l-5">
<b>Details :</b>
</td>
<td fxFlex="75%" class="left">
<table>
<tbody>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Principal Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalPrincipalOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Interest Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalInterestOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Fees Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalFeeChargesOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Penalties Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalPenaltyChargesOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Overpaid :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalOverpaid | formatNumber}}</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</div>
<table>
<tbody>
<tr>
<td fxFlex="25%" class="m-l-5">
<b>Status :</b>
</td>
<td fxFlex="25%" class="m-l-5 left">
<div [ngClass]="itemStatus(transferData.status)">
<fa-icon icon="stop"></fa-icon>
<span class="m-l-5 status">{{transferData.status}}</span>
</div>
</td>
<td fxFlex="25%" class="m-l-5">
<b>Owner External Id :</b>
</td>
<td fxFlex="25%" class="m-l-5 left">
<mifosx-external-identifier externalId="{{transferData.owner.externalId}}" completed="true"></mifosx-external-identifier>
</td>
</tr>
<tr>
<td fxFlex="25%" class="m-l-5">
<b>Settlement Date :</b>
</td>
<td fxFlex="25%" class="m-l-5">
{{transferData.settlementDate | dateFormat}}
</td>
<td fxFlex="25%" class="m-l-5">
<b>Effective Date :</b>
</td>
<td fxFlex="25%" class="m-l-5">
{{transferData.effectiveFrom | dateFormat}}
</td>
</tr>
<tr>
<td fxFlex="25%" class="m-l-5">
<b>Details :</b>
</td>
<td fxFlex="75%" class="left">
<table>
<tbody>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Principal Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalPrincipalOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Interest Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalInterestOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Fees Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalFeeChargesOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Penalties Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalPenaltyChargesOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Outstanding :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalOutstanding | formatNumber}}</td>
</tr>
<tr>
<td fxFlex="50%" class="m-l-5"><b>Overpaid :</b></td>
<td fxFlex="50%" class="r-amount">{{transferData.details.totalOverpaid | formatNumber}}</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
6 changes: 1 addition & 5 deletions ...iew/external-asset-owner-tab/external-asset-transfer/external-asset-transfer.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@ import { ExternalAssetOwner } from 'app/loans/services/external-asset-owner';
templateUrl: './external-asset-transfer.component.html',
styleUrls: ['./external-asset-transfer.component.scss']
})
export class ExternalAssetTransferComponent implements OnInit {
export class ExternalAssetTransferComponent {
/** Input Fields Data */
@Input() transferData: any;

constructor(private externalAssetOwner: ExternalAssetOwner) { }

ngOnInit(): void {
console.log(this.transferData);
}

itemStatus(status: string): string {
return this.externalAssetOwner.itemStatus(status);
}
Expand Down
Loading

0 comments on commit 10e84d1

Please sign in to comment.