From 2d5ad174ae8f5465ce756879d5f6fe8c67cfa8bc Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Mon, 12 Feb 2018 09:07:36 +0100
Subject: [PATCH] =?UTF-8?q?=20#64=20:=20d=C3=A9placement=20de=20la=20class?=
 =?UTF-8?q?e=20EnumEx=20vers=20jalhyd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calculator-list.component.ts              |  3 +-
 .../services/formulaire/formulaire.service.ts |  3 +-
 src/app/util.ts                               | 31 -------------------
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/app/components/calculator-list/calculator-list.component.ts b/src/app/components/calculator-list/calculator-list.component.ts
index 39993acec..9ce84d292 100644
--- a/src/app/components/calculator-list/calculator-list.component.ts
+++ b/src/app/components/calculator-list/calculator-list.component.ts
@@ -1,10 +1,11 @@
 import { Component, OnInit } from "@angular/core";
 import { Router } from '@angular/router';
 
+import { EnumEx } from "jalhyd";
+
 import { CalculatorType, FormulaireDefinition } from "../../formulaire/formulaire-definition";
 import { FormulaireService } from "../../services/formulaire/formulaire.service";
 import { InternationalisationService } from '../../services/internationalisation/internationalisation.service';
-import { EnumEx } from "../../util";
 
 class ListElement {
     private _label: string;
diff --git a/src/app/services/formulaire/formulaire.service.ts b/src/app/services/formulaire/formulaire.service.ts
index 623e46f72..5c313c899 100644
--- a/src/app/services/formulaire/formulaire.service.ts
+++ b/src/app/services/formulaire/formulaire.service.ts
@@ -3,6 +3,8 @@ import { Response } from "@angular/http";
 import { Observable as rxObservable } from "rxjs/Observable";
 import "rxjs/add/operator/toPromise";
 
+import { EnumEx } from "jalhyd";
+
 import { ParamService } from "../param/param.service";
 import { HttpService } from "../../services/http/http.service";
 import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
@@ -13,7 +15,6 @@ import { InputField } from "../../formulaire/input-field";
 import { SelectField } from "../../formulaire/select-field";
 import { CheckField } from "../../formulaire/check-field";
 import { StringMap } from "../../stringmap";
-import { EnumEx } from "../../util";
 import { Observable } from "../observer";
 
 @Injectable()
diff --git a/src/app/util.ts b/src/app/util.ts
index 297bda30c..d312650ee 100644
--- a/src/app/util.ts
+++ b/src/app/util.ts
@@ -5,34 +5,3 @@ export function logObject(obj: {}, m?: string) {
     else
         console.log(m + " " + JSON.stringify(obj));
 }
-
-/**
- * classe d'itérateurs pour les enums
- * cf. https://stackoverflow.com/questions/21293063/how-to-programmatically-enumerate-an-enum-type-in-typescript-0-9-5#21294925
- */
-export class EnumEx {
-    /**
-     * retourne les noms et les valeurs d'un enum
-     */
-    static getNamesAndValues<T extends number>(e: any) {
-        return EnumEx.getNames(e).map(n => ({ name: n, value: e[n] as T }));
-    }
-
-    /**
-     * retourne les noms d'un enum
-     */
-    static getNames(e: any) {
-        return EnumEx.getObjValues(e).filter(v => typeof v === "string") as string[];
-    }
-
-    /**
-     * retourne les valeurs d'un enum
-     */
-    static getValues<T extends number>(e: any) {
-        return EnumEx.getObjValues(e).filter(v => typeof v === "number") as T[];
-    }
-
-    private static getObjValues(e: any): (number | string)[] {
-        return Object.keys(e).map(k => e[k]);
-    }
-}
\ No newline at end of file
-- 
GitLab