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

build: Use prettier for html

Browse Source 
Stop ignoring html files in prettier and fix existing issues.
This commit is contained in:
Ralph Hopman
2024-12-19 09:36:50 +01:00
committed by Adam Saghy
parent c5fc3925fb
commit 2ec9ba81d6
651 changed files with 28935 additions and 20624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/reports/run-report/chart/chart.component.html
+8 -4
View File
@@ -1,10 +1,14 @@
<div class="m-b-20" fxLayoutAlign="end">
<mat-button-toggle-group aria-label="Select Chart Type">
<mat-button-toggle value="Bar" (click) = "setBarChart(inputData)">{{"labels.buttons.Bar Chart" | translate}}</mat-button-toggle>
<mat-button-toggle value="Pie" (click) = "setPieChart(inputData)">{{"labels.buttons.Pie Chart" | translate}}</mat-button-toggle>
<mat-button-toggle-group aria-label="Select Chart Type">
<mat-button-toggle value="Bar" (click)="setBarChart(inputData)">{{
'labels.buttons.Bar Chart' | translate
}}</mat-button-toggle>
<mat-button-toggle value="Pie" (click)="setPieChart(inputData)">{{
'labels.buttons.Pie Chart' | translate
}}</mat-button-toggle>
</mat-button-toggle-group>
</div>
<div [ngStyle]="{'display': (hideOutput) ? 'none' : 'block'}">
<div [ngStyle]="{ display: hideOutput ? 'none' : 'block' }">
<canvas id="output"></canvas>
</div>
src/app/reports/run-report/pentaho/pentaho.component.html
+1 -1
View File
@@ -1 +1 @@
<iframe *ngIf = "!hideOutput" [src]="pentahoUrl" frameborder="0" width=100% height="750px;"></iframe>
<iframe *ngIf="!hideOutput" [src]="pentahoUrl" frameborder="0" width="100%" height="750px;"></iframe>
src/app/reports/run-report/run-report.component.html
+47 -39
View File
@@ -1,52 +1,53 @@
<div class="container input">
<mat-card *ngIf="!isCollapsed">
<form [formGroup]="reportForm">
<mat-card-content fxLayout="column">
<ng-container *ngFor="let param of paramData" [ngSwitch]="param.displayType">
<ng-container *ngIf="reportForm.contains(param.name)">
<mat-form-field fxFlex *ngSwitchCase="'text'">
<mat-label>{{param.label}}</mat-label>
<input matInput required [formControlName]="param.name">
<mat-label>{{ param.label }}</mat-label>
<input matInput required [formControlName]="param.name" />
<mat-error *ngIf="reportForm.controls[param.name].hasError('required')">
{{param.label}} {{ "labels.commons.is" | translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ param.label }} {{ 'labels.commons.is' | translate }}
<strong>{{ 'labels.commons.required' | translate }}</strong>
</mat-error>
</mat-form-field>
<mat-form-field fxFlex *ngSwitchCase="'date'" (click)="runReportDatePicker.open()">
<mat-label>{{param.label}}</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="runReportDatePicker" required
[formControlName]="param.name">
<mat-label>{{ param.label }}</mat-label>
<input
matInput
[min]="minDate"
[max]="maxDate"
[matDatepicker]="runReportDatePicker"
required
[formControlName]="param.name"
/>
<mat-datepicker-toggle matSuffix [for]="runReportDatePicker"></mat-datepicker-toggle>
<mat-datepicker #runReportDatePicker></mat-datepicker>
<mat-error *ngIf="reportForm.controls[param.name].hasError('required')">
{{param.label}} {{ "labels.commons.is" | translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ param.label }} {{ 'labels.commons.is' | translate }}
<strong>{{ 'labels.commons.required' | translate }}</strong>
</mat-error>
</mat-form-field>
<mat-form-field fxFlex *ngSwitchCase="'select'">
<mat-label>{{param.label}}</mat-label>
<mat-label>{{ param.label }}</mat-label>
<mat-select required [formControlName]="param.name">
<mat-option *ngFor="let option of param.selectOptions" [value]="option">
{{option.name}}
{{ option.name }}
</mat-option>
</mat-select>
<mat-error *ngIf="reportForm.controls[param.name].hasError('required')">
{{param.label}} {{ "labels.commons.is" | translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ param.label }} {{ 'labels.commons.is' | translate }}
<strong>{{ 'labels.commons.required' | translate }}</strong>
</mat-error>
</mat-form-field>
</ng-container>
</ng-container>
<mat-form-field fxFlex>
<mat-label>{{"labels.inputs.Decimal Places" | translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Decimal Places' | translate }}</mat-label>
<mat-select [formControl]="decimalChoice">
<mat-option value="0">0</mat-option>
<mat-option value="1">1</mat-option>
@@ -57,50 +58,59 @@
</mat-form-field>
<mat-form-field fxFlex *ngIf="isPentahoReport()">
<mat-label>{{'labels.inputs.Output Type' | translate}}</mat-label>
<mat-label>{{ 'labels.inputs.Output Type' | translate }}</mat-label>
<mat-select required formControlName="outputType">
<mat-option *ngFor="let option of outputTypeOptions" [value]="option.value">
{{ "labels.inputs." + option.name | translate}}
{{ 'labels.inputs.' + option.name | translate }}
</mat-option>
</mat-select>
<mat-error *ngIf="reportForm.controls['outputType'].hasError('required')">
{{ "labels.text.Report Output Type" | translate }} {{ "labels.commons.is" | translate}} <strong>{{ "labels.commons.required" | translate}}</strong>
{{ 'labels.text.Report Output Type' | translate }} {{ 'labels.commons.is' | translate }}
<strong>{{ 'labels.commons.required' | translate }}</strong>
</mat-error>
</mat-form-field>
<div fxFlex="98%" *ngIf="exportToS3Allowed" >
<div fxFlex="98%" *ngIf="exportToS3Allowed">
<mat-checkbox labelPosition="after" formControlName="exportOutputToS3">
{{ "labels.text.Export output data to S3 repository" | translate }} [{{exportToS3Repository}}]
{{ 'labels.text.Export output data to S3 repository' | translate }} [{{ exportToS3Repository }}]
</mat-checkbox>
</div>
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['/reports']">{{"labels.buttons.Cancel" | translate}}</button>
<button mat-raised-button color="primary" [disabled]="!reportForm.valid || isProcessing" id="runreport" (click)="run()">
<fa-icon icon="file-export" class="m-r-10"></fa-icon>
{{"labels.buttons.Run Report" | translate}}
<button type="button" mat-raised-button [routerLink]="['/reports']">
{{ 'labels.buttons.Cancel' | translate }}
</button>
<button *ngIf="isTableReport()" mat-raised-button color="primary" [disabled]="!reportForm.valid || isProcessing" (click)="runReportAndExport($event)">
<button
mat-raised-button
color="primary"
[disabled]="!reportForm.valid || isProcessing"
id="runreport"
(click)="run()"
>
<fa-icon icon="file-export" class="m-r-10"></fa-icon>
{{ 'labels.buttons.Run Report' | translate }}
</button>
<button
*ngIf="isTableReport()"
mat-raised-button
color="primary"
[disabled]="!reportForm.valid || isProcessing"
(click)="runReportAndExport($event)"
>
<fa-icon icon="download" class="m-r-10"></fa-icon>
{{"labels.buttons.Run and Download Report" | translate}}
{{ 'labels.buttons.Run and Download Report' | translate }}
</button>
</mat-card-actions>
</form>
</mat-card>
</div>
<div class="container output" *ngIf="isCollapsed">
<mat-card>
<div class="m-b-20">
<button mat-raised-button color="primary" (click)="isCollapsed = false">
{{'labels.buttons.Parameters' | translate}}
{{ 'labels.buttons.Parameters' | translate }}
</button>
</div>
@@ -109,7 +119,5 @@
<mifosx-chart *ngIf="!hideChart" [dataObject]="dataObject"></mifosx-chart>
<mifosx-pentaho *ngIf="!hidePentaho" [dataObject]="dataObject"></mifosx-pentaho>
</div>
</mat-card>
</div>
src/app/reports/run-report/table-and-sms/table-and-sms.component.html
+25 -17
View File
@@ -1,31 +1,39 @@
<div class="container">
<div *ngIf="!hideOutput && !toBeExportedToRepo">
<div class="m-b-10" *ngIf="dataObject.report.type === 'Table'" fxLayoutGap="25px" fxLayoutAlign="end">
<button mat-raised-button color="primary" (click)="exportFile()" [disabled]="notExistsReportData"
matToolTip="{{'labels.text.Export the data to CSV file' | translate}}">
{{'labels.buttons.Export CSV' | translate}}
<button
mat-raised-button
color="primary"
(click)="exportFile()"
[disabled]="notExistsReportData"
matToolTip="{{ 'labels.text.Export the data to CSV file' | translate }}"
>
{{ 'labels.buttons.Export CSV' | translate }}
</button>
<button mat-raised-button color="primary" (click)="exportToXLS()" [disabled]="notExistsReportData"
matToolTip="{{'labels.text.Export the data to XLS file' | translate}}">
{{'labels.buttons.Export XLS' | translate}}
<button
mat-raised-button
color="primary"
(click)="exportToXLS()"
[disabled]="notExistsReportData"
matToolTip="{{ 'labels.text.Export the data to XLS file' | translate }}"
>
{{ 'labels.buttons.Export XLS' | translate }}
</button>
</div>
<div class="table-output" [hidden]="notExistsReportData">
<table id="report-table" mat-table [dataSource]="dataSource">
<div *ngFor="let column of displayedColumns index as i">
<div *ngFor="let column of displayedColumns; index as i">
<ng-container [matColumnDef]="column">
<th mat-header-cell *matHeaderCellDef>{{column}}</th>
<th mat-header-cell *matHeaderCellDef>{{ column }}</th>
<td mat-cell *matCellDef="let param">
<span *ngIf="isDecimal(i)">{{toDecimal(param.row[i])}}</span>
<span *ngIf="!isDecimal(i)">{{param.row[i]}}</span>
<span *ngIf="isDecimal(i)">{{ toDecimal(param.row[i]) }}</span>
<span *ngIf="!isDecimal(i)">{{ param.row[i] }}</span>
</td>
</ng-container>
</div>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;" class="select-row"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns" class="select-row"></tr>
</table>
<mat-paginator [pageSizeOptions]="[100, 200, 300]" showFirstLastButtons></mat-paginator>
</div>
@@ -33,7 +41,7 @@
<div class="alert" [hidden]="!notExistsReportData">
<div class="message">
<i class="fa fa-exclamation-circle alert-check"></i>
{{'labels.text.No report data was generated' | translate}}
{{ 'labels.text.No report data was generated' | translate }}
</div>
</div>
</div>
@@ -41,7 +49,7 @@
<div class="alert" *ngIf="!hideOutput && toBeExportedToRepo">
<div class="message">
<i class="fa fa-exclamation-circle alert-check"></i>
{{'labels.text.The report request' | translate}}
{{ 'labels.text.The report request' | translate }}
</div>
</div>
@@ -51,7 +59,7 @@
<div class="back-button" *ngIf="!hideOutput">
<button type="button" color="primary" mat-raised-button [routerLink]="['../..']">
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>{{"labels.buttons.Back" | translate}}</button>
<fa-icon icon="arrow-left" class="m-r-10"></fa-icon>{{ 'labels.buttons.Back' | translate }}
</button>
</div>
</div>