From 2e38d2c8d94e9e27ff763f341781f22661b9ad70 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 17 Jan 2019 14:28:03 +0100
Subject: [PATCH] =?UTF-8?q?tslint:=20tout=20propre=20(renommage=20propri?=
=?UTF-8?q?=C3=A9t=C3=A9s=20@Input=20et=20@Output)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.component.html | 4 ++--
src/app/app.component.ts | 8 ++++----
.../check-field-line/check-field-line.component.html | 3 ---
.../check-field-line/check-field-line.component.ts | 2 +-
src/app/components/field-set/field-set.component.html | 4 ++--
src/app/components/field-set/field-set.component.ts | 4 ++--
.../fieldset-container.component.html | 2 +-
.../fieldset-container/fieldset-container.component.ts | 6 +++---
.../fixedvar-results/fixed-results.component.html | 2 +-
.../generic-calculator/calculator.component.html | 4 ++--
.../generic-calculator/calculator.component.ts | 2 +-
.../generic-input/generic-input.component.ts | 10 +++++-----
.../load-calculator-anchor.directive.ts | 2 +-
src/app/components/log-entry/log-entry.component.ts | 2 +-
src/app/components/log/log.component.html | 2 +-
.../param-field-line/param-field-line.component.html | 2 +-
.../param-field-line/param-field-line.component.ts | 4 ++--
.../components/param-values/param-values.component.ts | 8 ++++----
.../vertical-result-element.component.ts | 2 +-
.../save-calculator-anchor.directive.ts | 2 +-
tslint.json | 1 -
21 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index ec852a1a4..d06974a78 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -50,10 +50,10 @@
</div>
<!-- chargement des calculettes -->
- <div loadCalcDialogAnchor></div>
+ <div appLoadCalcDialogAnchor></div>
<!-- sauvegarde des calculettes -->
- <div saveCalcDialogAnchor></div>
+ <div appSaveCalcDialogAnchor></div>
<!-- règle gradée des colonnes Bootstrap -->
<div *ngIf="ruler" class="container-fluid">
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 28ec76973..d82e89872 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -44,10 +44,10 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
private _currentFormId: number;
@ViewChild(LoadCalcDialogAnchorDirective)
- private loadCalcDialogAnchor: LoadCalcDialogAnchorDirective;
+ private appLoadCalcDialogAnchor: LoadCalcDialogAnchorDirective;
@ViewChild(SaveCalcDialogAnchorDirective)
- private saveCalcDialogAnchor: SaveCalcDialogAnchorDirective;
+ private appSaveCalcDialogAnchor: SaveCalcDialogAnchorDirective;
/**
* composant actuellement affiché par l'élément <router-outlet>
@@ -210,7 +210,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
*/
private saveForm(form: FormulaireDefinition) {
// création du dialogue de sélection des formulaires à sauver
- const compRef: ComponentRef<SaveCalculatorComponent> = this.saveCalcDialogAnchor.createDialog();
+ const compRef: ComponentRef<SaveCalculatorComponent> = this.appSaveCalcDialogAnchor.createDialog();
// création de la liste des formulaires
const list = [];
@@ -340,7 +340,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
this.closeNav();
// création du dialogue de sélection des formulaires à sauver
- const compRef: ComponentRef<LoadCalculatorComponent> = this.loadCalcDialogAnchor.createDialog();
+ const compRef: ComponentRef<LoadCalculatorComponent> = this.appLoadCalcDialogAnchor.createDialog();
const prom: Promise<any[]> = compRef.instance.run();
prom.then(list => {
diff --git a/src/app/components/check-field-line/check-field-line.component.html b/src/app/components/check-field-line/check-field-line.component.html
index d2f9a1efe..f00f6fca5 100644
--- a/src/app/components/check-field-line/check-field-line.component.html
+++ b/src/app/components/check-field-line/check-field-line.component.html
@@ -1,9 +1,6 @@
<tr>
<td align="right">{{ check.label }}</td>
<td colspan="3">
- <!--
- <input type="checkbox" >
- -->
<input type="checkbox" [(ngModel)]=currentValue (ngModelChange)="onChange($event)">
</td>
</tr>
\ No newline at end of file
diff --git a/src/app/components/check-field-line/check-field-line.component.ts b/src/app/components/check-field-line/check-field-line.component.ts
index a70da00e0..ae159f511 100644
--- a/src/app/components/check-field-line/check-field-line.component.ts
+++ b/src/app/components/check-field-line/check-field-line.component.ts
@@ -7,7 +7,7 @@ import { CheckField } from "../../formulaire/check-field";
templateUrl: "./check-field-line.component.html",
})
export class CheckFieldLineComponent {
- @Input("param")
+ @Input()
public check: CheckField;
public currentValue: boolean;
diff --git a/src/app/components/field-set/field-set.component.html b/src/app/components/field-set/field-set.component.html
index a372d6811..9fae14a33 100644
--- a/src/app/components/field-set/field-set.component.html
+++ b/src/app/components/field-set/field-set.component.html
@@ -21,11 +21,11 @@
-->
<ng-template ngFor let-p [ngForOf]="fields">
- <param-field-line *ngIf="isInputField(p)" [param]=p (onRadio)=onRadioClick($event) (valid)=onParamLineValid() (inputChange)=onInputChange()>
+ <param-field-line *ngIf="isInputField(p)" [param]=p (radio)=onRadioClick($event) (valid)=onParamLineValid() (inputChange)=onInputChange()>
</param-field-line>
<select-field-line *ngIf="isSelectField(p)" [_select]=p>
</select-field-line>
- <check-field-line *ngIf="isCheckField(p)" [param]=p></check-field-line>
+ <check-field-line *ngIf="isCheckField(p)" [check]=p></check-field-line>
</ng-template>
\ No newline at end of file
diff --git a/src/app/components/field-set/field-set.component.ts b/src/app/components/field-set/field-set.component.ts
index 25bc9982c..24a031d4d 100644
--- a/src/app/components/field-set/field-set.component.ts
+++ b/src/app/components/field-set/field-set.component.ts
@@ -156,7 +156,7 @@ export class FieldSetComponent implements DoCheck {
*/
// tslint:disable-next-line:no-output-on-prefix
@Output()
- private onRadio = new EventEmitter<any>();
+ private radio = new EventEmitter<any>();
private hasRadioFix(): boolean {
if (this._fieldSet.hasInputs) {
@@ -226,7 +226,7 @@ export class FieldSetComponent implements DoCheck {
*/
private onRadioClick(info: any) {
// on renvoie l'info au parent
- this.onRadio.emit(info);
+ this.radio.emit(info);
}
/**
diff --git a/src/app/components/fieldset-container/fieldset-container.component.html b/src/app/components/fieldset-container/fieldset-container.component.html
index 086ed2ba2..84e4f78e5 100644
--- a/src/app/components/fieldset-container/fieldset-container.component.html
+++ b/src/app/components/fieldset-container/fieldset-container.component.html
@@ -3,7 +3,7 @@
<h4 class="col">{{ title }}</h4>
</div>
- <field-set *ngFor="let fs of fieldsets" [fieldSet]=fs (onRadio)=onRadioClick($event) (valid)=onFieldsetValid() (inputChange)=onInputChange()
+ <field-set *ngFor="let fs of fieldsets" [fieldSet]=fs (radio)=onRadioClick($event) (valid)=onFieldsetValid() (inputChange)=onInputChange()
(addFieldset)=onAddFieldset($event) (removeFieldset)=onRemoveFieldset($event) (moveFieldsetUp)=onMoveFieldsetUp($event)
(moveFieldsetDown)=onMoveFieldsetDown($event)>
</field-set>
diff --git a/src/app/components/fieldset-container/fieldset-container.component.ts b/src/app/components/fieldset-container/fieldset-container.component.ts
index dc176ffa5..ccfedcec3 100644
--- a/src/app/components/fieldset-container/fieldset-container.component.ts
+++ b/src/app/components/fieldset-container/fieldset-container.component.ts
@@ -25,7 +25,7 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
public get isValid() {
return this._isValid;
}
- @Input("container")
+ @Input()
private _container: FieldsetContainer;
/**
@@ -44,7 +44,7 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
*/
// tslint:disable-next-line:no-output-on-prefix
@Output()
- private onRadio = new EventEmitter<any>();
+ private radio = new EventEmitter<any>();
/**
* événément de changement de validité
@@ -109,7 +109,7 @@ export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
*/
private onRadioClick(info: any) {
// on renvoie l'info au parent
- this.onRadio.emit(info);
+ this.radio.emit(info);
}
public ngDoCheck() {
diff --git a/src/app/components/fixedvar-results/fixed-results.component.html b/src/app/components/fixedvar-results/fixed-results.component.html
index 011abed0f..703075f95 100644
--- a/src/app/components/fixedvar-results/fixed-results.component.html
+++ b/src/app/components/fixedvar-results/fixed-results.component.html
@@ -22,7 +22,7 @@
{{ formattedValue(r) }}
</td>
</tr>
- <tr *ngIf="hasParameterResult" vertical-result-element [result-element]=resultElement [label]=resultLabel>
+ <tr *ngIf="hasParameterResult" vertical-result-element [result-element]=resultElement [_label]=resultLabel>
</tr>
</table>
</div>
diff --git a/src/app/components/generic-calculator/calculator.component.html b/src/app/components/generic-calculator/calculator.component.html
index 72a354613..1afebb5b5 100644
--- a/src/app/components/generic-calculator/calculator.component.html
+++ b/src/app/components/generic-calculator/calculator.component.html
@@ -27,10 +27,10 @@
<div class="container-fluid">
<!-- chapitres -->
<ng-template ngFor let-fe [ngForOf]="formElements">
- <field-set *ngIf="isFieldset(fe)" [style.display]="getFieldsetStyleDisplay(fe.id)" [fieldSet]=fe (onRadio)=onRadioClick($event)
+ <field-set *ngIf="isFieldset(fe)" [style.display]="getFieldsetStyleDisplay(fe.id)" [fieldSet]=fe (radio)=onRadioClick($event)
(validChange)=OnFieldsetValid() (inputChange)=onInputChange()></field-set>
- <fieldset-container *ngIf="isFieldsetContainer(fe)" [container]=fe (onRadio)=onRadioClick($event) (validChange)=onFieldsetContainerValid()></fieldset-container>
+ <fieldset-container *ngIf="isFieldsetContainer(fe)" [_container]=fe (radio)=onRadioClick($event) (validChange)=onFieldsetContainerValid()></fieldset-container>
</ng-template>
</div>
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index ebac5b877..a2c9b14cf 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -73,7 +73,7 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
public isCalculateDisabled = true;
/**
- * flag (+info) indiquant un événement onRadio à traiter
+ * flag (+info) indiquant un événement radio à traiter
* nécessaire avec l'introduction du mode de valeur LINK des paramètres car quand on modifie le mode à LINK, les possibles
* paramètres liables ne sont pas encore connus
*/
diff --git a/src/app/components/generic-input/generic-input.component.ts b/src/app/components/generic-input/generic-input.component.ts
index a2edd6947..3b888a708 100644
--- a/src/app/components/generic-input/generic-input.component.ts
+++ b/src/app/components/generic-input/generic-input.component.ts
@@ -32,7 +32,7 @@ export abstract class GenericInputComponent extends BaseComponent implements OnC
/**
* flag de désactivation de l'input
*/
- @Input("inputDisabled")
+ @Input()
private _inputDisabled = false;
/**
@@ -48,14 +48,14 @@ export abstract class GenericInputComponent extends BaseComponent implements OnC
/**
* chaîne affichée dans l'input quand aucune valeur n'est saisie
*/
- @Input("title")
+ @Input()
private _title: string;
/**
* événement signalant un changement : valeur du modèle, validité, ...
*/
@Output()
- protected onChange = new EventEmitter<any>();
+ protected change = new EventEmitter<any>();
/**
* valeur saisie.
@@ -99,7 +99,7 @@ export abstract class GenericInputComponent extends BaseComponent implements OnC
* événement de changement de la validité de la saisie
*/
private emitValidChanged() {
- this.onChange.emit({ "action": "valid", "value": this.isValid });
+ this.change.emit({ "action": "valid", "value": this.isValid });
}
/**
@@ -176,7 +176,7 @@ export abstract class GenericInputComponent extends BaseComponent implements OnC
*/
private emitModelChanged() {
// console.log("emit model change", this.constructor.name);
- this.onChange.emit({ "action": "model", "value": this.getModelValue() });
+ this.change.emit({ "action": "model", "value": this.getModelValue() });
}
private setAndValidateModel(sender: any, v: any) {
diff --git a/src/app/components/load-calculator/load-calculator-anchor.directive.ts b/src/app/components/load-calculator/load-calculator-anchor.directive.ts
index af1770fb2..8d9b713ed 100644
--- a/src/app/components/load-calculator/load-calculator-anchor.directive.ts
+++ b/src/app/components/load-calculator/load-calculator-anchor.directive.ts
@@ -4,7 +4,7 @@ import { ViewContainerRef } from "@angular/core";
import { LoadCalculatorComponent } from "./load-calculator.component";
@Directive({
- selector: "[loadCalcDialogAnchor]"
+ selector: "[appLoadCalcDialogAnchor]"
})
export class LoadCalcDialogAnchorDirective {
constructor(
diff --git a/src/app/components/log-entry/log-entry.component.ts b/src/app/components/log-entry/log-entry.component.ts
index d7cfc0e93..3b5385877 100644
--- a/src/app/components/log-entry/log-entry.component.ts
+++ b/src/app/components/log-entry/log-entry.component.ts
@@ -19,7 +19,7 @@ import { ApplicationSetupService } from "../../services/app-setup/app-setup.serv
})
export class LogEntryComponent implements OnChanges {
- @Input("message")
+ @Input()
private _message: Message;
/**
diff --git a/src/app/components/log/log.component.html b/src/app/components/log/log.component.html
index 2214487f0..15d92c0f1 100644
--- a/src/app/components/log/log.component.html
+++ b/src/app/components/log/log.component.html
@@ -6,7 +6,7 @@
<!-- entrées du journal -->
<ng-template ngFor let-m [ngForOf]="messages">
- <log-entry [message]=m></log-entry>
+ <log-entry [_message]=m></log-entry>
</ng-template>
</div>
</div>
diff --git a/src/app/components/param-field-line/param-field-line.component.html b/src/app/components/param-field-line/param-field-line.component.html
index b8d75ac73..6ca65467c 100644
--- a/src/app/components/param-field-line/param-field-line.component.html
+++ b/src/app/components/param-field-line/param-field-line.component.html
@@ -1,7 +1,7 @@
<div class="row">
<!-- input de saisie de la valeur -->
<div [ngClass]="(formHasResults) ? 'col-xl-6 pt-3':'col-md-6 col-xl-8 pt-3'">
- <ngparam-input [inputDisabled]="isInputDisabled" [title]="title" (onChange)="onInputChange($event)"></ngparam-input>
+ <ngparam-input [_inputDisabled]="isInputDisabled" [_title]="title" (change)="onInputChange($event)"></ngparam-input>
</div>
<div class="btn-group col" role="group">
diff --git a/src/app/components/param-field-line/param-field-line.component.ts b/src/app/components/param-field-line/param-field-line.component.ts
index 65263d2c0..6282e176e 100644
--- a/src/app/components/param-field-line/param-field-line.component.ts
+++ b/src/app/components/param-field-line/param-field-line.component.ts
@@ -233,7 +233,7 @@ export class ParamFieldLineComponent implements OnChanges {
*/
@Output()
- private onRadio = new EventEmitter<any>();
+ private radio = new EventEmitter<any>();
/**
* classe du radio "fixé"
@@ -327,7 +327,7 @@ export class ParamFieldLineComponent implements OnChanges {
break;
}
- this.onRadio.emit({
+ this.radio.emit({
"param": this.param,
"oldValueMode": oldValue
});
diff --git a/src/app/components/param-values/param-values.component.ts b/src/app/components/param-values/param-values.component.ts
index 333927017..ef8c20a92 100644
--- a/src/app/components/param-values/param-values.component.ts
+++ b/src/app/components/param-values/param-values.component.ts
@@ -96,13 +96,13 @@ export class ParamValuesComponent extends BaseComponent implements AfterViewChec
private _listComponent: ValueListComponent;
@Output()
- private onValid: EventEmitter<boolean>;
+ private valid: EventEmitter<boolean>;
constructor(private intlService: InternationalisationService) {
super();
this._valueModes.push({ "value": ParamValueMode.MINMAX, "label": "Min/max" });
this._valueModes.push({ "value": ParamValueMode.LISTE, "label": "Liste" });
- this.onValid = new EventEmitter();
+ this.valid = new EventEmitter();
}
/**
@@ -193,11 +193,11 @@ export class ParamValuesComponent extends BaseComponent implements AfterViewChec
private emitValidity() {
switch (this.param.valueMode) {
case ParamValueMode.LISTE:
- this.onValid.emit(this._validList);
+ this.valid.emit(this._validList);
break;
case ParamValueMode.MINMAX:
- this.onValid.emit(this._validMin && this._validMax && this._validStep);
+ this.valid.emit(this._validMin && this._validMax && this._validStep);
break;
}
}
diff --git a/src/app/components/result-element/vertical-result-element.component.ts b/src/app/components/result-element/vertical-result-element.component.ts
index 646b83cc4..8da84bab6 100644
--- a/src/app/components/result-element/vertical-result-element.component.ts
+++ b/src/app/components/result-element/vertical-result-element.component.ts
@@ -24,7 +24,7 @@ export class VerticalResultElementComponent extends ResultElementBaseComponent i
/**
* nom de la variable
*/
- @Input("label")
+ @Input()
private _label: string;
// template des tr pour les extraResult
diff --git a/src/app/components/save-calculator/save-calculator-anchor.directive.ts b/src/app/components/save-calculator/save-calculator-anchor.directive.ts
index c59a1913d..fa2d02f81 100644
--- a/src/app/components/save-calculator/save-calculator-anchor.directive.ts
+++ b/src/app/components/save-calculator/save-calculator-anchor.directive.ts
@@ -4,7 +4,7 @@ import { ViewContainerRef } from "@angular/core";
import { SaveCalculatorComponent } from "./save-calculator.component";
@Directive({
- selector: "[saveCalcDialogAnchor]"
+ selector: "[appSaveCalcDialogAnchor]"
})
export class SaveCalcDialogAnchorDirective {
constructor(
diff --git a/tslint.json b/tslint.json
index 8c60d4106..2da8f2207 100644
--- a/tslint.json
+++ b/tslint.json
@@ -103,7 +103,6 @@
"variable-declaration": "nospace"
}
],
- "typeof-compare": true,
"unified-signatures": true,
"variable-name": false,
"whitespace": [
--
GitLab