CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed Deposit account view update (#1881)

Browse Source 
Co-authored-by: Jose Alberto Hernandez <alberto@blue-daemon.local>
This commit is contained in:
José Alberto Hernández
2023-10-19 00:07:22 -06:00
committed by GitHub
co-authored by Jose Alberto Hernandez
parent d92f6c1c5e
commit c7fe21e74a
217 changed files with 23945 additions and 1869 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shares/create-shares-account/create-shares-account.component.html
+6 -6
View File
@@ -24,10 +24,10 @@
<mat-step [stepControl]="sharesAccountDetailsForm">
<ng-template matStepLabel>{{ 'labels.inputs.DETAILS' |translate}}</ng-template>
<ng-template matStepLabel>{{ 'labels.inputs.DETAILS' | translate }}</ng-template>
<mifosx-shares-account-details-step
[sharesAccountTemplate]="sharesAccountTemplate"
[sharesAccountTemplate]="sharesAccountTemplate"
(sharesAccountProductTemplate)="setTemplate($event)"
>
</mifosx-shares-account-details-step>
@@ -36,7 +36,7 @@
<mat-step [stepControl]="sharesAccountTermsForm">
<ng-template matStepLabel>{{ 'labels.inputs.TERMS' |translate}}</ng-template>
<ng-template matStepLabel>{{ 'labels.inputs.TERMS' | translate }}</ng-template>
<mifosx-shares-account-terms-step [sharesAccountProductTemplate]="sharesAccountProductTemplate"></mifosx-shares-account-terms-step>
@@ -44,11 +44,11 @@
<mat-step>
<ng-template matStepLabel>{{ 'labels.inputs.CHARGES' |translate}}</ng-template>
<ng-template matStepLabel>{{ 'labels.inputs.CHARGES' | translate }}</ng-template>
<mifosx-shares-account-charges-step
[sharesAccountProductTemplate]="sharesAccountProductTemplate"
[sharesAccountTemplate]="sharesAccountTemplate"
[sharesAccountTemplate]="sharesAccountTemplate"
[currencyCode]="sharesAccountTermsForm.get('currencyCode')"
>
</mifosx-shares-account-charges-step>
@@ -57,7 +57,7 @@
<mat-step *ngIf="sharesAccountFormValid" completed>
<ng-template matStepLabel>{{ 'labels.inputs.PREVIEW' |translate}}</ng-template>
<ng-template matStepLabel>{{ 'labels.inputs.PREVIEW' | translate }}</ng-template>
<mifosx-shares-account-preview-step
[sharesAccountProductTemplate]="sharesAccountProductTemplate"
src/app/shares/edit-shares-account/edit-shares-account.component.html
+7 -7
View File
@@ -24,10 +24,10 @@
<mat-step [stepControl]="sharesAccountDetailsForm">
<ng-template matStepLabel>{{ 'labels.inputs.DETAILS' |translate}}</ng-template>
<ng-template matStepLabel>{{ 'labels.inputs.DETAILS' | translate }}</ng-template>
<mifosx-shares-account-details-step
[sharesAccountTemplate]="sharesAccountAndTemplate"
[sharesAccountTemplate]="sharesAccountAndTemplate"
(sharesAccountProductTemplate)="setTemplate($event)"
>
</mifosx-shares-account-details-step>
@@ -36,9 +36,9 @@
<mat-step [stepControl]="sharesAccountTermsForm">
<ng-template matStepLabel>{{ 'labels.inputs.TERMS' |translate}}</ng-template>
<ng-template matStepLabel>{{ 'labels.inputs.TERMS' | translate }}</ng-template>
<mifosx-shares-account-terms-step
<mifosx-shares-account-terms-step
[sharesAccountProductTemplate]="sharesAccountProductTemplate"
[sharesAccountTemplate]="sharesAccountAndTemplate">
</mifosx-shares-account-terms-step>
@@ -47,11 +47,11 @@
<mat-step>
<ng-template matStepLabel>{{ 'labels.inputs.CHARGES' |translate}}</ng-template>
<ng-template matStepLabel>{{ 'labels.inputs.CHARGES' | translate }}</ng-template>
<mifosx-shares-account-charges-step
[sharesAccountProductTemplate]="sharesAccountProductTemplate"
[sharesAccountTemplate]="sharesAccountAndTemplate"
[sharesAccountTemplate]="sharesAccountAndTemplate"
[currencyCode]="sharesAccountTermsForm.get('currencyCode')"
>
</mifosx-shares-account-charges-step>
@@ -60,7 +60,7 @@
<mat-step *ngIf="sharesAccountFormValidAndNotPristine" completed>
<ng-template matStepLabel>{{ 'labels.inputs.PREVIEW' |translate}}</ng-template>
<ng-template matStepLabel>{{ 'labels.inputs.PREVIEW' | translate }}</ng-template>
<mifosx-shares-account-preview-step
[sharesAccountProductTemplate]="sharesAccountProductTemplate"
src/app/shares/shares-account-actions/activate-shares-account/activate-shares-account.component.html
+4 -4
View File
@@ -7,20 +7,20 @@
<mat-card-content>
<mat-form-field fxFlex (click)="activatedDatePicker.open()">
<mat-label>{{ 'labels.inputs.Activated On Date' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Activated On Date' | translate }}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="activatedDatePicker" required formControlName="activatedDate">
<mat-datepicker-toggle matSuffix [for]="activatedDatePicker"></mat-datepicker-toggle>
<mat-datepicker #activatedDatePicker></mat-datepicker>
<mat-error *ngIf="activateSharesAccountForm.controls.activatedDate.hasError('required')">
{{ 'labels.inputs.Activated On Date' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Activated On Date' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button [disabled]="!activateSharesAccountForm.valid">{{'labels.buttons.Confirm' |translate}}</button>
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button [disabled]="!activateSharesAccountForm.valid">{{'labels.buttons.Confirm' | translate }}</button>
</mat-card-actions>
</form>
src/app/shares/shares-account-actions/apply-shares/apply-shares.component.html
+7 -7
View File
@@ -9,25 +9,25 @@
<div fxLayout="column">
<mat-form-field (click)="requestedDatePicker.open()">
<mat-label>{{ 'labels.inputs.Request Date' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Request Date' | translate }}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="requestedDatePicker" required formControlName="requestedDate">
<mat-datepicker-toggle matSuffix [for]="requestedDatePicker"></mat-datepicker-toggle>
<mat-datepicker #requestedDatePicker></mat-datepicker>
<mat-error *ngIf="applySharesForm.controls.requestedDate.hasError('required')">
{{ 'labels.inputs.Request Date' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Request Date' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field>
<mat-label>{{ 'labels.inputs.Total No. of Shares' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Total No. of Shares' | translate }}</mat-label>
<input matInput required formControlName="requestedShares">
<mat-error *ngIf="applySharesForm.controls.requestedShares.hasError('required')">
{{ 'labels.inputs.Requested Shares' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Requested Shares' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field>
<mat-label>{{ 'labels.inputs.Today's Price' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Today's Price' | translate }}</mat-label>
<input matInput required formControlName="unitPrice">
</mat-form-field>
@@ -36,8 +36,8 @@
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button [disabled]="!applySharesForm.valid">{{'labels.buttons.Confirm' |translate}}</button>
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button [disabled]="!applySharesForm.valid">{{'labels.buttons.Confirm' | translate }}</button>
</mat-card-actions>
</form>
src/app/shares/shares-account-actions/approve-shares-account/approve-shares-account.component.html
+5 -5
View File
@@ -9,17 +9,17 @@
<div fxLayout="column">
<mat-form-field (click)="approvedDatePicker.open()">
<mat-label>{{ 'labels.inputs.Approved On Date' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Approved On Date' | translate }}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="approvedDatePicker" required formControlName="approvedDate">
<mat-datepicker-toggle matSuffix [for]="approvedDatePicker"></mat-datepicker-toggle>
<mat-datepicker #approvedDatePicker></mat-datepicker>
<mat-error *ngIf="approveSharesAccountForm.controls.approvedDate.hasError('required')">
{{ 'labels.inputs.Approved On Date' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Approved On Date' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field>
<mat-label>{{ 'labels.inputs.Note' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Note' | translate }}</mat-label>
<textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
</mat-form-field>
@@ -28,8 +28,8 @@
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button [disabled]="!approveSharesAccountForm.valid">{{'labels.buttons.Confirm' |translate}}</button>
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button [disabled]="!approveSharesAccountForm.valid">{{'labels.buttons.Confirm' | translate }}</button>
</mat-card-actions>
</form>
src/app/shares/shares-account-actions/approve-shares/approve-share-dialog/approve-share-dialog.component.html
+4 -4
View File
@@ -1,8 +1,8 @@
<h1 mat-dialog-title>{{'labels.heading.Approve Share' |translate}}</h1>
<h1 mat-dialog-title>{{'labels.heading.Approve Share' | translate }}</h1>
<div mat-dialog-content>
<p>{{'labels.text.Are you sure you want to approve share with id' |translate}}: {{ data.shareId }} ?</p>
<p>{{'labels.text.Are you sure you want to approve share with id' | translate }}: {{ data.shareId }} ?</p>
</div>
<mat-dialog-actions align="end">
<button mat-raised-button mat-dialog-close>{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button [mat-dialog-close]="{ approve: true }">{{'labels.buttons.Confirm' |translate}}</button>
<button mat-raised-button mat-dialog-close>{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button [mat-dialog-close]="{ approve: true }">{{'labels.buttons.Confirm' | translate }}</button>
</mat-dialog-actions>
src/app/shares/shares-account-actions/approve-shares/approve-shares.component.html
+6 -6
View File
@@ -5,31 +5,31 @@
<table #sharesTable mat-table [dataSource]="dataSource" matSort>
<ng-container matColumnDef="transactionDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Transaction Date' |translate}} </th>
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Transaction Date' | translate }} </th>
<td mat-cell *matCellDef="let share"> {{ share.purchasedDate | dateFormat }}</td>
</ng-container>
<ng-container matColumnDef="totalShares">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Total Shares' |translate}} </th>
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Total Shares' | translate }} </th>
<td mat-cell *matCellDef="let share"> {{ share.numberOfShares }} </td>
</ng-container>
<ng-container matColumnDef="redeemedPrice">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Purchased/Redeemed Price' |translate}} </th>
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Purchased/Redeemed Price' | translate }} </th>
<td mat-cell *matCellDef="let share"> {{ share.purchasedPrice }} </td>
</ng-container>
<ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Status' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Status' | translate }} </th>
<td mat-cell *matCellDef="let share">
<i class="fa fa-stop" [ngClass]="share.status.code|statusLookup" [matTooltip]="share.status.value"></i>
</td>
</ng-container>
<ng-container matColumnDef="approve">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Confirm Approve' |translate}} </th>
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Confirm Approve' | translate }} </th>
<td mat-cell *matCellDef="let share">
<button class="share-action-button" mat-raised-button color="accent" matTooltip="{{ 'tooltips.Approve Share' |translate}}"
<button class="share-action-button" mat-raised-button color="accent" matTooltip="{{ 'tooltips.Approve Share' | translate }}"
(click)="approve(share.id)">
<i class="fa fa-check"></i>
</button>
src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html
+5 -5
View File
@@ -9,17 +9,17 @@
<div fxLayout="column">
<mat-form-field (click)="closedDatePicker.open()">
<mat-label>{{ 'labels.inputs.Closed On Date' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Closed On Date' | translate }}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="closedDatePicker" required formControlName="closedDate">
<mat-datepicker-toggle matSuffix [for]="closedDatePicker"></mat-datepicker-toggle>
<mat-datepicker #closedDatePicker></mat-datepicker>
<mat-error *ngIf="closeSharesAccountForm.controls.closedDate.hasError('required')">
{{ 'labels.inputs.Closed On Date' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Closed On Date' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field>
<mat-label>{{ 'labels.inputs.Note' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Note' | translate }}</mat-label>
<textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
</mat-form-field>
@@ -28,8 +28,8 @@
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button color="warn" [disabled]="!closeSharesAccountForm.valid">{{'labels.buttons.Confirm' |translate}}</button>
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button color="warn" [disabled]="!closeSharesAccountForm.valid">{{'labels.buttons.Confirm' | translate }}</button>
</mat-card-actions>
</form>
src/app/shares/shares-account-actions/redeem-shares/redeem-shares.component.html
+7 -7
View File
@@ -9,25 +9,25 @@
<div fxLayout="column">
<mat-form-field (click)="requestedDatePicker.open()">
<mat-label>{{ 'labels.inputs.Request Date' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Request Date' | translate }}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="requestedDatePicker" required formControlName="requestedDate">
<mat-datepicker-toggle matSuffix [for]="requestedDatePicker"></mat-datepicker-toggle>
<mat-datepicker #requestedDatePicker></mat-datepicker>
<mat-error *ngIf="redeemSharesForm.controls.requestedDate.hasError('required')">
{{ 'labels.inputs.Request Date' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Request Date' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field>
<mat-label>{{ 'labels.inputs.Total No. of Shares' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Total No. of Shares' | translate }}</mat-label>
<input matInput required formControlName="requestedShares">
<mat-error *ngIf="redeemSharesForm.controls.requestedShares.hasError('required')">
{{ 'labels.inputs.Requested Shares' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Requested Shares' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field>
<mat-label>{{ 'labels.inputs.Today's Price' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Today's Price' | translate }}</mat-label>
<input matInput required formControlName="unitPrice">
</mat-form-field>
@@ -36,8 +36,8 @@
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button color="warn" [disabled]="!redeemSharesForm.valid">{{'labels.buttons.Confirm' |translate}}</button>
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button color="warn" [disabled]="!redeemSharesForm.valid">{{'labels.buttons.Confirm' | translate }}</button>
</mat-card-actions>
</form>
src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html
+5 -5
View File
@@ -9,17 +9,17 @@
<div fxLayout="column">
<mat-form-field (click)="rejectedDatePicker.open()">
<mat-label>{{ 'labels.inputs.Rejected On Date' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Rejected On Date' | translate }}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="rejectedDatePicker" required formControlName="rejectedDate">
<mat-datepicker-toggle matSuffix [for]="rejectedDatePicker"></mat-datepicker-toggle>
<mat-datepicker #rejectedDatePicker></mat-datepicker>
<mat-error *ngIf="rejectSharesAccountForm.controls.rejectedDate.hasError('required')">
{{ 'labels.inputs.Rejected On Date' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Rejected On Date' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field>
<mat-label>{{ 'labels.inputs.Note' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Note' | translate }}</mat-label>
<textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
</mat-form-field>
@@ -28,8 +28,8 @@
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button color="warn" [disabled]="!rejectSharesAccountForm.valid">{{'labels.buttons.Confirm' |translate}}</button>
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button color="warn" [disabled]="!rejectSharesAccountForm.valid">{{'labels.buttons.Confirm' | translate }}</button>
</mat-card-actions>
</form>
src/app/shares/shares-account-actions/reject-shares/reject-share-dialog/reject-share-dialog.component.html
+4 -4
View File
@@ -1,8 +1,8 @@
<h1 mat-dialog-title>{{ 'labels.heading.Reject Share' |translate}}</h1>
<h1 mat-dialog-title>{{ 'labels.heading.Reject Share' | translate }}</h1>
<div mat-dialog-content>
<p>{{'labels.text.Are you sure you want to reject share with id' |translate}}: {{ data.shareId }} ?</p>
<p>{{'labels.text.Are you sure you want to reject share with id' | translate }}: {{ data.shareId }} ?</p>
</div>
<mat-dialog-actions align="end">
<button mat-raised-button mat-dialog-close>{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button color="warn" [mat-dialog-close]="{ reject: true }">{{'labels.buttons.Confirm' |translate}}</button>
<button mat-raised-button mat-dialog-close>{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button color="warn" [mat-dialog-close]="{ reject: true }">{{'labels.buttons.Confirm' | translate }}</button>
</mat-dialog-actions>
src/app/shares/shares-account-actions/reject-shares/reject-shares.component.html
+6 -6
View File
@@ -5,31 +5,31 @@
<table #sharesTable mat-table [dataSource]="dataSource" matSort>
<ng-container matColumnDef="transactionDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Transaction Date' |translate}} </th>
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Transaction Date' | translate }} </th>
<td mat-cell *matCellDef="let share"> {{ share.purchasedDate | dateFormat }}</td>
</ng-container>
<ng-container matColumnDef="totalShares">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Total Shares' |translate}} </th>
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Total Shares' | translate }} </th>
<td mat-cell *matCellDef="let share"> {{ share.numberOfShares }} </td>
</ng-container>
<ng-container matColumnDef="redeemedPrice">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Purchased/Redeemed Price' |translate}} </th>
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Purchased/Redeemed Price' | translate }} </th>
<td mat-cell *matCellDef="let share"> {{ share.purchasedPrice }} </td>
</ng-container>
<ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Status' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Status' | translate }} </th>
<td mat-cell *matCellDef="let share">
<i class="fa fa-stop" [ngClass]="share.status.code|statusLookup" [matTooltip]="share.status.value"></i>
</td>
</ng-container>
<ng-container matColumnDef="reject">
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Confirm Reject' |translate}}t </th>
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Confirm Reject' | translate }}t </th>
<td mat-cell *matCellDef="let share">
<button class="share-action-button" mat-raised-button color="warn" matTooltip="{{ 'tooltips.Reject Share' |translate}}"
<button class="share-action-button" mat-raised-button color="warn" matTooltip="{{ 'tooltips.Reject Share' | translate }}"
(click)="reject(share.id)">
<i class="fa fa-times"></i>
</button>
src/app/shares/shares-account-actions/undo-approval-shares-account/undo-approval-shares-account.component.html
+3 -3
View File
@@ -9,7 +9,7 @@
<div>
<p class="mat-typography confirm-text">
{{'labels.text.Undo approval of shares account with ID' |translate}}: {{accountId}} ?
{{'labels.text.Undo approval of shares account with ID' | translate }}: {{accountId}} ?
</p>
</div>
@@ -17,8 +17,8 @@
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' |translate}}</button>
<button mat-raised-button color="warn">{{'labels.buttons.Confirm' |translate}}</button>
<button type="button" mat-raised-button [routerLink]="['../../']">{{'labels.buttons.Cancel' | translate }}</button>
<button mat-raised-button color="warn">{{'labels.buttons.Confirm' | translate }}</button>
</mat-card-actions>
</form>
src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.html
+9 -9
View File
@@ -1,7 +1,7 @@
<div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column">
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Charge' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Charge' | translate }}</mat-label>
<mat-select #charge>
<mat-option *ngFor="let charge of chargeData | chargesFilter:chargesDataSource:currencyCode.value" [value]="charge">
{{ charge.name }}
@@ -12,28 +12,28 @@
<div fxFlex="48%" fxFlexAlign="center">
<button type="button" mat-raised-button color="primary" (click)="addCharge(charge)" [disabled]="!charge.value">
<fa-icon icon="plus" class="m-r-10"></fa-icon>
{{'labels.buttons.Add' |translate}}
{{'labels.buttons.Add' | translate }}
</button>
</div>
<table fxFlex="98%" class="mat-elevation-z1" mat-table [dataSource]="chargesDataSource" [hidden]="chargesDataSource.length === 0">
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.name' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.name' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.name + ', ' + charge.currency.displaySymbol }}
</td>
</ng-container>
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Type' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Type' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value }}
</td>
</ng-container>
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Amount' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Amount' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.amount || charge.amountOrPercentage }}
<button mat-icon-button color="primary" (click)="editCharge(charge)">
@@ -43,14 +43,14 @@
</ng-container>
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Collected On' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Collected On' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value }}
</td>
</ng-container>
<ng-container matColumnDef="action">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Actions' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Actions' | translate }} </th>
<td mat-cell *matCellDef="let charge">
<button mat-icon-button color="warn" (click)="deleteCharge(charge)">
<fa-icon icon="trash"></fa-icon>
@@ -68,10 +68,10 @@
<div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
<button mat-raised-button matStepperPrevious>
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
{{'labels.buttons.Previous' |translate}}
{{'labels.buttons.Previous' | translate }}
</button>
<button mat-raised-button matStepperNext>
{{'labels.buttons.Next' |translate}}
{{'labels.buttons.Next' | translate }}
<fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
</button>
</div>
src/app/shares/shares-account-stepper/shares-account-details-step/shares-account-details-step.component.html
+7 -7
View File
@@ -3,30 +3,30 @@
<div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column">
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Product Name' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Product Name' | translate }}</mat-label>
<mat-select formControlName="productId" required>
<mat-option *ngFor="let product of productData" [value]="product.id">
{{ product.name }}
</mat-option>
</mat-select>
<mat-error>
{{ 'labels.inputs.Product Name' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Product Name' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field fxFlex="48%" (click)="submittedOnDatePicker.open()">
<mat-label>{{ 'labels.inputs.Submitted On' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Submitted On' | translate }}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="submittedOnDatePicker"
formControlName="submittedDate" required>
<mat-datepicker-toggle matSuffix [for]="submittedOnDatePicker"></mat-datepicker-toggle>
<mat-datepicker #submittedOnDatePicker></mat-datepicker>
<mat-error>
{{ 'labels.inputs.Submission Date' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Submission Date' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.External ID' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.External ID' | translate }}</mat-label>
<input matInput formControlName="externalId">
</mat-form-field>
@@ -35,10 +35,10 @@
<div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
<button mat-raised-button matStepperPrevious disabled>
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
{{'labels.buttons.Previous' |translate}}
{{'labels.buttons.Previous' | translate }}
</button>
<button mat-raised-button matStepperNext>
{{'labels.buttons.Next' |translate}}
{{'labels.buttons.Next' | translate }}
<fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
</button>
</div>
src/app/shares/shares-account-stepper/shares-account-preview-step/shares-account-preview-step.component.html
+24 -24
View File
@@ -1,114 +1,114 @@
<div fxLayout="row wrap" fxLayout.lt-md="column">
<h3 class="mat-h3" fxFlexFill>{{ 'labels.heading.Details' |translate}}</h3>
<h3 class="mat-h3" fxFlexFill>{{ 'labels.heading.Details' | translate }}</h3>
<mat-divider fxFlexFill></mat-divider>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Product' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Product' | translate }}</span>
<span fxFlex="60%">{{ sharesAccount.productId | find:sharesAccountTemplate.productOptions:'id':'name' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Submitted On' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Submitted On' | translate }}</span>
<span fxFlex="60%">{{ sharesAccount.submittedDate | dateFormat }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.External Id' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.External Id' | translate }}</span>
<span fxFlex="60%" *ngIf="sharesAccount.externalId">
<mifosx-external-identifier externalId="{{sharesAccount.externalId}}"></mifosx-external-identifier>
</span>
<span fxFlex="60%" *ngIf="!sharesAccount.externalId">
{{ 'labels.inputs.Unassigned' |translate}}
{{ 'labels.inputs.Unassigned' | translate }}
</span>
</div>
<h3 class="mat-h3" fxFlexFill>{{ 'labels.heading.Terms' |translate}}</h3>
<h3 class="mat-h3" fxFlexFill>{{ 'labels.heading.Terms' | translate }}</h3>
<mat-divider fxFlexFill></mat-divider>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Currency' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Currency' | translate }}</span>
<span fxFlex="60%">{{ sharesAccountTermsForm.get('currencyCode').value | find:[sharesAccountProductTemplate.currency]:'code':'displayLabel' }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Decimal Places' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Decimal Places' | translate }}</span>
<span fxFlex="60%">{{ sharesAccountTermsForm.get('decimal').value }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Total Number of Shares' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Total Number of Shares' | translate }}</span>
<span fxFlex="60%">{{ sharesAccount.requestedShares }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Today's Price' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Today's Price' | translate }}</span>
<span fxFlex="60%">{{ sharesAccountTermsForm.get('unitPrice').value }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Currency in multiples of' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Currency in multiples of' | translate }}</span>
<span fxFlex="60%">{{ sharesAccountTermsForm.get('currencyMultiple').value }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Default Savings Account' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Default Savings Account' | translate }}</span>
<span fxFlex="60%">{{ sharesAccount.savingsAccountId | find:sharesAccountProductTemplate.clientSavingsAccounts:'id':'accountNo' }}</span>
</div>
<div fxFlexFill *ngIf="sharesAccount.minimumActivePeriod">
<span fxFlex="40%">{{ 'labels.inputs.Minimum Active Period' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Minimum Active Period' | translate }}</span>
<span fxFlex="60%">{{sharesAccount.minimumActivePeriod}}&nbsp;{{sharesAccount.minimumActivePeriodFrequencyType | find:sharesAccountProductTemplate.minimumActivePeriodFrequencyTypeOptions:'id':'value'}}</span>
</div>
<div fxFlexFill *ngIf="sharesAccount.lockinPeriodFrequency">
<span fxFlex="40%">{{ 'labels.inputs.Lock-in Period' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Lock-in Period' | translate }}</span>
<span fxFlex="60%">{{sharesAccount.lockinPeriodFrequency}}&nbsp;{{sharesAccount.lockinPeriodFrequencyType | find:sharesAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value'}}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Application Date' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Application Date' | translate }}</span>
<span fxFlex="60%">{{ sharesAccount.applicationDate | dateFormat }}</span>
</div>
<div fxFlexFill>
<span fxFlex="40%">{{ 'labels.inputs.Allow dividends for inactive clients' |translate}}</span>
<span fxFlex="40%">{{ 'labels.inputs.Allow dividends for inactive clients' | translate }}</span>
<span fxFlex="60%">{{ sharesAccount.allowDividendCalculationForInactiveClients }}</span>
</div>
<div fxFlexFill *ngIf="sharesAccount.charges.length" fxLayout="row wrap" fxLayout.lt-md="column">
<h3 class="mat-h3" fxFlexFill>{{ 'labels.heading.Charges' |translate}}</h3>
<h3 class="mat-h3" fxFlexFill>{{ 'labels.heading.Charges' | translate }}</h3>
<mat-divider fxFlexFill></mat-divider>
<table fxFlexFill class="mat-elevation-z1" mat-table [dataSource]="sharesAccount.charges">
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.name' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.name' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.name + ', ' + charge.currency.displaySymbol }}
</td>
</ng-container>
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Type' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Type' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value }}
</td>
</ng-container>
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Amount' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Amount' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.amount || charge.amountOrPercentage }}
</td>
</ng-container>
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Collected On' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Collected On' | translate }} </th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value }}
</td>
@@ -126,12 +126,12 @@
<div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
<button mat-raised-button matStepperPrevious>
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
{{'labels.buttons.Previous' |translate}}
{{'labels.buttons.Previous' | translate }}
</button>
<button mat-raised-button [routerLink]="['../']">
{{'labels.buttons.Cancel' |translate}}
{{'labels.buttons.Cancel' | translate }}
</button>
<button mat-raised-button color="primary" (click)="submit.emit()">
{{'labels.buttons.Submit' |translate}}
{{'labels.buttons.Submit' | translate }}
</button>
</div>
src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.html
+19 -19
View File
@@ -3,69 +3,69 @@
<div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column" fxLayoutAlign.gt-sm="start center">
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Currency' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Currency' | translate }}</mat-label>
<input matInput formControlName="currencyCode">
</mat-form-field>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Decimal Places' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Decimal Places' | translate }}</mat-label>
<input type="number" matInput formControlName="decimal">
</mat-form-field>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Total Number of Shares' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Total Number of Shares' | translate }}</mat-label>
<input type="number" matInput formControlName="requestedShares" required>
<mat-error>
{{ 'labels.inputs.Total Number of Shares' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Total Number of Shares' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Today's Price' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Today's Price' | translate }}</mat-label>
<input type="number" matInput formControlName="unitPrice">
</mat-form-field>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Currency in multiples of' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Currency in multiples of' | translate }}</mat-label>
<input type="number" matInput formControlName="currencyMultiple" >
</mat-form-field>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Default Savings Account' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Default Savings Account' | translate }}</mat-label>
<mat-select formControlName="savingsAccountId" required>
<mat-option *ngFor="let account of savingsAccountsData" [value]="account.id">
{{ account.accountNo }}
</mat-option>
</mat-select>
<mat-error>
{{ 'labels.inputs.Default Savings Account' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Default Savings Account' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-form-field fxFlex="48%" (click)="applicationDatePicker.open()">
<mat-label>{{ 'labels.inputs.Application Date' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Application Date' | translate }}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="applicationDatePicker"
formControlName="applicationDate" required>
<mat-datepicker-toggle matSuffix [for]="applicationDatePicker"></mat-datepicker-toggle>
<mat-datepicker #applicationDatePicker></mat-datepicker>
<mat-error>
{{ 'labels.inputs.Application Date' |translate}} {{ "labels.commons.is" |translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.inputs.Application Date' | translate }} {{ "labels.commons.is" | translate }} <strong>{{ "labels.commons.required" | translate}}</strong>
</mat-error>
</mat-form-field>
<mat-checkbox labelPosition="before" formControlName="allowDividendCalculationForInactiveClients" fxFlex="48%">
{{ 'labels.inputs.Allow dividends for inactive clients' |translate}}
{{ 'labels.inputs.Allow dividends for inactive clients' | translate }}
</mat-checkbox>
<h4 fxFlex="98%" class="mat-h4">{{ 'labels.heading.Minimum Active Period' |translate}}</h4>
<h4 fxFlex="98%" class="mat-h4">{{ 'labels.heading.Minimum Active Period' | translate }}</h4>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Frequency' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Frequency' | translate }}</mat-label>
<input type="number" matInput formControlName="minimumActivePeriod">
</mat-form-field>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Type' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Type' | translate }}</mat-label>
<mat-select formControlName="minimumActivePeriodFrequencyType">
<mat-option *ngFor="let minimumActivePeriodFrequencyType of minimumActivePeriodFrequencyTypeData" [value]="minimumActivePeriodFrequencyType.id">
{{ minimumActivePeriodFrequencyType.value }}
@@ -73,15 +73,15 @@
</mat-select>
</mat-form-field>
<h4 fxFlex="98%" class="mat-h4">{{ 'labels.heading.Lock-in Period' |translate}}</h4>
<h4 fxFlex="98%" class="mat-h4">{{ 'labels.heading.Lock-in Period' | translate }}</h4>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Frequency' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Frequency' | translate }}</mat-label>
<input type="number" matInput formControlName="lockinPeriodFrequency">
</mat-form-field>
<mat-form-field fxFlex="48%">
<mat-label>{{ 'labels.inputs.Type' |translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Type' | translate }}</mat-label>
<mat-select formControlName="lockinPeriodFrequencyType">
<mat-option *ngFor="let lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData" [value]="lockinPeriodFrequencyType.id">
{{ lockinPeriodFrequencyType.value }}
@@ -94,10 +94,10 @@
<div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
<button mat-raised-button matStepperPrevious disabled>
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
{{'labels.buttons.Previous' |translate}}
{{'labels.buttons.Previous' | translate }}
</button>
<button mat-raised-button matStepperNext>
{{'labels.buttons.Next' |translate}}
{{'labels.buttons.Next' | translate }}
<fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
</button>
</div>
src/app/shares/shares-account-view/charges-tab/charges-tab.component.html
+9 -9
View File
@@ -1,7 +1,7 @@
<div class="tab-container mat-typography">
<div class="m-b-10">
<h3>{{ 'labels.heading.All Charges' |translate}}</h3>
<h3>{{ 'labels.heading.All Charges' | translate }}</h3>
</div>
<div class="mat-elevation-z1 m-b-25">
@@ -9,42 +9,42 @@
<table mat-table [dataSource]="dataSource">
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.name' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.name' | translate }} </th>
<td mat-cell *matCellDef="let charge"> {{ charge.name }} </td>
</ng-container>
<ng-container matColumnDef="feeOrPenalty">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Fee/Penalty' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Fee/Penalty' | translate }} </th>
<td mat-cell *matCellDef="let charge"> {{ charge.penalty === true ? 'Penalty' : 'Fee' }} </td>
</ng-container>
<ng-container matColumnDef="paymentDueAt">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Payment Due At' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Payment Due At' | translate }} </th>
<td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value }} </td>
</ng-container>
<ng-container matColumnDef="calculationType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Calculation Type' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Calculation Type' | translate }} </th>
<td mat-cell *matCellDef="let charge"> {{charge.chargeCalculationType.value}} </td>
</ng-container>
<ng-container matColumnDef="due">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Due' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Due' | translate }} </th>
<td mat-cell *matCellDef="let charge"> {{charge.currency.displaySymbol}}&nbsp;{{charge.amount}} </td>
</ng-container>
<ng-container matColumnDef="paid">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Paid' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Paid' | translate }} </th>
<td mat-cell *matCellDef="let charge"> {{charge.currency.displaySymbol}}&nbsp;{{charge.amountPaid}} </td>
</ng-container>
<ng-container matColumnDef="waived">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Waived' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Waived' | translate }} </th>
<td mat-cell *matCellDef="let charge"> {{charge.currency.displaySymbol}}&nbsp;{{charge.amountWaived}} </td>
</ng-container>
<ng-container matColumnDef="outstanding">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Outstanding' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Outstanding' | translate }} </th>
<td mat-cell *matCellDef="let charge"> {{charge.currency.displaySymbol}}&nbsp;{{charge.amountOutstanding}} </td>
</ng-container>
src/app/shares/shares-account-view/dividends-tab/dividends-tab.component.html
+5 -5
View File
@@ -1,7 +1,7 @@
<div class="tab-container mat-typography">
<div class="m-b-10">
<h3>{{ 'labels.inputs.All Dividends' |translate}}</h3>
<h3>{{ 'labels.inputs.All Dividends' | translate }}</h3>
</div>
<div class="mat-elevation-z1 m-b-25">
@@ -9,22 +9,22 @@
<table mat-table [dataSource]="dataSource" >
<ng-container matColumnDef="transactionDate">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Transaction Date' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Transaction Date' | translate }} </th>
<td mat-cell *matCellDef="let dividend"> {{dividend.postedDate | dateFormat}} </td>
</ng-container>
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Amount' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Amount' | translate }} </th>
<td mat-cell *matCellDef="let dividend"> {{shareAccountData.currency.displaySymbol}}&nbsp;{{dividend.amount}} </td>
</ng-container>
<ng-container matColumnDef="transactionReference">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Transaction Reference' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Transaction Reference' | translate }} </th>
<td mat-cell *matCellDef="let dividend"> {{dividend.savingsTransactionId}} </td>
</ng-container>
<ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Status' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Status' | translate }} </th>
<td mat-cell *matCellDef="let dividend"> {{dividend.status.value}} </td>
</ng-container>
src/app/shares/shares-account-view/shares-account-view.component.html
+19 -19
View File
@@ -7,7 +7,7 @@
<div class="profile-image-container">
<div>
<img mat-card-md-image class="profile-image"
matTooltip="{{ 'tooltips.Shares Account' |translate}}"
matTooltip="{{ 'tooltips.Shares Account' | translate }}"
src="assets/images/shares_account_placeholder.png">
</div>
</div>
@@ -16,14 +16,14 @@
<mat-card-title>
<h3>
<i class="fa fa-stop" [ngClass]="sharesAccountData.status.code | statusLookup" [matTooltip]="sharesAccountData.status.value"></i>
{{ 'labels.heading.Account Name' |translate}} : {{sharesAccountData.productName}}
{{ 'labels.heading.Account Name' | translate }} : {{sharesAccountData.productName}}
</h3>
</mat-card-title>
<mat-card-subtitle>
<p>
{{ 'labels.inputs.Account' |translate}} #: {{sharesAccountData.accountNo}} | {{ 'labels.inputs.Client Name' |translate}}: {{sharesAccountData.clientName}}<br/>
{{ 'labels.inputs.Current Market Price' |translate}}: {{sharesAccountData.currency.displaySymbol}}&nbsp;{{sharesAccountData.currentMarketPrice}}<br/>
{{ 'labels.inputs.Lockin Period' |translate}}: {{sharesAccountData.lockinPeriod ? sharesAccountData.lockinPeriod : 'N/A'}}
{{ 'labels.inputs.Account' | translate }} #: {{sharesAccountData.accountNo}} | {{ 'labels.inputs.Client Name' | translate }}: {{sharesAccountData.clientName}}<br/>
{{ 'labels.inputs.Current Market Price' | translate }}: {{sharesAccountData.currency.displaySymbol}}&nbsp;{{sharesAccountData.currentMarketPrice}}<br/>
{{ 'labels.inputs.Lockin Period' | translate }}: {{sharesAccountData.lockinPeriod ? sharesAccountData.lockinPeriod : 'N/A'}}
{{sharesAccountData.lockinPeriod ? sharesAccountData.lockPeriodTypeEnum.value : ''}}
</p>
</mat-card-subtitle>
@@ -39,7 +39,7 @@
</ng-container>
<ng-container *ngIf="buttonConfig.options.length">
<button mat-raised-button [matMenuTriggerFor]="More">{{ 'labels.heading.More' |translate}}</button>
<button mat-raised-button [matMenuTriggerFor]="More">{{ 'labels.heading.More' | translate }}</button>
<mat-menu #More="matMenu">
<span *ngFor="let option of buttonConfig.options">
<button mat-menu-item *mifosxHasPermission="option.taskPermissionName" (click)="doAction(option.name)">{{option.name}}</button>
@@ -56,33 +56,33 @@
<div class="shares-account-tables" fxLayout="row" fxLayoutGap="2%">
<div fxFlex="49%">
<h4 class="table-headers">{{ 'labels.heading.Shares Details' |translate}}</h4>
<h4 class="table-headers">{{ 'labels.heading.Shares Details' | translate }}</h4>
<table>
<tbody>
<tr>
<td>{{ 'labels.inputs.Activated On' |translate}}</td>
<td>{{ 'labels.inputs.Activated On' | translate }}</td>
<td>{{sharesAccountData.timeline.activatedOnDate ? (sharesAccountData.timeline.activatedOnDate | dateFormat) : 'Not Activated'}}</td>
</tr>
<tr>
<td>{{ 'labels.inputs.Currency' |translate}}</td>
<td>{{ 'labels.inputs.Currency' | translate }}</td>
<td>{{sharesAccountData.currency.name}} [{{sharesAccountData.currency.code}}]</td>
</tr>
<tr>
<td>{{ 'labels.inputs.External Id' |translate}}</td>
<td>{{ 'labels.inputs.External Id' | translate }}</td>
<td *ngIf="sharesAccountData.externalId">
<mifosx-external-identifier externalId="{{sharesAccountData.externalId}}"></mifosx-external-identifier>
</td>
<td *ngIf="!sharesAccountData.externalId">
{{ 'labels.inputs.Unassigned' |translate}}
{{ 'labels.inputs.Unassigned' | translate }}
</td>
</tr>
<tr>
<td>{{ 'labels.inputs.Linked Savings Account(Dividend Posting)' |translate}}</td>
<td>{{ 'labels.inputs.Linked Savings Account(Dividend Posting)' | translate }}</td>
<td *ngIf="sharesAccountData.savingsAccountNumber">
<mifosx-account-number accountNo="{{sharesAccountData.savingsAccountNumber}}"></mifosx-account-number>
</td>
<td *ngIf="!sharesAccountData.savingsAccountNumber">
{{ 'labels.inputs.Unassigned' |translate}}
{{ 'labels.inputs.Unassigned' | translate }}
</td>
</tr>
</tbody>
@@ -90,15 +90,15 @@
</div>
<div fxFlex="49%">
<h4 class="table-headers">{{ 'labels.heading.Account Summary' |translate}}</h4>
<h4 class="table-headers">{{ 'labels.heading.Account Summary' | translate }}</h4>
<table>
<tbody>
<tr>
<td>{{ 'labels.inputs.Approved Shares' |translate}}</td>
<td>{{ 'labels.inputs.Approved Shares' | translate }}</td>
<td>{{sharesAccountData.summary.totalApprovedShares}}</td>
</tr>
<tr>
<td>{{ 'labels.inputs.Pending for Approval Shares' |translate}}</td>
<td>{{ 'labels.inputs.Pending for Approval Shares' | translate }}</td>
<td>{{sharesAccountData.summary.totalPendingForApprovalShares}}</td>
</tr>
</tbody>
@@ -110,15 +110,15 @@
<nav mat-tab-nav-bar class="navigation-tabs">
<a mat-tab-link [routerLink]="['./transactions']" routerLinkActive #transactions="routerLinkActive"
[active]="transactions.isActive" *mifosxHasPermission="'READ_SHAREACCOUNTPURCHASE'">
{{ 'labels.inputs.Transactions' |translate}}
{{ 'labels.inputs.Transactions' | translate }}
</a>
<a mat-tab-link [routerLink]="['./charges']" routerLinkActive #charges="routerLinkActive"
[active]="charges.isActive" *mifosxHasPermission="'READ_SHAREACCOUNTCHARGE'">
{{ 'labels.inputs.Charges' |translate}}
{{ 'labels.inputs.Charges' | translate }}
</a>
<a mat-tab-link [routerLink]="['./dividends']" routerLinkActive #dividends="routerLinkActive"
[active]="dividends.isActive" *mifosxHasPermission="'READ_SHAREACCOUNTDIVIDENDS'">
{{ 'labels.inputs.Dividends' |translate}}
{{ 'labels.inputs.Dividends' | translate }}
</a>
</nav>
src/app/shares/shares-account-view/transactions-tab/transactions-tab.component.html
+7 -7
View File
@@ -1,7 +1,7 @@
<div class="tab-container mat-typography">
<div class="m-b-10">
<h3>{{ 'labels.heading.All Transactions' |translate}}</h3>
<h3>{{ 'labels.heading.All Transactions' | translate }}</h3>
</div>
<div class="mat-elevation-z1 m-b-25">
@@ -9,32 +9,32 @@
<table mat-table [dataSource]="dataSource">
<ng-container matColumnDef="transactionDate">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Transaction Date' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Transaction Date' | translate }} </th>
<td mat-cell *matCellDef="let transaction"> {{transaction.purchasedDate | dateFormat}} </td>
</ng-container>
<ng-container matColumnDef="transactionType">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Transaction Type' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Transaction Type' | translate }} </th>
<td mat-cell *matCellDef="let transaction"> {{transaction.type.value}} {{transaction.type.value !== "Charge Payment" ? ('(' + transaction.status.value + ')') : ''}}</td>
</ng-container>
<ng-container matColumnDef="totalShares">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Total Shares' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Total Shares' | translate }} </th>
<td mat-cell *matCellDef="let transaction"> {{transaction.numberOfShares}} </td>
</ng-container>
<ng-container matColumnDef="purchasedOrRedeemedPrice">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Purhcased/Redeemed Price' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Purhcased/Redeemed Price' | translate }} </th>
<td mat-cell *matCellDef="let transaction">{{shareAccountData.currency.displaySymbol}}&nbsp;{{transaction.purchasedPrice}}</td>
</ng-container>
<ng-container matColumnDef="chargeAmount">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Charge Amount' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Charge Amount' | translate }} </th>
<td mat-cell *matCellDef="let transaction">{{shareAccountData.currency.displaySymbol}}&nbsp;{{transaction.type.value === "Charge Payment" ? transaction.amount : transaction.chargeAmount}}</td>
</ng-container>
<ng-container matColumnDef="amountRecievedOrReturned">
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Amount Recieved/Returned' |translate}} </th>
<th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Amount Recieved/Returned' | translate }} </th>
<td mat-cell *matCellDef="let transaction">{{shareAccountData.currency.displaySymbol}}&nbsp;{{transaction.amount}}</td>
</ng-container>