Commit fe2b9012 authored by Mathias Chouet's avatar Mathias Chouet :spaghetti:
Browse files

Suppression de code inutilisé : champ checkbox

Showing with 0 additions and 85 deletions
+0 -85
...@@ -54,7 +54,6 @@ import { ParamComputedComponent } from "./components/param-computed/param-comput ...@@ -54,7 +54,6 @@ import { ParamComputedComponent } from "./components/param-computed/param-comput
import { ParamFieldLineComponent } from "./components/param-field-line/param-field-line.component"; import { ParamFieldLineComponent } from "./components/param-field-line/param-field-line.component";
import { ParamValuesComponent } from "./components/param-values/param-values.component"; import { ParamValuesComponent } from "./components/param-values/param-values.component";
import { SelectFieldLineComponent } from "./components/select-field-line/select-field-line.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 { CalculatorResultsComponent } from "./components/calculator-results/calculator-results.component";
import { FixedVarResultsComponent } from "./components/fixedvar-results/fixedvar-results.component"; import { FixedVarResultsComponent } from "./components/fixedvar-results/fixedvar-results.component";
import { SectionResultsComponent } from "./components/section-results/section-results.component"; import { SectionResultsComponent } from "./components/section-results/section-results.component";
...@@ -143,7 +142,6 @@ const appRoutes: Routes = [ ...@@ -143,7 +142,6 @@ const appRoutes: Routes = [
CalculatorListComponent, CalculatorListComponent,
CalculatorNameComponent, CalculatorNameComponent,
CalculatorResultsComponent, CalculatorResultsComponent,
CheckFieldLineComponent,
DialogConfirmCloseCalcComponent, DialogConfirmCloseCalcComponent,
DialogConfirmEmptySessionComponent, DialogConfirmEmptySessionComponent,
DialogEditParamComputedComponent, DialogEditParamComputedComponent,
......
<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
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);
}
}
...@@ -25,7 +25,5 @@ ...@@ -25,7 +25,5 @@
<select-field-line *ngIf="isSelectField(p)" [_select]=p> <select-field-line *ngIf="isSelectField(p)" [_select]=p>
</select-field-line> </select-field-line>
<check-field-line *ngIf="isCheckField(p)" [check]=p></check-field-line>
</ng-template> </ng-template>
</mat-card-content> </mat-card-content>
...@@ -6,7 +6,6 @@ import { ParamFieldLineComponent } from "../param-field-line/param-field-line.co ...@@ -6,7 +6,6 @@ import { ParamFieldLineComponent } from "../param-field-line/param-field-line.co
import { Field } from "../../formulaire/field"; import { Field } from "../../formulaire/field";
import { InputField } from "../../formulaire/input-field"; import { InputField } from "../../formulaire/input-field";
import { SelectField } from "../../formulaire/select-field"; import { SelectField } from "../../formulaire/select-field";
import { CheckField } from "../../formulaire/check-field";
@Component({ @Component({
selector: "field-set", selector: "field-set",
...@@ -172,13 +171,6 @@ export class FieldSetComponent implements DoCheck { ...@@ -172,13 +171,6 @@ export class FieldSetComponent implements DoCheck {
return f instanceof SelectField && f.isDisplayed; 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 : * gestion des événements clic sur les radios :
* réception d'un message du composant enfant (param-field) * réception d'un message du composant enfant (param-field)
......
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");
}
}
...@@ -2,7 +2,6 @@ import { CalculatorType, ComputeNodeType, ParamDefinition, LoiDebit, StructureTy ...@@ -2,7 +2,6 @@ import { CalculatorType, ComputeNodeType, ParamDefinition, LoiDebit, StructureTy
import { FormulaireElement } from "./formulaire-element"; import { FormulaireElement } from "./formulaire-element";
import { Field } from "./field"; import { Field } from "./field";
import { CheckField } from "./check-field";
import { SelectField } from "./select-field"; import { SelectField } from "./select-field";
import { NgParameter, ParamRadioConfig } from "./ngparam"; import { NgParameter, ParamRadioConfig } from "./ngparam";
import { ServiceFactory } from "../services/service-factory"; import { ServiceFactory } from "../services/service-factory";
...@@ -87,12 +86,6 @@ export class FieldSet extends FormulaireElement implements Observer { ...@@ -87,12 +86,6 @@ export class FieldSet extends FormulaireElement implements Observer {
return res; return res;
} }
private parse_check(json: {}): CheckField {
const res: CheckField = new CheckField(this);
res.parseConfig(json);
return res;
}
private parse_select(json: {}): SelectField { private parse_select(json: {}): SelectField {
const res: SelectField = new SelectField(this); const res: SelectField = new SelectField(this);
res.parseConfig(json); res.parseConfig(json);
...@@ -175,9 +168,6 @@ export class FieldSet extends FormulaireElement implements Observer { ...@@ -175,9 +168,6 @@ export class FieldSet extends FormulaireElement implements Observer {
} else if (field["type"] === "select") { } else if (field["type"] === "select") {
const param = this.parse_select(field); const param = this.parse_select(field);
this.addField(param); this.addField(param);
} else if (field["type"] === "check") {
const param = this.parse_check(field);
this.addField(param);
} }
} }
} }
......
...@@ -11,7 +11,6 @@ import { FormulaireDefinition } from "../../formulaire/definition/form-definitio ...@@ -11,7 +11,6 @@ import { FormulaireDefinition } from "../../formulaire/definition/form-definitio
import { FormulaireElement } from "../../formulaire/formulaire-element"; import { FormulaireElement } from "../../formulaire/formulaire-element";
import { InputField } from "../../formulaire/input-field"; import { InputField } from "../../formulaire/input-field";
import { SelectField } from "../../formulaire/select-field"; import { SelectField } from "../../formulaire/select-field";
import { CheckField } from "../../formulaire/check-field";
import { StringMap } from "../../stringmap"; import { StringMap } from "../../stringmap";
import { FormulaireBase } from "../../formulaire/definition/concrete/form-base"; import { FormulaireBase } from "../../formulaire/definition/concrete/form-base";
import { FormulaireLechaptCalmon } from "../../formulaire/definition/concrete/form-lechapt-calmon"; import { FormulaireLechaptCalmon } from "../../formulaire/definition/concrete/form-lechapt-calmon";
...@@ -295,14 +294,6 @@ export class FormulaireService extends Observable { ...@@ -295,14 +294,6 @@ export class FormulaireService extends Observable {
return <InputField>s; 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 { public getSelectField(formId: string, elemId: string): SelectField {
const s = this.getFormulaireElementById(formId, elemId); const s = this.getFormulaireElementById(formId, elemId);
if (!(s instanceof SelectField)) { if (!(s instanceof SelectField)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment