Skip to content

Commit

Permalink
Fix in products view routes (openMF#1643)
Browse files Browse the repository at this point in the history
Co-authored-by: Jose Alberto Hernandez <[email protected]>
  • Loading branch information
josehernandezfintecheandomx and Jose Alberto Hernandez authored Jan 13, 2023
1 parent f330e91 commit a56347d
Show file tree
Hide file tree
Showing 236 changed files with 937 additions and 933 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
<button mat-raised-button color="primary" [routerLink]="['../', 'edit']">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit
</button>
<button mat-raised-button color="primary" [routerLink]="['../', 'list-account-transactions']" *mifosxHasPermission="'READ_ACCOUNTTRANSFER'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_ACCOUNTINGRULE'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Rule
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
<button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_ACCOUNTINGRULE'">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit
</button>
<button mat-raised-button color="warn" (click)="deleteAccountingRule()" *mifosxHasPermission="'DELETE_ACCOUNTINGRULE'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</div>
<div #buttonAddAccount>
<button mat-raised-button color="primary" [routerLink]="['gl-accounts/create']" *mifosxHasPermission="'CREATE_GLACCOUNT'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Account
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
<span *mifosxHasPermission="'CREATE_GLACCOUNT'">
<button mat-raised-button color="primary" *ngIf="glAccount.usage.value === 'HEADER'" [routerLink]="['/accounting/chart-of-accounts/gl-accounts/create']" [queryParams]="{ parent: glAccount.id, accountType: glAccount.type.id }">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Subledger Account
</button>
</span>
<span *mifosxHasPermission="'UPDATE_GLACCOUNT'">
<button mat-raised-button color="primary" [routerLink]="['edit']">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit
</button>
</span>
<span *mifosxHasPermission="'UPDATE_GLACCOUNT'">
<button mat-raised-button color="warn" *ngIf="!glAccount.disabled" (click)="changeGlAccountState()">
<fa-icon icon="lock"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="lock" class="m-r-10"></fa-icon>
Disable
</button>
</span>
<span *mifosxHasPermission="'UPDATE_GLACCOUNT'">
<button mat-raised-button color="accent" *ngIf="glAccount.disabled" (click)="changeGlAccountState()">
<fa-icon icon="lock-open"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="lock-open" class="m-r-10"></fa-icon>
Enable
</button>
</span>
<button mat-raised-button color="warn" (click)="deleteGlAccount()" *mifosxHasPermission="'DELETE_GLACCOUNT'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<div #buttonCreateClosure>
<button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_GLCLOSURE'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Closure
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
<button mat-raised-button color="primary" [routerLink]="['edit']">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit
</button>
<button mat-raised-button color="warn" (click)="deleteAccountingClosure()" *mifosxHasPermission="'DELETE_GLCLOSURE'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div fxLayout="row" fxLayoutAlign="end" class="container m-b-20">
<div #buttonDefineMapping>
<button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_FINANCIALACTIVITYACCOUNT'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;Define New Mapping
<fa-icon icon="plus" class="m-r-10"></fa-icon>Define New Mapping
</button>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" class="container m-b-20">
<button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_FINANCIALACTIVITYACCOUNT'">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit
</button>
<button mat-raised-button color="warn" (click)="deleteFinancialActivityAccount()" *mifosxHasPermission="'DELETE_FINANCIALACTIVITYACCOUNT'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!periodicAccrualsForm.valid" *mifosxHasPermission="'EXECUTE_PERIODICACCRUALACCOUNTING'">
<fa-icon icon="play"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="play" class="m-r-10"></fa-icon>
Run Periodic Accruals
</button>
</mat-card-actions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'VIEW_ALL_PROVISIONING_ENTRIES'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Provisioning Entry
</button>
</div>
Expand Down Expand Up @@ -39,7 +39,7 @@
<th mat-header-cell *matHeaderCellDef> View Report </th>
<td mat-cell *matCellDef="let provisioningEntry">
<button mat-button color="primary" [routerLink]="['view', provisioningEntry.id]">
<fa-icon icon="eye"></fa-icon>&nbsp;&nbsp;View
<fa-icon icon="eye" class="m-r-10"></fa-icon>View
</button>
</td>
</ng-container>
Expand All @@ -48,7 +48,7 @@
<th mat-header-cell *matHeaderCellDef> Recreate Provisioning </th>
<td mat-cell *matCellDef="let provisioningEntry">
<button mat-button (click)="recreateProvisioning($event, provisioningEntry.id)" [disabled]="provisioningEntry.journalEntry" color="primary">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;Recreate
<fa-icon icon="edit" class="m-r-10"></fa-icon>Recreate
</button>
</td>
</ng-container>
Expand All @@ -57,7 +57,7 @@
<th mat-header-cell *matHeaderCellDef> View Journal Entry </th>
<td mat-cell *matCellDef="let provisioningEntry">
<button mat-button (click)="viewJournalEntry($event, provisioningEntry.id)" [disabled]="!provisioningEntry.journalEntry" color="primary">
<fa-icon icon="eye"></fa-icon>&nbsp;&nbsp;View
<fa-icon icon="eye" class="m-r-10"></fa-icon>View
</button>
</td>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" (click)="createProvisioningJournalEntries()" [disabled]="provisioningEntry.journalEntry" *mifosxHasPermission="'CREATE_JOURNAL_ENTRY'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Journal Entries
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="accent" [disabled]="!activateCenterForm.valid">Confirm</button>
<button mat-raised-button color="primary" [disabled]="!activateCenterForm.valid">Confirm</button>
</mat-card-actions>

</form>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end">
<button mat-raised-button color="primary" (click)="editSchedule()">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit Schedule
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="back-button">
<button type="button" color="primary" mat-raised-button [routerLink]="['../../']">
<fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;Back
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>Back
</button>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h3>Notes</h3>
<textarea formControlName="note" matInput placeholder="Write a note ...."></textarea>
</mat-form-field>
<button mat-raised-button fxFlex color="primary" [disabled]="!noteForm.valid" *mifosxHasPermission="'CREATE_GROUPNOTE'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp; Add
<fa-icon icon="plus" class="m-r-10"></fa-icon> Add
</button>
</form>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/app/centers/centers.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</div>
<div class="action-button" fxLayoutGap="25px">
<button mat-raised-button color="primary" [routerLink]="['../', 'organization', 'bulk-import', 'Centers']" *mifosxHasPermission="'CREATE_CENTER'">
<fa-icon icon="download"></fa-icon>&nbsp;&nbsp;Import Center
<fa-icon icon="download" class="m-r-10"></fa-icon>Import Center
</button>
<button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_CENTER'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;Create Center
<fa-icon icon="plus" class="m-r-10"></fa-icon>Create Center
</button>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
<button mat-raised-button matStepperPrevious disabled>
<fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
Previous
</button>
<button mat-raised-button matStepperNext>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h3>Family Members</h3>

<div fxLayout="row" fxLayoutAlign="flex-end" class="m-b-20">
<button mat-raised-button color="primary" (click)="addFamilyMember()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;Add
<fa-icon icon="plus" class="m-r-10"></fa-icon>Add
</button>
</div>

Expand Down Expand Up @@ -34,7 +34,7 @@ <h3>Family Members</h3>
<fa-icon icon="trash"></fa-icon>
</button>
</div>

<p>
First Name : {{ member.firstName }}<br />
Middle Name : {{ member.middleName }}<br />
Expand All @@ -55,7 +55,7 @@ <h3>Family Members</h3>

<div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
<button mat-raised-button matStepperPrevious>
<fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
Previous
</button>
<button mat-raised-button matStepperNext>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@

<div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
<button mat-raised-button matStepperPrevious disabled>
<fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
Previous
</button>
<button mat-raised-button matStepperNext>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h3>Address</h3>

<div fxLayout="row" fxLayoutAlign="flex-end">
<button mat-raised-button color="primary" (click)="addAddress()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;Add
<fa-icon icon="plus" class="m-r-10"></fa-icon>Add
</button>
</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
<button mat-raised-button color="primary" [routerLink]="['pay']" *mifosxHasPermission="'PAY_CLIENTCHARGE'">
<fa-icon icon="dollar-sign"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="dollar-sign" class="m-r-10"></fa-icon>
Pay
</button>
<button mat-raised-button color="primary" (click)="waiveCharge()" *mifosxHasPermission="'WAIVE_CLIENTCHARGE'">
<i class="fa fa-flag"></i>
Waive Charge
</button>
<button mat-raised-button color="primary" (click)="deleteCharge()">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
</div>
Expand Down Expand Up @@ -111,7 +111,7 @@ <h1><b> Transactions </b></h1>
<th mat-header-cell *matHeaderCellDef> Actions </th>
<td mat-cell *matCellDef="let element" [ngClass]="{'strikeoff':element.reversed}">
<button mat-raised-button color="primary" (click)="undoTransaction(element.id)" class="delBtn">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
</button>
</td>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="accent" [disabled]="!activateClientForm.valid">Confirm</button>
<button mat-raised-button color="primary" [disabled]="!activateClientForm.valid">Confirm</button>
</mat-card-actions>

</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!clientScreenReportForm.valid">
<fa-icon icon="cogs" size="sm"></fa-icon>&nbsp;&nbsp;Generate Report</button>
<fa-icon icon="cogs" size="sm" class="m-r-10"></fa-icon>Generate Report</button>
</mat-card-actions>

</form>
Expand All @@ -42,7 +42,7 @@

<div fxLayoutAlign="end">
<button mat-stroked-button color="primary" [disabled]="!template" (click)="print()">
<fa-icon icon="file"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="file" class="m-r-10"></fa-icon>
Print
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="accent" [disabled]="!undoClientRejectionForm.valid">Confirm</button>
<button mat-raised-button color="primary" [disabled]="!undoClientRejectionForm.valid">Confirm</button>
</mat-card-actions>

</form>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayoutAlign="end">
<button mat-raised-button color="primary" [routerLink]="['../Take Survey']">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Take Survey
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/clients/clients-view/clients-view.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h3 fxFlex="95%">
<span>Edit</span>
</button>

<button mat-menu-item [matMenuTriggerFor]="accountApplications">
<button *ngIf="isActive()" mat-menu-item [matMenuTriggerFor]="accountApplications">
<mat-icon matListIcon>
<fa-icon icon="money-bill-alt" size="sm"></fa-icon>
</mat-icon>
Expand Down
4 changes: 4 additions & 0 deletions src/app/clients/clients-view/clients-view.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ export class ClientsViewComponent implements OnInit {
);
}

isActive(): boolean {
return (this.clientViewData.status.value === 'Active');
}

/**
* Performs action button/option action.
* @param {string} name action name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h1 mat-dialog-title align="center">Capture Client Image</h1>
Capture
</button>
<button *ngIf="isCaptured" mat-stroked-button color="primary" (click)="recapture()">
<fa-icon icon="undo" size="sm"></fa-icon>&nbsp;&nbsp;Recapture
<fa-icon icon="undo" size="sm" class="m-r-10"></fa-icon>Recapture
</button>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h3>Family Members</h3>

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h3>Identities</h3>

<button mat-raised-button class="f-right" color="primary" (click)="addIdentifier()" *mifosxHasPermission="'CREATE_CLIENTIDENTIFIER'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp; Add
<fa-icon icon="plus" class="m-r-10"></fa-icon> Add
</button>

<table mat-table #identifiersTable [dataSource]="clientIdentities">
Expand Down
Loading

0 comments on commit a56347d

Please sign in to comment.