From fe2b90121bf946ea51814d2f7aadcc9059b8af6f Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 25 Mar 2019 16:59:48 +0100
Subject: [PATCH] =?UTF-8?q?Suppression=20de=20code=20inutilis=C3=A9=20:=20?=
=?UTF-8?q?champ=20checkbox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.module.ts | 2 --
.../check-field-line.component.html | 6 ----
.../check-field-line.component.ts | 20 -------------
.../field-set/field-set.component.html | 2 --
.../field-set/field-set.component.ts | 8 ------
src/app/formulaire/check-field.ts | 28 -------------------
src/app/formulaire/fieldset.ts | 10 -------
.../services/formulaire/formulaire.service.ts | 9 ------
8 files changed, 85 deletions(-)
delete mode 100644 src/app/components/check-field-line/check-field-line.component.html
delete mode 100644 src/app/components/check-field-line/check-field-line.component.ts
delete mode 100644 src/app/formulaire/check-field.ts
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index da7f30bba..059c34d50 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -54,7 +54,6 @@ import { ParamComputedComponent } from "./components/param-computed/param-comput
import { ParamFieldLineComponent } from "./components/param-field-line/param-field-line.component";
import { ParamValuesComponent } from "./components/param-values/param-values.component";
import { SelectFieldLineComponent } from "./components/select-field-line/select-field-line.component";
-import { CheckFieldLineComponent } from "./components/check-field-line/check-field-line.component";
import { CalculatorResultsComponent } from "./components/calculator-results/calculator-results.component";
import { FixedVarResultsComponent } from "./components/fixedvar-results/fixedvar-results.component";
import { SectionResultsComponent } from "./components/section-results/section-results.component";
@@ -143,7 +142,6 @@ const appRoutes: Routes = [
CalculatorListComponent,
CalculatorNameComponent,
CalculatorResultsComponent,
- CheckFieldLineComponent,
DialogConfirmCloseCalcComponent,
DialogConfirmEmptySessionComponent,
DialogEditParamComputedComponent,
diff --git a/src/app/components/check-field-line/check-field-line.component.html b/src/app/components/check-field-line/check-field-line.component.html
deleted file mode 100644
index f00f6fca5..000000000
--- a/src/app/components/check-field-line/check-field-line.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<tr>
- <td align="right">{{ check.label }}</td>
- <td colspan="3">
- <input type="checkbox" [(ngModel)]=currentValue (ngModelChange)="onChange($event)">
- </td>
-</tr>
\ No newline at end of file
diff --git a/src/app/components/check-field-line/check-field-line.component.ts b/src/app/components/check-field-line/check-field-line.component.ts
deleted file mode 100644
index ae159f511..000000000
--- a/src/app/components/check-field-line/check-field-line.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component, Input, Output, EventEmitter } from "@angular/core";
-
-import { CheckField } from "../../formulaire/check-field";
-
-@Component({
- selector: "check-field-line",
- templateUrl: "./check-field-line.component.html",
-})
-export class CheckFieldLineComponent {
- @Input()
- public check: CheckField;
-
- public currentValue: boolean;
-
- constructor() { }
-
- public onChange(event: any) {
- this.check.setValue(event);
- }
-}
diff --git a/src/app/components/field-set/field-set.component.html b/src/app/components/field-set/field-set.component.html
index e048b3915..444001156 100644
--- a/src/app/components/field-set/field-set.component.html
+++ b/src/app/components/field-set/field-set.component.html
@@ -25,7 +25,5 @@
<select-field-line *ngIf="isSelectField(p)" [_select]=p>
</select-field-line>
-
- <check-field-line *ngIf="isCheckField(p)" [check]=p></check-field-line>
</ng-template>
</mat-card-content>
diff --git a/src/app/components/field-set/field-set.component.ts b/src/app/components/field-set/field-set.component.ts
index 170ba7cda..1541cba64 100644
--- a/src/app/components/field-set/field-set.component.ts
+++ b/src/app/components/field-set/field-set.component.ts
@@ -6,7 +6,6 @@ import { ParamFieldLineComponent } from "../param-field-line/param-field-line.co
import { Field } from "../../formulaire/field";
import { InputField } from "../../formulaire/input-field";
import { SelectField } from "../../formulaire/select-field";
-import { CheckField } from "../../formulaire/check-field";
@Component({
selector: "field-set",
@@ -172,13 +171,6 @@ export class FieldSetComponent implements DoCheck {
return f instanceof SelectField && f.isDisplayed;
}
- /**
- * détermine si un Field est du type CheckField
- */
- private isCheckField(f: Field): boolean {
- return f instanceof CheckField && f.isDisplayed;
- }
-
/*
* gestion des événements clic sur les radios :
* réception d'un message du composant enfant (param-field)
diff --git a/src/app/formulaire/check-field.ts b/src/app/formulaire/check-field.ts
deleted file mode 100644
index 073816613..000000000
--- a/src/app/formulaire/check-field.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Field } from "./field";
-import { FormulaireNode } from "./formulaire-node";
-
-export class CheckField extends Field {
- private _value: boolean;
-
- constructor(parent: FormulaireNode) {
- super(parent);
- this._value = false;
- }
-
- public getValue(): boolean {
- return this._value;
- }
-
- public setValue(val: boolean) {
- this._value = val;
- }
-
- public get isValid(): boolean {
- return true;
- }
-
- public parseConfig(json: {}, data?: {}) {
- this._confId = json["id"];
- this.setValue(json["value"] === "true");
- }
-}
diff --git a/src/app/formulaire/fieldset.ts b/src/app/formulaire/fieldset.ts
index 06106cf6f..14e44ce41 100644
--- a/src/app/formulaire/fieldset.ts
+++ b/src/app/formulaire/fieldset.ts
@@ -2,7 +2,6 @@ import { CalculatorType, ComputeNodeType, ParamDefinition, LoiDebit, StructureTy
import { FormulaireElement } from "./formulaire-element";
import { Field } from "./field";
-import { CheckField } from "./check-field";
import { SelectField } from "./select-field";
import { NgParameter, ParamRadioConfig } from "./ngparam";
import { ServiceFactory } from "../services/service-factory";
@@ -87,12 +86,6 @@ export class FieldSet extends FormulaireElement implements Observer {
return res;
}
- private parse_check(json: {}): CheckField {
- const res: CheckField = new CheckField(this);
- res.parseConfig(json);
- return res;
- }
-
private parse_select(json: {}): SelectField {
const res: SelectField = new SelectField(this);
res.parseConfig(json);
@@ -175,9 +168,6 @@ export class FieldSet extends FormulaireElement implements Observer {
} else if (field["type"] === "select") {
const param = this.parse_select(field);
this.addField(param);
- } else if (field["type"] === "check") {
- const param = this.parse_check(field);
- this.addField(param);
}
}
}
diff --git a/src/app/services/formulaire/formulaire.service.ts b/src/app/services/formulaire/formulaire.service.ts
index c9d21d2d3..367b8d5b7 100644
--- a/src/app/services/formulaire/formulaire.service.ts
+++ b/src/app/services/formulaire/formulaire.service.ts
@@ -11,7 +11,6 @@ import { FormulaireDefinition } from "../../formulaire/definition/form-definitio
import { FormulaireElement } from "../../formulaire/formulaire-element";
import { InputField } from "../../formulaire/input-field";
import { SelectField } from "../../formulaire/select-field";
-import { CheckField } from "../../formulaire/check-field";
import { StringMap } from "../../stringmap";
import { FormulaireBase } from "../../formulaire/definition/concrete/form-base";
import { FormulaireLechaptCalmon } from "../../formulaire/definition/concrete/form-lechapt-calmon";
@@ -295,14 +294,6 @@ export class FormulaireService extends Observable {
return <InputField>s;
}
- public getCheckField(formId: string, elemId: string): CheckField {
- const s = this.getFormulaireElementById(formId, elemId);
- if (!(s instanceof CheckField)) {
- throw new Error("Form element with id '" + elemId + "' is not a checkbox");
- }
- return <CheckField>s;
- }
-
public getSelectField(formId: string, elemId: string): SelectField {
const s = this.getFormulaireElementById(formId, elemId);
if (!(s instanceof SelectField)) {
--
GitLab