diff --git a/src/app/components/base-param-input/base-param-input.component.ts b/src/app/components/base-param-input/base-param-input.component.ts index 8144f03d7d98e0861c8946980a46b773988e682d..392d56ebbe672e41c40c228416dd263d283aca04 100644 --- a/src/app/components/base-param-input/base-param-input.component.ts +++ b/src/app/components/base-param-input/base-param-input.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectorRef } from "@angular/core"; -import { NumericalString, Message, ParamDefinition, ParamDomain, ParamDomainValue, Observable } from "jalhyd"; +import { Message, ParamDefinition, ParamDomain, ParamDomainValue, Observable, isNumeric } from "jalhyd"; import { InternationalisationService } from "../../services/internationalisation/internationalisation.service"; import { GenericInputComponent } from "../generic-input/generic-input.component"; @@ -102,8 +102,7 @@ export class BaseParamInputComponent extends GenericInputComponent { let valid = false; let msg: string; - const v: NumericalString = new NumericalString(ui); - if (!v.isNumerical) { + if (! isNumeric(ui)) { msg = "Veuillez entrer une valeur numérique"; } else { valid = true; diff --git a/src/app/components/generic-input/generic-input.component.ts b/src/app/components/generic-input/generic-input.component.ts index e5513138b57a21d92d89b82c262a947ab8cfd775..3780d95a17a99a1c49d51650d186b343a878f457 100644 --- a/src/app/components/generic-input/generic-input.component.ts +++ b/src/app/components/generic-input/generic-input.component.ts @@ -295,7 +295,7 @@ export abstract class GenericInputComponent extends BaseComponent implements OnC /* import { Component } from "@angular/core"; -import { NumericalString, Message } from "jalhyd"; +import { isNumeric, Message } from "jalhyd"; // exemple où le modèle est un type simple (number) @@ -343,8 +343,7 @@ export class TestInputComponent extends GenericInputComponent { let valid: boolean = false; let msg: string = undefined; - let v: NumericalString = new NumericalString(ui); - if (!v.isNumerical) + if (! isNumeric(ui)) msg = "Veuillez entrer une valeur numérique"; else valid = true; @@ -410,8 +409,7 @@ export class Test2InputComponent extends GenericInputComponent { let valid: boolean = false; let msg: string = undefined; - let v: NumericalString = new NumericalString(ui); - if (!v.isNumerical) + if (! isNumeric(ui)) msg = "Veuillez entrer une valeur numérique"; else valid = true; diff --git a/src/app/components/ngparam-input/ngparam-input.component.ts b/src/app/components/ngparam-input/ngparam-input.component.ts index b02a87cf82547dfed1f32788c5fc8655269b60ff..44ba1ed15637c76ef47855b772446d73eecc82d6 100644 --- a/src/app/components/ngparam-input/ngparam-input.component.ts +++ b/src/app/components/ngparam-input/ngparam-input.component.ts @@ -2,7 +2,7 @@ import { Component, ChangeDetectorRef, OnDestroy } from "@angular/core"; -import { NumericalString, Message, Observer } from "jalhyd"; +import { isNumeric, Message, Observer } from "jalhyd"; import { InternationalisationService } from "../../services/internationalisation/internationalisation.service"; import { NgParameter } from "../../formulaire/ngparam"; @@ -94,8 +94,7 @@ export class NgParamInputComponent extends GenericInputComponent implements Obse let valid = false; let msg: string; - const v: NumericalString = new NumericalString(ui); - if (!v.isNumerical) { + if (! isNumeric(ui)) { msg = "Veuillez entrer une valeur numérique"; } else { valid = true; diff --git a/src/app/components/param-values/ngparam-max.component.ts b/src/app/components/param-values/ngparam-max.component.ts index 8e4cc2c6c8536f90de25067e64250719434edfda..de13b6e24272dea9836d02097446c03b202ec1e0 100644 --- a/src/app/components/param-values/ngparam-max.component.ts +++ b/src/app/components/param-values/ngparam-max.component.ts @@ -1,6 +1,6 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core"; -import { NumericalString } from "jalhyd"; +import { isNumeric } from "jalhyd"; import { GenericInputComponent } from "../generic-input/generic-input.component"; import { InternationalisationService } from "../../services/internationalisation/internationalisation.service"; @@ -23,7 +23,7 @@ export class NgParamMaxComponent extends GenericInputComponent { } protected getModelValue(): any { - if (this._param == undefined) { + if (this._param === undefined) { return undefined; } return this._param.maxValue; @@ -37,7 +37,7 @@ export class NgParamMaxComponent extends GenericInputComponent { let msg; let valid = false; - if (this._param == undefined) { + if (this._param === undefined) { msg = "internal error, model undefined"; } else { if (!this._param.checkMax(v)) { @@ -51,7 +51,7 @@ export class NgParamMaxComponent extends GenericInputComponent { } protected modelToUI(v: any): string { - if (typeof (v) == "number") { + if (typeof (v) === "number") { return String(v); } return undefined; @@ -61,8 +61,7 @@ export class NgParamMaxComponent extends GenericInputComponent { let valid = false; let msg: string; - const v: NumericalString = new NumericalString(ui); - if (!v.isNumerical) { + if (! isNumeric(ui)) { msg = "Veuillez entrer une valeur numérique"; } else { valid = true; diff --git a/src/app/components/param-values/ngparam-min.component.ts b/src/app/components/param-values/ngparam-min.component.ts index 5341e7330d42d3a0ac832cffd3abff1142f02327..89e119f03533bf517b83940c73f6db176b192270 100644 --- a/src/app/components/param-values/ngparam-min.component.ts +++ b/src/app/components/param-values/ngparam-min.component.ts @@ -1,6 +1,6 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core"; -import { NumericalString } from "jalhyd"; +import { isNumeric } from "jalhyd"; import { GenericInputComponent } from "../generic-input/generic-input.component"; import { InternationalisationService } from "../../services/internationalisation/internationalisation.service"; @@ -61,8 +61,7 @@ export class NgParamMinComponent extends GenericInputComponent { let valid = false; let msg: string; - const v: NumericalString = new NumericalString(ui); - if (!v.isNumerical) { + if (! isNumeric(ui)) { msg = "Veuillez entrer une valeur numérique"; } else { valid = true; diff --git a/src/app/components/param-values/ngparam-step.component.ts b/src/app/components/param-values/ngparam-step.component.ts index 443eb1e8572b7a2b3f36afb8bbd4b93bd4b9ab60..bbddcebf2f27f0a2ac55e75d3957ebf292283e2e 100644 --- a/src/app/components/param-values/ngparam-step.component.ts +++ b/src/app/components/param-values/ngparam-step.component.ts @@ -1,6 +1,6 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core"; -import { NumericalString } from "jalhyd"; +import { isNumeric } from "jalhyd"; import { GenericInputComponent } from "../generic-input/generic-input.component"; import { InternationalisationService } from "../../services/internationalisation/internationalisation.service"; @@ -68,8 +68,7 @@ export class NgParamStepComponent extends GenericInputComponent { let valid = false; let msg: string; - const v: NumericalString = new NumericalString(ui); - if (!v.isNumerical) { + if (! isNumeric(ui)) { msg = "Veuillez entrer une valeur numérique"; } else { valid = true;