Fix in products view routes (#1643)

Co-authored-by: Jose Alberto Hernandez <alberto@MacBook-Pro.local>
This commit is contained in:
José Alberto Hernández
2023-01-13 12:09:06 -06:00
committed by GitHub
co-authored by Jose Alberto Hernandez
parent f330e91aa4
commit a56347d400
236 changed files with 944 additions and 940 deletions
@@ -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="'ADD_PREFERENCES'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Preference
</button>
</div>
@@ -1,12 +1,12 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_ACCOUNTNUMBERFORMAT'">
<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)="delete()" *mifosxHasPermission="'DELETE_ACCOUNTNUMBERFORMAT'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" (click)="downloadCSV()">
<fa-icon icon="file"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="file" class="m-r-10"></fa-icon>
Download CSV
</button>
</div>
+1 -1
View File
@@ -1,7 +1,7 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<div #buttonCreateCode>
<button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_CODE'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Code
</button>
</div>
@@ -1,20 +1,20 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px" fxLayout.xs="column">
<button mat-raised-button color="primary" (click)="addCodeValueRow()" *mifosxHasPermission="'CREATE_CODEVALUE'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Code Value
</button>
<span *ngIf="!codeData.systemDefined">
<button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_CODE'">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit Code
</button>
</span>
<span *ngIf="!codeData.systemDefined">
<button mat-raised-button color="warn" (click)="delete()" *mifosxHasPermission="'DELETE_CODEVALUE'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete Code
</button>
</span>
@@ -2,7 +2,7 @@
<div #buttonEdit class="in-block">
<button mat-raised-button color="primary" (click)="editTask(); backupCheckValues();" *mifosxHasPermission="'UPDATE_PERMISSION'">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit
</button>
</div>
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<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>
</div>
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<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>
</div>
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<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>
</div>
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<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>
</div>
@@ -49,7 +49,7 @@
<p fxFlex="20%" class="mat-title">Columns</p>
<button mat-raised-button fxFlex="20%" type="button" color="primary" (click)="addColumn()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Column
</button>
@@ -42,7 +42,7 @@
<p fxFlex="20%" class="mat-title">Columns</p>
<button mat-raised-button fxFlex="20%" type="button" color="primary" (click)="addColumn()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Column
</button>
@@ -1,7 +1,7 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<div #createDatatableRef class="in-block">
<button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_DATATABLE'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Data Table
</button>
</div>
@@ -1,12 +1,12 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_DATATABLE'">
<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)="delete()" *mifosxHasPermission="'DELETE_DATATABLE'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
@@ -112,7 +112,7 @@
<p fxFlex="20%" class="mat-title">Events</p>
<button mat-raised-button fxFlex="20%" type="button" color="primary" (click)="addEvent()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Event
</button>
@@ -112,7 +112,7 @@
<p fxFlex="20%" class="mat-title">Events</p>
<button mat-raised-button fxFlex="20%" type="button" color="primary" (click)="addEvent()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Event
</button>
@@ -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_HOOK'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Hook
</button>
</div>
@@ -1,12 +1,12 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_HOOK'">
<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)="delete()" *mifosxHasPermission="'DELETE_HOOK'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
@@ -3,11 +3,11 @@
<h2 class="no-m">Scheduler Status: {{ schedulerActive ? 'Active' : 'Inactive' }}</h2>
</div>
<button mat-raised-button class="suspend">
<fa-icon icon="times-circle"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="times-circle" class="m-r-10"></fa-icon>
Suspend
</button>
<button mat-raised-button class="activate" (click)="activateScheduler()" *ngIf="!schedulerActive">
<fa-icon icon="times-circle"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="times-circle" class="m-r-10"></fa-icon>
Activate
</button>
@@ -24,7 +24,7 @@
<div class="container space-top" fxLayout="row" fxLayoutGap="20px">
<button mat-raised-button color="primary" (click)="runSelectedJobs()">
<fa-icon icon="play"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="play" class="m-r-10"></fa-icon>
Run Selected Jobs
</button>
</div>
@@ -108,7 +108,7 @@
<div class="container space-top" fxLayout="row" fxLayoutGap="20px">
<button mat-raised-button color="primary" (click)="runSelectedJobs()">
<fa-icon icon="play"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="play" class="m-r-10"></fa-icon>
Run Selected Jobs<ng-template #templateSchedulerJobs let-data let-popover="popover">
<h2>Template</h2>
<p>This is the template I am trying to use. Is that fine.</p>
@@ -116,7 +116,7 @@
</ng-template>
</button>
<button mat-raised-button color="primary" (click)="refresh()">
<fa-icon icon="sync"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="sync" class="m-r-10"></fa-icon>
Refresh
</button>
</div>
@@ -1,6 +1,6 @@
<div class="container m-b-20" fxLayout="row" fxLayout.lt-md="column" fxLayoutAlign="end" fxLayoutGap="2%">
<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]="['viewhistory']">
@@ -11,7 +11,7 @@
<div class="action-button" fxLayoutGap="25px" *ngIf="jobStepsData.length > 0">
<button mat-raised-button color="primary" (click)="addJobStep()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;Link Job Step
<fa-icon icon="plus" class="m-r-10"></fa-icon>Link Job Step
</button>
</div>
@@ -85,7 +85,7 @@
<button mat-raised-button fxFlex="20%" type="button" *ngIf="!reportData.coreReport" color="primary"
(click)="addReportParameter()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Report Parameter
</button>
@@ -1,7 +1,7 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<div #buttonCreateReport class="in-block">
<button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_REPORT'">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Report
</button>
</div>
@@ -1,13 +1,13 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" [routerLink]="['edit']" *mifosxHasPermission="'UPDATE_REPORT'">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit
</button>
<span *ngIf="!reportData.coreReport">
<button mat-raised-button color="warn" (click)="delete()" *mifosxHasPermission="'DELETE_REPORT'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete
</button>
</span>
@@ -66,7 +66,7 @@
<div fxFlex="98%" fxLayout="row wrap" fxLayoutGap="2%" fxLayoutAlign="space-between center">
<h2 class="mat-h2">Question {{ questionIndex + 1 }}</h2>
<button mat-raised-button color="warn" (click)="removeQuestion(questionIndex)" [disabled]="questionDatas.controls.length === 1">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete Question
</button>
</div>
@@ -97,7 +97,7 @@
<div fxFlex="98%" fxLayout="row" fxLayoutAlign="space-between center">
<h4 class="mat-h4">Options</h4>
<button type="button" mat-raised-button color="primary" (click)="addResponse(questionIndex)">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Option
</button>
</div>
@@ -150,7 +150,7 @@
<mat-card-actions *ngIf="isLast" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button (click)="cancelSurvey()">Cancel</button>
<button type="button" mat-raised-button color="primary"(click)="addQuestion()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Question
</button>
<button mat-raised-button color="primary" [disabled]="!surveyForm.valid">Submit</button>
@@ -59,7 +59,7 @@
<div fxFlex="98%" fxLayout="row wrap" fxLayoutGap="2%" fxLayoutAlign="space-between center">
<h2 class="mat-h2">Question {{ questionIndex + 1 }}</h2>
<button mat-raised-button color="warn" (click)="removeQuestion(questionIndex)" [disabled]="questionDatas.controls.length === 1">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete Question
</button>
</div>
@@ -90,7 +90,7 @@
<div fxFlex="98%" fxLayout="row" fxLayoutAlign="space-between center">
<h4 class="mat-h4">Options</h4>
<button type="button" mat-raised-button color="primary" (click)="addResponse(questionIndex)">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Option
</button>
</div>
@@ -143,7 +143,7 @@
<mat-card-actions *ngIf="isLast" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button (click)="cancelSurvey()">Cancel</button>
<button type="button" mat-raised-button color="primary" (click)="addQuestion()">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Question
</button>
<button mat-raised-button color="primary" [disabled]="!surveyForm.valid">Edit Survey</button>
@@ -1,10 +1,10 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary" [routerLink]="['create']">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Create Surveys
</button>
</div>
<div class="container">
<div fxLayout="row">
@@ -13,26 +13,26 @@
<input matInput (keyup)="applyFilter($event.target.value)">
</mat-form-field>
</div>
<div class="mat-elevation-z8">
<table mat-table [dataSource]="dataSource" matSort>
<ng-container matColumnDef="key">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Key </th>
<td mat-cell *matCellDef="let survey"> {{ survey.key }} </td>
</ng-container>
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
<td mat-cell *matCellDef="let survey"> {{ survey.name }} </td>
</ng-container>
<ng-container matColumnDef="description">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Description </th>
<td mat-cell *matCellDef="let survey"> {{ survey.description }} </td>
</ng-container>
<ng-container matColumnDef="countryCode">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Country Code </th>
<td mat-cell *matCellDef="let survey"> {{ survey.countryCode }} </td>
@@ -51,14 +51,14 @@
<th mat-header-cell *matHeaderCellDef mat-sort-header> Action </th>
<td mat-cell *matCellDef="let survey">
<button mat-button *ngIf="!isActive(survey.validFrom, survey.validTo)" color="accent">
<fa-icon icon="lock-open"></fa-icon>&nbsp;&nbsp;Activate
<fa-icon icon="lock-open" class="m-r-10"></fa-icon>Activate
</button>
<button mat-button *ngIf="isActive(survey.validFrom, survey.validTo)" color="warn">
<fa-icon icon="lock"></fa-icon>&nbsp;&nbsp;Deactivate
<fa-icon icon="lock" class="m-r-10"></fa-icon>Deactivate
</button>
</td>
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let survey; columns: displayedColumns;" [routerLink]="[survey.id]" class="select-row"></tr>
@@ -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" *mifosxHasPermission="'UPDATE_REPORT'" (click)="onEdit()">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit
</button>
</div>
@@ -1,7 +1,7 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px" [routerLink]="['add']">
<div #buttonAddRole class="in-block">
<button mat-raised-button color="primary">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="plus" class="m-r-10"></fa-icon>
Add Role
</button>
</div>
@@ -1,21 +1,21 @@
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
<button mat-raised-button color="primary" (click)="editRoles(); backupCheckValues();" [disabled]="rolePermissionService.name === 'Super user'">
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="edit" class="m-r-10"></fa-icon>
Edit Role
</button>
<button *ngIf="!isRoleEnable(rolePermissionService.disabled)" mat-raised-button color="danger" (click)="disableRolesConfirmation()" [disabled]="rolePermissionService.name === 'Super user'">
<fa-icon icon="lock"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="lock" class="m-r-10"></fa-icon>
Disable Role
</button>
<button *ngIf="isRoleEnable(rolePermissionService.disabled)" mat-raised-button color="primary" (click)="enableRolesConfirmation()" [disabled]="rolePermissionService.name === 'Super user'">
<fa-icon icon="lock-open"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="lock-open" class="m-r-10"></fa-icon>
Enable Role
</button>
<button mat-raised-button color="warn" (click)="deleteRole()" [disabled]="rolePermissionService.name === 'Super user'">
<fa-icon icon="trash"></fa-icon>&nbsp;&nbsp;
<fa-icon icon="trash" class="m-r-10"></fa-icon>
Delete Role
</button>