diff --git a/src/app/components/field-set/field-set.component.ts b/src/app/components/field-set/field-set.component.ts index 448d40a7dc63bfcd47dbec4e10bdb29ba884e857..62b39960f24fd4f2e18e1d4c95c9e5b8dda162c1 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 042df751799ed61418e5b9a869e2277cb627110d..e07c6514d5088587c89b402db5c6cca6088bc7e7 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 40832d3549ae92b1aba921d1625e7550f71fc96f..fe805f6581909ca8a8dfdde1779083b2412de6c0 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 d95168143cb67edb5fff3ffe00586e65fe60ad4f..281a11332a7c288641ab2719a9f18a1d11c9ccf2 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 ead6072f13b0af083cdf29b590ab1172de57f28a..dc2470aef9334fdf718ddc095c103a460279dece 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 3ba8bf93dfb905c7b4a2489a19a3ee3b1f5c09fd..ef424b22fd24c3c88efd3680c3d0250f38ba1512 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