build: Use prettier for html
Stop ignoring html files in prettier and fix existing issues.
This commit is contained in:
Ralph Hopman
@@ -1,54 +1,52 @@
|
||||
<div class="container">
|
||||
|
||||
<mat-card>
|
||||
|
||||
<form [formGroup]="reportForm" (ngSubmit)="submit()">
|
||||
|
||||
<mat-card-content>
|
||||
|
||||
<div fxLayout="row wrap" fxLayout.lt-md="column" fxLayoutGap="4%">
|
||||
|
||||
<mat-form-field fxFlex="30%">
|
||||
<mat-label>{{ 'labels.inputs.Report Name' | translate }}</mat-label>
|
||||
<input matInput required formControlName="reportName">
|
||||
<input matInput required formControlName="reportName" />
|
||||
<mat-error *ngIf="reportForm.controls.reportName.hasError('required')">
|
||||
{{ 'labels.inputs.Report Name' | translate }} {{'labels.commons.is' | translate }} <strong>{{'labels.commons.required' | translate }}</strong>
|
||||
{{ 'labels.inputs.Report Name' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field fxFlex="30%">
|
||||
<mat-label>{{ 'labels.inputs.Report Type' | translate }}</mat-label>
|
||||
<mat-select required formControlName="reportType">
|
||||
<mat-option *ngFor="let allowedReportType of reportTemplateData.allowedReportTypes"
|
||||
[value]="allowedReportType">
|
||||
{{ allowedReportType | translateKey:'text' }}
|
||||
<mat-option
|
||||
*ngFor="let allowedReportType of reportTemplateData.allowedReportTypes"
|
||||
[value]="allowedReportType"
|
||||
>
|
||||
{{ allowedReportType | translateKey: 'text' }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="reportForm.controls.reportType.hasError('required')">
|
||||
{{ 'labels.inputs.Report Type' | translate }} {{'labels.commons.is' | translate }} <strong>{{'labels.commons.required' | translate }}</strong>
|
||||
{{ 'labels.inputs.Report Type' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field fxFlex="30%">
|
||||
<mat-label>{{ 'labels.inputs.Report Sub Type' | translate }}</mat-label>
|
||||
<mat-select formControlName="reportSubType">
|
||||
<mat-option *ngFor="let allowedReportSubType of reportTemplateData.allowedReportSubTypes"
|
||||
[value]="allowedReportSubType">
|
||||
{{ allowedReportSubType | translateKey:'text' }}
|
||||
<mat-option
|
||||
*ngFor="let allowedReportSubType of reportTemplateData.allowedReportSubTypes"
|
||||
[value]="allowedReportSubType"
|
||||
>
|
||||
{{ allowedReportSubType | translateKey: 'text' }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
|
||||
<div fxLayout="row wrap" fxLayout.lt-md="column" fxLayoutGap="4%">
|
||||
|
||||
<mat-form-field fxFlex="40%">
|
||||
<mat-label>{{ 'labels.inputs.Report Category' | translate }}</mat-label>
|
||||
<mat-select formControlName="reportCategory">
|
||||
<mat-option *ngFor="let reportCategoryType of reportCategoryTypeOptions"
|
||||
[value]="reportCategoryType">
|
||||
{{ reportCategoryType | translateKey:'catalogs' }}
|
||||
<mat-option *ngFor="let reportCategoryType of reportCategoryTypeOptions" [value]="reportCategoryType">
|
||||
{{ reportCategoryType | translateKey: 'catalogs' }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
@@ -58,11 +56,9 @@
|
||||
{{ 'labels.inputs.User Report (UI)' | translate }}
|
||||
</mat-checkbox>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div fxLayout="column">
|
||||
|
||||
<mat-form-field fxFlex="98%">
|
||||
<mat-label>{{ 'labels.inputs.Description' | translate }}</mat-label>
|
||||
<textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
|
||||
@@ -70,69 +66,88 @@
|
||||
|
||||
<mat-form-field fxFlex="98%">
|
||||
<mat-label>{{ 'labels.inputs.SQL' | translate }}</mat-label>
|
||||
<textarea matInput required formControlName="reportSql" cdkTextareaAutosize cdkAutosizeMinRows="6"></textarea>
|
||||
<textarea
|
||||
matInput
|
||||
required
|
||||
formControlName="reportSql"
|
||||
cdkTextareaAutosize
|
||||
cdkAutosizeMinRows="6"
|
||||
></textarea>
|
||||
<mat-error *ngIf="reportForm.controls.reportSql.hasError('required')">
|
||||
{{ 'labels.inputs.SQL' | translate }} {{'labels.commons.is' | translate }} <strong>{{'labels.commons.required' | translate }}</strong>
|
||||
{{ 'labels.inputs.SQL' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<br />
|
||||
|
||||
<div fxLayout="row wrap" fxLayoutGap="60%" fxLayout.lt-md="column">
|
||||
|
||||
<p fxFlex="20%" class="mat-title">{{ 'labels.inputs.Report Parameters' | translate }}</p>
|
||||
|
||||
<button mat-raised-button fxFlex="20%" type="button" color="primary" (click)="addReportParameter()">
|
||||
<fa-icon icon="plus" class="m-r-10"></fa-icon>{{ 'labels.buttons.Add Report Parameter' | translate }}
|
||||
</button>
|
||||
|
||||
</div>
|
||||
|
||||
<table mat-table [dataSource]="dataSource" matSort>
|
||||
|
||||
<ng-container matColumnDef="parameterName">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{'labels.buttons.Parameters' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let reportParameter"> {{ reportParameter.parameterName }} </td>
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.buttons.Parameters' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let reportParameter">{{ reportParameter.parameterName }}</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="parameterNamePassed">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{'labels.inputs.Parameter Name Passed to Pentaho' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let reportParameter"> {{ reportParameter.reportParameterName }} </td>
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>
|
||||
{{ 'labels.inputs.Parameter Name Passed to Pentaho' | translate }}
|
||||
</th>
|
||||
<td mat-cell *matCellDef="let reportParameter">{{ reportParameter.reportParameterName }}</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="actions">
|
||||
<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 reportParameter" fxLayoutGap="15%">
|
||||
<button type="button" fxFlex="8%" color="primary" mat-icon-button
|
||||
(click)="editReportParameter(reportParameter)">
|
||||
<button
|
||||
type="button"
|
||||
fxFlex="8%"
|
||||
color="primary"
|
||||
mat-icon-button
|
||||
(click)="editReportParameter(reportParameter)"
|
||||
>
|
||||
<fa-icon icon="edit" size="lg"></fa-icon>
|
||||
</button>
|
||||
<button type="button" fxFlex="8%" color="warn" mat-icon-button
|
||||
(click)="deleteReportParameter(reportParameter)">
|
||||
<button
|
||||
type="button"
|
||||
fxFlex="8%"
|
||||
color="warn"
|
||||
mat-icon-button
|
||||
(click)="deleteReportParameter(reportParameter)"
|
||||
>
|
||||
<fa-icon icon="trash" size="lg"></fa-icon>
|
||||
</button>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
|
||||
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
|
||||
</table>
|
||||
|
||||
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
|
||||
|
||||
</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 type="submit" color="primary"
|
||||
[disabled]="!reportForm.valid && reportParametersData.length === 0" *mifosxHasPermission="'CREATE_REPORT'">{{'labels.buttons.Submit' | translate }}</button>
|
||||
<button type="button" mat-raised-button [routerLink]="['../']">
|
||||
{{ 'labels.buttons.Cancel' | translate }}
|
||||
</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
type="submit"
|
||||
color="primary"
|
||||
[disabled]="!reportForm.valid && reportParametersData.length === 0"
|
||||
*mifosxHasPermission="'CREATE_REPORT'"
|
||||
>
|
||||
{{ 'labels.buttons.Submit' | translate }}
|
||||
</button>
|
||||
</mat-card-actions>
|
||||
|
||||
</form>
|
||||
|
||||
</mat-card>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -1,18 +1,14 @@
|
||||
<div class="container">
|
||||
|
||||
<mat-card>
|
||||
|
||||
<form [formGroup]="reportForm" (ngSubmit)="submit()">
|
||||
|
||||
<mat-card-content>
|
||||
|
||||
<div fxLayout="row wrap" fxLayout.lt-md="column" fxLayoutGap="4%">
|
||||
|
||||
<mat-form-field fxFlex="30%">
|
||||
<mat-label>{{ 'labels.inputs.Report Name' | translate }}</mat-label>
|
||||
<input matInput required formControlName="reportName">
|
||||
<input matInput required formControlName="reportName" />
|
||||
<mat-error *ngIf="reportForm.controls.reportName.hasError('required')">
|
||||
{{ 'labels.inputs.Report Name' | translate }} {{'labels.commons.is' | translate }} <strong>{{'labels.commons.required' | translate }}</strong>
|
||||
{{ 'labels.inputs.Report Name' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
@@ -20,34 +16,34 @@
|
||||
<mat-label>{{ 'labels.inputs.Report Type' | translate }}</mat-label>
|
||||
<mat-select required formControlName="reportType">
|
||||
<mat-option *ngFor="let allowedReportType of reportData.allowedReportTypes" [value]="allowedReportType">
|
||||
{{ allowedReportType | translateKey:'text'}}
|
||||
{{ allowedReportType | translateKey: 'text' }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="reportForm.controls.reportType.hasError('required')">
|
||||
{{ 'labels.inputs.Report Type' | translate }} {{'labels.commons.is' | translate }} <strong>{{'labels.commons.required' | translate }}</strong>
|
||||
{{ 'labels.inputs.Report Type' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field fxFlex="30%">
|
||||
<mat-label>{{ 'labels.inputs.Report Sub Type' | translate }}</mat-label>
|
||||
<mat-select formControlName="reportSubType">
|
||||
<mat-option *ngFor="let allowedReportSubType of reportData.allowedReportSubTypes"
|
||||
[value]="allowedReportSubType">
|
||||
{{ allowedReportSubType | translateKey:'text'}}
|
||||
<mat-option
|
||||
*ngFor="let allowedReportSubType of reportData.allowedReportSubTypes"
|
||||
[value]="allowedReportSubType"
|
||||
>
|
||||
{{ allowedReportSubType | translateKey: 'text' }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
|
||||
<div fxLayout="row wrap" fxLayout.lt-md="column" fxLayoutGap="4%">
|
||||
|
||||
<mat-form-field fxFlex="40%">
|
||||
<mat-label>{{ 'labels.inputs.Report Category' | translate }}</mat-label>
|
||||
<mat-select formControlName="reportCategory">
|
||||
<mat-option *ngFor="let reportCategoryType of reportCategoryTypeOptions"
|
||||
[value]="reportCategoryType">
|
||||
{{ reportCategoryType | translateKey:'catalogs' }}
|
||||
<mat-option *ngFor="let reportCategoryType of reportCategoryTypeOptions" [value]="reportCategoryType">
|
||||
{{ reportCategoryType | translateKey: 'catalogs' }}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
@@ -57,11 +53,9 @@
|
||||
{{ 'labels.inputs.User Report (UI)' | translate }}
|
||||
</mat-checkbox>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div fxLayout="column">
|
||||
|
||||
<mat-form-field fxFlex="98%">
|
||||
<mat-label>{{ 'labels.inputs.Description' | translate }}</mat-label>
|
||||
<textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
|
||||
@@ -69,71 +63,97 @@
|
||||
|
||||
<mat-form-field fxFlex="98%">
|
||||
<mat-label> {{ 'labels.inputs.SQL' | translate }}</mat-label>
|
||||
<textarea matInput required formControlName="reportSql" cdkTextareaAutosize cdkAutosizeMinRows="6"></textarea>
|
||||
<textarea
|
||||
matInput
|
||||
required
|
||||
formControlName="reportSql"
|
||||
cdkTextareaAutosize
|
||||
cdkAutosizeMinRows="6"
|
||||
></textarea>
|
||||
<mat-error *ngIf="reportForm.controls.reportSql.hasError('required')">
|
||||
{{ 'labels.inputs.SQL' | translate }} {{'labels.commons.is' | translate }} <strong>{{'labels.commons.required' | translate }}</strong>
|
||||
{{ 'labels.inputs.SQL' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<br />
|
||||
|
||||
<div fxLayout="row wrap" fxLayoutGap="60%" fxLayout.lt-md="column">
|
||||
|
||||
<p fxFlex="20%" class="mat-title">{{ 'labels.inputs.Report Parameters' | translate }}</p>
|
||||
|
||||
<button mat-raised-button fxFlex="20%" type="button" *ngIf="!reportData.coreReport" color="primary"
|
||||
(click)="addReportParameter()">
|
||||
<button
|
||||
mat-raised-button
|
||||
fxFlex="20%"
|
||||
type="button"
|
||||
*ngIf="!reportData.coreReport"
|
||||
color="primary"
|
||||
(click)="addReportParameter()"
|
||||
>
|
||||
<fa-icon icon="plus" class="m-r-10"></fa-icon>
|
||||
{{ 'labels.buttons.Add Report Parameter' | translate }}
|
||||
</button>
|
||||
|
||||
</div>
|
||||
|
||||
<table mat-table [dataSource]="dataSource" matSort>
|
||||
|
||||
<ng-container matColumnDef="parameterName">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{'labels.buttons.Parameters' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let reportParameter"> {{ reportParameter.parameterName }} </td>
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.buttons.Parameters' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let reportParameter">{{ reportParameter.parameterName }}</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="parameterNamePassed">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{'labels.inputs.Parameter Name Passed to Pentaho' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let reportParameter"> {{ reportParameter.reportParameterName }} </td>
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>
|
||||
{{ 'labels.inputs.Parameter Name Passed to Pentaho' | translate }}
|
||||
</th>
|
||||
<td mat-cell *matCellDef="let reportParameter">{{ reportParameter.reportParameterName }}</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="actions">
|
||||
<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 reportParameter" fxLayoutGap="15%">
|
||||
<button *ngIf="!reportData.coreReport" type="button" fxFlex="8%" color="primary" mat-icon-button
|
||||
(click)="editReportParameter(reportParameter)">
|
||||
<button
|
||||
*ngIf="!reportData.coreReport"
|
||||
type="button"
|
||||
fxFlex="8%"
|
||||
color="primary"
|
||||
mat-icon-button
|
||||
(click)="editReportParameter(reportParameter)"
|
||||
>
|
||||
<fa-icon icon="edit" size="lg"></fa-icon>
|
||||
</button>
|
||||
<button *ngIf="!reportData.coreReport" type="button" fxFlex="8%" color="warn" mat-icon-button
|
||||
(click)="deleteReportParameter(reportParameter)">
|
||||
<button
|
||||
*ngIf="!reportData.coreReport"
|
||||
type="button"
|
||||
fxFlex="8%"
|
||||
color="warn"
|
||||
mat-icon-button
|
||||
(click)="deleteReportParameter(reportParameter)"
|
||||
>
|
||||
<fa-icon icon="trash" size="lg"></fa-icon>
|
||||
</button>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
|
||||
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
|
||||
</table>
|
||||
|
||||
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
|
||||
|
||||
</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="primary"
|
||||
[disabled]="(!reportForm.valid || reportForm.pristine) && !isReportParametersChanged" *mifosxHasPermission="'UPDATE_REPORT'">{{'labels.buttons.Submit' | translate }}</button>
|
||||
<button type="button" mat-raised-button [routerLink]="['../']">
|
||||
{{ 'labels.buttons.Cancel' | translate }}
|
||||
</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
[disabled]="(!reportForm.valid || reportForm.pristine) && !isReportParametersChanged"
|
||||
*mifosxHasPermission="'UPDATE_REPORT'"
|
||||
>
|
||||
{{ 'labels.buttons.Submit' | translate }}
|
||||
</button>
|
||||
</mat-card-actions>
|
||||
|
||||
</form>
|
||||
|
||||
</mat-card>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -1,99 +1,157 @@
|
||||
<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" class="m-r-10"></fa-icon>
|
||||
{{ 'labels.buttons.Create Report' | translate }}
|
||||
<fa-icon icon="plus" class="m-r-10"></fa-icon>
|
||||
{{ 'labels.buttons.Create Report' | translate }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div #filter fxLayout="row">
|
||||
<mat-form-field fxFlex>
|
||||
<mat-label>{{ 'labels.inputs.Filter' | translate }}</mat-label>
|
||||
<input matInput (keyup)="applyFilter($event.target.value)" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
|
||||
<div #filter fxLayout="row">
|
||||
<mat-form-field fxFlex>
|
||||
<mat-label>{{'labels.inputs.Filter' | translate}}</mat-label>
|
||||
<input matInput (keyup)="applyFilter($event.target.value)">
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div #reportsTable class="mat-elevation-z8 table-container">
|
||||
<table mat-table [dataSource]="dataSource" matSort>
|
||||
<ng-container matColumnDef="reportName">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.inputs.Report Name' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let report">{{ report.reportName }}</td>
|
||||
</ng-container>
|
||||
|
||||
<div #reportsTable class="mat-elevation-z8 table-container">
|
||||
<ng-container matColumnDef="reportType">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.inputs.Report Type' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let report">{{ report.reportType | translateKey: 'text' }}</td>
|
||||
</ng-container>
|
||||
|
||||
<table mat-table [dataSource]="dataSource" matSort>
|
||||
<ng-container matColumnDef="reportSubType">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.inputs.Report Sub Type' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let report">{{ report.reportSubType | translateKey: 'text' }}</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="reportName">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Report Name' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let report"> {{ report.reportName }} </td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="reportCategory">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.inputs.Report Category' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let report">{{ report.reportCategory | translateKey: 'catalogs' }}</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="reportType">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Report Type' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let report"> {{ report.reportType | translateKey:'text'}} </td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="coreReport">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.inputs.Core Report' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let report">
|
||||
<fa-icon
|
||||
*ngIf="report.coreReport"
|
||||
icon="check-circle"
|
||||
size="lg"
|
||||
class="true"
|
||||
[matTooltip]="'tooltips.Yes' | translate"
|
||||
matTooltipPosition="right"
|
||||
></fa-icon>
|
||||
<fa-icon
|
||||
*ngIf="!report.coreReport"
|
||||
icon="times-circle"
|
||||
size="lg"
|
||||
class="false"
|
||||
[matTooltip]="'tooltips.No' | translate"
|
||||
matTooltipPosition="right"
|
||||
></fa-icon>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="reportSubType">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Report Sub Type' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let report"> {{ report.reportSubType | translateKey:'text'}} </td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="userReport">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'labels.inputs.User Report' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let report">
|
||||
<fa-icon
|
||||
*ngIf="report.useReport"
|
||||
icon="check-circle"
|
||||
size="lg"
|
||||
class="true"
|
||||
[matTooltip]="'tooltips.Yes' | translate"
|
||||
matTooltipPosition="right"
|
||||
></fa-icon>
|
||||
<fa-icon
|
||||
*ngIf="!report.useReport"
|
||||
icon="times-circle"
|
||||
size="lg"
|
||||
class="false"
|
||||
[matTooltip]="'tooltips.No' | translate"
|
||||
matTooltipPosition="right"
|
||||
></fa-icon>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="reportCategory">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Report Category' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let report"> {{ report.reportCategory | translateKey:'catalogs' }} </td>
|
||||
</ng-container>
|
||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns" [routerLink]="[row.id]" class="select-row"></tr>
|
||||
</table>
|
||||
|
||||
<ng-container matColumnDef="coreReport">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.Core Report' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let report">
|
||||
<fa-icon *ngIf="report.coreReport" icon="check-circle" size="lg" class="true" [matTooltip]="('tooltips.Yes' | translate)"
|
||||
matTooltipPosition="right"></fa-icon>
|
||||
<fa-icon *ngIf="!report.coreReport" icon="times-circle" size="lg" class="false" [matTooltip]="('tooltips.No' | translate)"
|
||||
matTooltipPosition="right"></fa-icon>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="userReport">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header> {{ 'labels.inputs.User Report' | translate }} </th>
|
||||
<td mat-cell *matCellDef="let report">
|
||||
<fa-icon *ngIf="report.useReport" icon="check-circle" size="lg" class="true" [matTooltip]="('tooltips.Yes' | translate)"
|
||||
matTooltipPosition="right"></fa-icon>
|
||||
<fa-icon *ngIf="!report.useReport" icon="times-circle" size="lg" class="false" [matTooltip]="('tooltips.No' | translate)"
|
||||
matTooltipPosition="right"></fa-icon>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.id]"
|
||||
class="select-row"></tr>
|
||||
</table>
|
||||
|
||||
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
|
||||
|
||||
</div>
|
||||
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ng-template #templateButtonCreateReport let-popover="popover">
|
||||
<h2>{{ 'labels.buttons.Create Report' | translate }}</h2>
|
||||
<p class="mw300">{{ 'labels.text.Create new report' | translate }}</p>
|
||||
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
|
||||
<button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">{{'labels.buttons.Close' | translate }}</button>
|
||||
<button mat-raised-button color="primary" (click)="popover.close();previousStep()">{{'labels.buttons.Back' | translate}}</button>
|
||||
<button mat-raised-button color="primary" (click)="popover.close();showPopover(templateFilter,filter, 'bottom', true)">{{'labels.buttons.Next' | translate }}</button>
|
||||
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
|
||||
{{ 'labels.buttons.Close' | translate }}
|
||||
</button>
|
||||
<button mat-raised-button color="primary" (click)="popover.close(); previousStep()">
|
||||
{{ 'labels.buttons.Back' | translate }}
|
||||
</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
(click)="popover.close(); showPopover(templateFilter, filter, 'bottom', true)"
|
||||
>
|
||||
{{ 'labels.buttons.Next' | translate }}
|
||||
</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<ng-template #templateFilter let-popover="popover">
|
||||
<h4>{{ 'labels.heading.Filter reports by name' | translate }}</h4>
|
||||
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
|
||||
<button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">{{'labels.buttons.Close' | translate }}</button>
|
||||
<button mat-raised-button color="primary" (click)="popover.close();showPopover(templateButtonCreateReport, buttonCreateReport, 'bottom', true)">{{'labels.buttons.Back' | translate}}</button>
|
||||
<button mat-raised-button color="primary" (click)="popover.close();showPopover(templateReportsTable,reportsTable, 'top', true)">{{'labels.buttons.Next' | translate }}</button>
|
||||
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
|
||||
{{ 'labels.buttons.Close' | translate }}
|
||||
</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
(click)="popover.close(); showPopover(templateButtonCreateReport, buttonCreateReport, 'bottom', true)"
|
||||
>
|
||||
{{ 'labels.buttons.Back' | translate }}
|
||||
</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
(click)="popover.close(); showPopover(templateReportsTable, reportsTable, 'top', true)"
|
||||
>
|
||||
{{ 'labels.buttons.Next' | translate }}
|
||||
</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<ng-template #templateReportsTable let-popover="popover">
|
||||
<h4 class="mw300">{{ 'labels.heading.List of all currently available reports' | translate }}: <a href="https://mifosforge.jira.com/wiki/spaces/docs/pages/67895354/Manage+Reports" target="_blank">{{'labels.heading.Manage Reports' | translate}}</a></h4>
|
||||
<h4 class="mw300">
|
||||
{{ 'labels.heading.List of all currently available reports' | translate }}:
|
||||
<a href="https://mifosforge.jira.com/wiki/spaces/docs/pages/67895354/Manage+Reports" target="_blank">{{
|
||||
'labels.heading.Manage Reports' | translate
|
||||
}}</a>
|
||||
</h4>
|
||||
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
|
||||
<button mat-raised-button color="warn" (click)="popover.close();configurationWizardService.closeConfigWizard()">{{'labels.buttons.Close' | translate }}</button>
|
||||
<button mat-raised-button color="primary" (click)="popover.close();showPopover(templateFilter,filter, 'bottom', true)">{{'labels.buttons.Back' | translate}}</button>
|
||||
<button mat-raised-button color="primary" (click)="popover.close();nextStep()">{{'labels.buttons.Next' | translate }}</button>
|
||||
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
|
||||
{{ 'labels.buttons.Close' | translate }}
|
||||
</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
(click)="popover.close(); showPopover(templateFilter, filter, 'bottom', true)"
|
||||
>
|
||||
{{ 'labels.buttons.Back' | translate }}
|
||||
</button>
|
||||
<button mat-raised-button color="primary" (click)="popover.close(); nextStep()">
|
||||
{{ 'labels.buttons.Next' | translate }}
|
||||
</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
+17
-13
@@ -1,11 +1,11 @@
|
||||
<h1 mat-dialog-title>{{ data.parameterName ? ('labels.buttons.Edit' | translate) : ('labels.buttons.Add' | translate) }} {{'labels.heading.Report Parameter' | translate }}</h1>
|
||||
<h1 mat-dialog-title>
|
||||
{{ data.parameterName ? ('labels.buttons.Edit' | translate) : ('labels.buttons.Add' | translate) }}
|
||||
{{ 'labels.heading.Report Parameter' | translate }}
|
||||
</h1>
|
||||
|
||||
<mat-dialog-content>
|
||||
|
||||
<form [formGroup]="reportParameterForm">
|
||||
|
||||
<div fxLayout="column">
|
||||
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Select allowed parameter' | translate }}</mat-label>
|
||||
<mat-select required formControlName="parameterName">
|
||||
@@ -14,23 +14,27 @@
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="reportParameterForm.controls.parameterName.hasError('required')">
|
||||
{{ 'labels.inputs.Report Parameters' | translate }} {{'labels.commons.is' | translate }} <strong>{{'labels.commons.required' | translate }}</strong>
|
||||
{{ 'labels.inputs.Report Parameters' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field>
|
||||
<mat-label>{{'labels.inputs.Parameter Name Passed to Pentaho' | translate }}</mat-label>
|
||||
<input matInput formControlName="reportParameterName">
|
||||
<mat-label>{{ 'labels.inputs.Parameter Name Passed to Pentaho' | translate }}</mat-label>
|
||||
<input matInput formControlName="reportParameterName" />
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</mat-dialog-content>
|
||||
|
||||
<mat-dialog-actions align="end">
|
||||
<button mat-button mat-dialog-close>{{'labels.buttons.Cancel' | translate}}</button>
|
||||
<button mat-raised-button color="primary"
|
||||
[disabled]="!reportParameterForm.valid || reportParameterForm.pristine" (click)="submit()">{{'labels.buttons.Submit' | translate }}</button>
|
||||
<button mat-button mat-dialog-close>{{ 'labels.buttons.Cancel' | translate }}</button>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
[disabled]="!reportParameterForm.valid || reportParameterForm.pristine"
|
||||
(click)="submit()"
|
||||
>
|
||||
{{ 'labels.buttons.Submit' | translate }}
|
||||
</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@@ -1,35 +1,27 @@
|
||||
<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" class="m-r-10"></fa-icon>
|
||||
{{'labels.buttons.Edit' | translate }}
|
||||
{{ 'labels.buttons.Edit' | translate }}
|
||||
</button>
|
||||
|
||||
<span *ngIf="!reportData.coreReport">
|
||||
<button mat-raised-button color="warn" (click)="delete()" *mifosxHasPermission="'DELETE_REPORT'">
|
||||
<fa-icon icon="trash" class="m-r-10"></fa-icon>
|
||||
{{'labels.buttons.Delete' | translate }}
|
||||
{{ 'labels.buttons.Delete' | translate }}
|
||||
</button>
|
||||
</span>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
|
||||
<mat-card>
|
||||
|
||||
<mat-card-title>{{ reportData.reportName }}</mat-card-title>
|
||||
|
||||
<mat-card-content>
|
||||
|
||||
<div fxLayout="row wrap" class="content">
|
||||
|
||||
<div fxFlex="50%" class="mat-body-strong">
|
||||
{{ 'labels.inputs.Report Type' | translate }}:
|
||||
</div>
|
||||
<div fxFlex="50%" class="mat-body-strong">{{ 'labels.inputs.Report Type' | translate }}:</div>
|
||||
|
||||
<div fxFlex="50%">
|
||||
{{ reportData.reportType | translateKey:'text' }}
|
||||
{{ reportData.reportType | translateKey: 'text' }}
|
||||
</div>
|
||||
|
||||
<div *ngIf="reportData.reportSubType" fxFlex="50%" class="mat-body-strong">
|
||||
@@ -37,37 +29,27 @@
|
||||
</div>
|
||||
|
||||
<div *ngIf="reportData.reportSubType" fxFlex="50%">
|
||||
{{ reportData.reportSubType | translateKey:'text' }}
|
||||
{{ reportData.reportSubType | translateKey: 'text' }}
|
||||
</div>
|
||||
|
||||
<div fxFlex="50%" class="mat-body-strong">
|
||||
{{ 'labels.inputs.Report Category' | translate }}:
|
||||
</div>
|
||||
<div fxFlex="50%" class="mat-body-strong">{{ 'labels.inputs.Report Category' | translate }}:</div>
|
||||
|
||||
<div fxFlex="50%">
|
||||
{{ reportData.reportCategory | translateKey:'catalogs' }}
|
||||
{{ reportData.reportCategory | translateKey: 'catalogs' }}
|
||||
</div>
|
||||
|
||||
<div fxFlex="50%" class="mat-body-strong">
|
||||
{{ 'labels.inputs.Core Report' | translate }}:
|
||||
</div>
|
||||
<div fxFlex="50%" class="mat-body-strong">{{ 'labels.inputs.Core Report' | translate }}:</div>
|
||||
|
||||
<div fxFlex="50%">
|
||||
{{ reportData.coreReport | yesNo }}
|
||||
</div>
|
||||
|
||||
<div fxFlex="50%" class="mat-body-strong">
|
||||
{{ 'labels.inputs.User Report' | translate }}:
|
||||
</div>
|
||||
<div fxFlex="50%" class="mat-body-strong">{{ 'labels.inputs.User Report' | translate }}:</div>
|
||||
|
||||
<div fxFlex="50%">
|
||||
{{ reportData.useReport | yesNo }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</mat-card-content>
|
||||
|
||||
</mat-card>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user