From 219393dcab14caac5295202516c9b0dc03ecc3f3 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 17 Jan 2019 11:55:01 +0100
Subject: [PATCH] =?UTF-8?q?M=C3=A0j=20jalhyd:=20utilisation=20de=20isNumer?=
=?UTF-8?q?ic()=20au=20lieu=20de=20NumericalString?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../base-param-input/base-param-input.component.ts | 5 ++---
.../generic-input/generic-input.component.ts | 8 +++-----
.../ngparam-input/ngparam-input.component.ts | 5 ++---
.../components/param-values/ngparam-max.component.ts | 11 +++++------
.../components/param-values/ngparam-min.component.ts | 5 ++---
.../components/param-values/ngparam-step.component.ts | 5 ++---
6 files changed, 16 insertions(+), 23 deletions(-)
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 8144f03d7..392d56ebb 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 e5513138b..3780d95a1 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 b02a87cf8..44ba1ed15 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 8e4cc2c6c..de13b6e24 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 5341e7330..89e119f03 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 443eb1e85..bbddcebf2 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;
--
GitLab