From da09d0e18dd8d3dd01157bf2dde5dd07a50765b0 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Wed, 6 Dec 2017 16:52:15 +0100
Subject: [PATCH] =?UTF-8?q?suppression=20des=20composants=20d=C3=A9di?=
=?UTF-8?q?=C3=A9s=20aux=20calculettes=20(CondDistriComponent,=20LechaptCa?=
=?UTF-8?q?lmonComponent,=20SectionParametreeComponent,=20...)=20closes=20?=
=?UTF-8?q?#10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.component.html | 10 ++++-----
src/app/app.module.ts | 7 +-----
.../cond_distri/conddistri.component.html | 6 -----
.../cond_distri/conddistri.component.ts | 16 --------------
.../generic/calculator.component.html | 5 +++++
.../generic/calculator.component.ts | 22 +++++++++++++++++++
.../lechaptcalmon.component.html | 6 -----
.../lechapt-calmon/lechaptcalmon.component.ts | 16 --------------
.../regime-uniforme.component.html | 6 -----
.../regime-uniforme.component.ts | 16 --------------
.../calculators/remous/remous.component.html | 6 -----
.../calculators/remous/remous.component.ts | 16 --------------
.../section-param.component.html | 6 -----
.../section-param/section-param.component.ts | 16 --------------
14 files changed, 33 insertions(+), 121 deletions(-)
delete mode 100644 src/app/calculators/cond_distri/conddistri.component.html
delete mode 100644 src/app/calculators/cond_distri/conddistri.component.ts
delete mode 100644 src/app/calculators/lechapt-calmon/lechaptcalmon.component.html
delete mode 100644 src/app/calculators/lechapt-calmon/lechaptcalmon.component.ts
delete mode 100644 src/app/calculators/regime-uniforme/regime-uniforme.component.html
delete mode 100644 src/app/calculators/regime-uniforme/regime-uniforme.component.ts
delete mode 100644 src/app/calculators/remous/remous.component.html
delete mode 100644 src/app/calculators/remous/remous.component.ts
delete mode 100644 src/app/calculators/section-param/section-param.component.html
delete mode 100644 src/app/calculators/section-param/section-param.component.ts
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 4c6d0759d..a2dd2cf0e 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -80,11 +80,11 @@
<main>
<div class="container-fluid">
- <cond-distri *ngIf="isDisplayCondDistri()"></cond-distri>
- <lechapt-calmon *ngIf="isDisplayLechaptCalmon()"></lechapt-calmon>
- <regime-uniforme *ngIf="isDisplayRegimeUnif()"></regime-uniforme>
- <section-param *ngIf="isDisplaySectionParam()"></section-param>
- <courbe-remous *ngIf="isDisplayCourbeRemous()"></courbe-remous>
+ <hydrocalc type="ConduiteDistributrice" *ngIf="isDisplayCondDistri()"></hydrocalc>
+ <hydrocalc type="LechaptCalmon" *ngIf="isDisplayLechaptCalmon()"></hydrocalc>
+ <hydrocalc type="RegimeUniforme" *ngIf="isDisplayRegimeUnif()"></hydrocalc>
+ <hydrocalc type="SectionParametree" *ngIf="isDisplaySectionParam()"></hydrocalc>
+ <hydrocalc type="CourbeRemous" *ngIf="isDisplayCourbeRemous()"></hydrocalc>
</div>
</main>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f8388efc5..4f3a51f91 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -13,11 +13,6 @@ import { FieldSetComponent } from './components/field-set/field-set.component';
import { ParamFieldLineComponent } from './components/param-field-line/param-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 { CondDistriComponent } from './calculators/cond_distri/conddistri.component';
-import { LechaptCalmonComponent } from './calculators/lechapt-calmon/lechaptcalmon.component';
-import { SectionParametreeComponent } from './calculators/section-param/section-param.component';
-import { RegimeUniformeComponent } from './calculators/regime-uniforme/regime-uniforme.component';
-import { CourbeRemousComponent } from './calculators/remous/remous.component';
// import { AlertDialog } from './components/alert-dialog/alert-dialog.component';
import { AppErrorModule } from './error.module';
import { CalculatorResultsComponent } from './components/calculator-results/calculator-results.component';
@@ -46,7 +41,7 @@ import { LogComponent } from './components/log/log.component';
FieldSetComponent,
ParamFieldLineComponent, SelectFieldLineComponent, CheckFieldLineComponent,
LogComponent,
- CondDistriComponent, LechaptCalmonComponent, SectionParametreeComponent, GenericCalculatorComponent, RegimeUniformeComponent, CourbeRemousComponent,
+ GenericCalculatorComponent,
// AlertDialog,
CalculatorResultsComponent, SectionResultsComponent, RemousResultsComponent,
CalcCanvasComponent, SectionCanvasComponent
diff --git a/src/app/calculators/cond_distri/conddistri.component.html b/src/app/calculators/cond_distri/conddistri.component.html
deleted file mode 100644
index b6224435e..000000000
--- a/src/app/calculators/cond_distri/conddistri.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="row">
- <div class="col">
- <h1>{{uitextTitre}}</h1>
- </div>
-</div>
-<hydrocalc type="ConduiteDistributrice"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/cond_distri/conddistri.component.ts b/src/app/calculators/cond_distri/conddistri.component.ts
deleted file mode 100644
index d9605a153..000000000
--- a/src/app/calculators/cond_distri/conddistri.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-import { InternationalisationService } from '../../services/internationalisation/internationalisation.service';
-
-@Component({
- selector: 'cond-distri',
- templateUrl: "./conddistri.component.html"
-})
-export class CondDistriComponent {
- private get uitextTitre() {
- return this.intlService.localizeText("INFO_CONDDISTRI_TITRE")
- }
-
- constructor(private intlService: InternationalisationService) {
- }
-}
diff --git a/src/app/calculators/generic/calculator.component.html b/src/app/calculators/generic/calculator.component.html
index c430304b0..ffc9d4aec 100644
--- a/src/app/calculators/generic/calculator.component.html
+++ b/src/app/calculators/generic/calculator.component.html
@@ -1,3 +1,8 @@
+<div class="row">
+ <div class="col">
+ <h1>{{uitextTitre}}</h1>
+ </div>
+</div>
<field-set *ngFor="let fs of fieldSets" [style.display]="getFieldsetStyleDisplay(fs.id)" [formId]=_formulaire.uid [id]=fs.id
[fieldSet]=fs (onRadio)=onRadioClick($event) (onSelectChange)=onSelectChanged($event)></field-set>
diff --git a/src/app/calculators/generic/calculator.component.ts b/src/app/calculators/generic/calculator.component.ts
index 7f92cc8f5..48dddaea7 100644
--- a/src/app/calculators/generic/calculator.component.ts
+++ b/src/app/calculators/generic/calculator.component.ts
@@ -100,6 +100,28 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, Observer {
return this._formulaire.getFieldSets(this._nodeType);
}
+ private get uitextTitre() {
+ switch (this._calculatorType) {
+ case CalculatorType.ConduiteDistributrice:
+ return this.intlService.localizeText("INFO_CONDDISTRI_TITRE");
+
+ case CalculatorType.LechaptCalmon:
+ return this.intlService.localizeText("INFO_LECHAPT_TITRE");
+
+ case CalculatorType.RegimeUniforme:
+ return this.intlService.localizeText("INFO_REGUNI_TITRE");
+
+ case CalculatorType.SectionParametree:
+ return this.intlService.localizeText("INFO_SECTPARAM_TITRE");
+
+ case CalculatorType.CourbeRemous:
+ return this.intlService.localizeText("INFO_REMOUS_TITRE")
+
+ default:
+ return "Invalid calculator type " + this._calculatorType;
+ }
+ }
+
private get uitextCalculer() {
return this.intlService.localizeText("INFO_CALCULATOR_CALCULER");
}
diff --git a/src/app/calculators/lechapt-calmon/lechaptcalmon.component.html b/src/app/calculators/lechapt-calmon/lechaptcalmon.component.html
deleted file mode 100644
index 7f6cabebe..000000000
--- a/src/app/calculators/lechapt-calmon/lechaptcalmon.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="row">
- <div class="col">
- <h1>{{uitextTitre}}</h1>
- </div>
-</div>
-<hydrocalc type="LechaptCalmon"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/lechapt-calmon/lechaptcalmon.component.ts b/src/app/calculators/lechapt-calmon/lechaptcalmon.component.ts
deleted file mode 100644
index af8ee271e..000000000
--- a/src/app/calculators/lechapt-calmon/lechaptcalmon.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-import { InternationalisationService } from '../../services/internationalisation/internationalisation.service';
-
-@Component({
- selector: 'lechapt-calmon',
- templateUrl: "./lechaptcalmon.component.html"
-})
-export class LechaptCalmonComponent {
- private get uitextTitre() {
- return this.intlService.localizeText("INFO_LECHAPT_TITRE")
- }
-
- constructor(private intlService: InternationalisationService) {
- }
-}
diff --git a/src/app/calculators/regime-uniforme/regime-uniforme.component.html b/src/app/calculators/regime-uniforme/regime-uniforme.component.html
deleted file mode 100644
index 530b56067..000000000
--- a/src/app/calculators/regime-uniforme/regime-uniforme.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="row">
- <div class="col">
- <h1>{{uitextTitre}}</h1>
- </div>
-</div>
-<hydrocalc type="RegimeUniforme"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/regime-uniforme/regime-uniforme.component.ts b/src/app/calculators/regime-uniforme/regime-uniforme.component.ts
deleted file mode 100644
index 5881e4003..000000000
--- a/src/app/calculators/regime-uniforme/regime-uniforme.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-import { InternationalisationService } from '../../services/internationalisation/internationalisation.service';
-
-@Component({
- selector: 'regime-uniforme',
- templateUrl: "./regime-uniforme.component.html"
-})
-export class RegimeUniformeComponent {
- private get uitextTitre() {
- return this.intlService.localizeText("INFO_REGUNI_TITRE")
- }
-
- constructor(private intlService: InternationalisationService) {
- }
-}
diff --git a/src/app/calculators/remous/remous.component.html b/src/app/calculators/remous/remous.component.html
deleted file mode 100644
index 657c5484f..000000000
--- a/src/app/calculators/remous/remous.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="row">
- <div class="col">
- <h1>{{uitextTitre}}</h1>
- </div>
-</div>
-<hydrocalc type="CourbeRemous"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/remous/remous.component.ts b/src/app/calculators/remous/remous.component.ts
deleted file mode 100644
index 680163d20..000000000
--- a/src/app/calculators/remous/remous.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-import { InternationalisationService } from '../../services/internationalisation/internationalisation.service';
-
-@Component({
- selector: 'courbe-remous',
- templateUrl: "./remous.component.html"
-})
-export class CourbeRemousComponent {
- private get uitextTitre() {
- return this.intlService.localizeText("INFO_REMOUS_TITRE")
- }
-
- constructor(private intlService: InternationalisationService) {
- }
-}
diff --git a/src/app/calculators/section-param/section-param.component.html b/src/app/calculators/section-param/section-param.component.html
deleted file mode 100644
index 96828c6cb..000000000
--- a/src/app/calculators/section-param/section-param.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="row">
- <div class="col">
- <h1>{{uitextTitre}}</h1>
- </div>
-</div>
-<hydrocalc type="SectionParametree"></hydrocalc>
\ No newline at end of file
diff --git a/src/app/calculators/section-param/section-param.component.ts b/src/app/calculators/section-param/section-param.component.ts
deleted file mode 100644
index 013aa5940..000000000
--- a/src/app/calculators/section-param/section-param.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component } from '@angular/core';
-
-import { InternationalisationService } from '../../services/internationalisation/internationalisation.service';
-
-@Component({
- selector: 'section-param',
- templateUrl: "./section-param.component.html"
-})
-export class SectionParametreeComponent {
- private get uitextTitre() {
- return this.intlService.localizeText("INFO_SECTPARAM_TITRE")
- }
-
- constructor(private intlService: InternationalisationService) {
- }
-}
--
GitLab