From 46b6f37f8b714d9af8976fc9f5933870b51e7176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Thu, 23 Feb 2023 09:10:42 +0100
Subject: [PATCH] refactor: move definedvalue to util

refs #604
---
 src/app/components/field-set/field-set.component.ts             | 2 +-
 .../fieldset-container/fieldset-container.component.ts          | 2 +-
 src/app/components/generic-calculator/calculator.component.ts   | 2 +-
 src/app/components/generic-input/generic-input.component.ts     | 2 +-
 src/app/components/pab-table/pab-table.component.ts             | 2 +-
 src/app/components/pb-schema/pb-schema.component.ts             | 2 +-
 src/app/{ => util}/definedvalue/definedboolean.ts               | 0
 src/app/{ => util}/definedvalue/definedvalue.ts                 | 0
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename src/app/{ => util}/definedvalue/definedboolean.ts (100%)
 rename src/app/{ => util}/definedvalue/definedvalue.ts (100%)

diff --git a/src/app/components/field-set/field-set.component.ts b/src/app/components/field-set/field-set.component.ts
index 448d40a7d..62b39960f 100644
--- a/src/app/components/field-set/field-set.component.ts
+++ b/src/app/components/field-set/field-set.component.ts
@@ -16,7 +16,7 @@ import { I18nService } from "../../services/internationalisation.service";
 import { sprintf } from "sprintf-js";
 
 import { capitalize } from "jalhyd";
-import { DefinedBoolean } from "app/definedvalue/definedboolean";
+import { DefinedBoolean } from "../../util/definedvalue/definedboolean";
 
 @Component({
     selector: "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 042df7517..e07c6514d 100644
--- a/src/app/components/fieldset-container/fieldset-container.component.ts
+++ b/src/app/components/fieldset-container/fieldset-container.component.ts
@@ -6,7 +6,7 @@ import { FieldSet } from "../../formulaire/elements/fieldset";
 import { FormulaireDefinition } from "../../formulaire/definition/form-definition";
 import { I18nService } from "../../services/internationalisation.service";
 import { ApplicationSetupService } from "../../services/app-setup.service";
-import { DefinedBoolean } from "app/definedvalue/definedboolean";
+import { DefinedBoolean } from "../../util/definedvalue/definedboolean";
 import { ParamValueMode } from "jalhyd";
 
 @Component({
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 40832d354..fe805f658 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -62,7 +62,7 @@ import { sprintf } from "sprintf-js";
 
 import * as XLSX from "xlsx";
 import { ServiceFactory } from "app/services/service-factory";
-import { DefinedBoolean } from "app/definedvalue/definedboolean";
+import { DefinedBoolean } from "../../util/definedvalue/definedboolean";
 import { FormulaireCourbeRemous } from "app/formulaire/definition/form-courbe-remous";
 import { RemousResults } from "app/results/remous-results";
 
diff --git a/src/app/components/generic-input/generic-input.component.ts b/src/app/components/generic-input/generic-input.component.ts
index d95168143..281a11332 100644
--- a/src/app/components/generic-input/generic-input.component.ts
+++ b/src/app/components/generic-input/generic-input.component.ts
@@ -5,7 +5,7 @@ import { FormulaireDefinition } from "../../formulaire/definition/form-definitio
 import { NgParameter } from "../../formulaire/elements/ngparam";
 import { I18nService } from "../../services/internationalisation.service";
 import { ApplicationSetupService } from "../../services/app-setup.service";
-import { DefinedBoolean } from "app/definedvalue/definedboolean";
+import { DefinedBoolean } from "../../util/definedvalue/definedboolean";
 
 /**
  * classe de gestion gÊnÊrique d'un champ de saisie avec titre, validation et message d'erreur
diff --git a/src/app/components/pab-table/pab-table.component.ts b/src/app/components/pab-table/pab-table.component.ts
index ead6072f1..dc2470aef 100644
--- a/src/app/components/pab-table/pab-table.component.ts
+++ b/src/app/components/pab-table/pab-table.component.ts
@@ -28,7 +28,7 @@ import { PabTable } from "../../formulaire/elements/pab-table";
 import { DialogEditPabComponent } from "../dialog-edit-pab/dialog-edit-pab.component";
 import { AppComponent } from "../../app.component";
 import { NgParameter, ParamRadioConfig } from "../../formulaire/elements/ngparam";
-import { DefinedBoolean } from "app/definedvalue/definedboolean";
+import { DefinedBoolean } from "../../util/definedvalue/definedboolean";
 
 /**
  * The big editable data grid for calculator type "Pab" (component)
diff --git a/src/app/components/pb-schema/pb-schema.component.ts b/src/app/components/pb-schema/pb-schema.component.ts
index 3ba8bf93d..ef424b22f 100644
--- a/src/app/components/pb-schema/pb-schema.component.ts
+++ b/src/app/components/pb-schema/pb-schema.component.ts
@@ -20,7 +20,7 @@ import { AppComponent } from "../../app.component";
 
 import { fv } from "app/util/util";
 import { ServiceFactory } from "app/services/service-factory";
-import { DefinedBoolean } from "app/definedvalue/definedboolean";
+import { DefinedBoolean } from "../../util/definedvalue/definedboolean";
 import { PrebarrageService, PrebarrageServiceEvents } from "app/services/prebarrage.service";
 
 /**
diff --git a/src/app/definedvalue/definedboolean.ts b/src/app/util/definedvalue/definedboolean.ts
similarity index 100%
rename from src/app/definedvalue/definedboolean.ts
rename to src/app/util/definedvalue/definedboolean.ts
diff --git a/src/app/definedvalue/definedvalue.ts b/src/app/util/definedvalue/definedvalue.ts
similarity index 100%
rename from src/app/definedvalue/definedvalue.ts
rename to src/app/util/definedvalue/definedvalue.ts
-- 
GitLab