From df36c69311e2099c76af18f9083014e63af40e0d Mon Sep 17 00:00:00 2001 From: "francois.grand" <francois.grand@irstea.fr> Date: Thu, 15 Mar 2018 14:59:11 +0100 Subject: [PATCH] =?UTF-8?q?=20#72=20:=20SingleResultComponent=20renomm?= =?UTF-8?q?=C3=A9=20en=20ResultElementComponent=20car=20g=C3=A9rant=20un?= =?UTF-8?q?=20ResultElement=20et=20non=20un=20Result?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.module.ts | 4 ++-- .../fixedvar-results/fixedvar-results.component.html | 6 +++--- .../remous-results/remous-results.component.html | 8 ++++---- .../result-element.component.html} | 0 .../result-element.component.ts} | 6 +++--- .../section-results/section-results.component.html | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename src/app/components/{single-result/single-result.component.html => result-element/result-element.component.html} (100%) rename src/app/components/{single-result/single-result.component.ts => result-element/result-element.component.ts} (93%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7da99f5ba..fb66d4bd3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -41,7 +41,7 @@ import { LogComponent } from './components/log/log.component'; import { CalculatorListComponent } from './components/calculator-list/calculator-list.component'; import { ApplicationSetupComponent } from './components/app-setup/app-setup.component'; import { BaseParamInputComponent } from './components/base-param-input/base-param-input.component'; -import { SingleResultComponent } from './components/single-result/single-result.component'; +import { ResultElementComponent } from './components/result-element/result-element.component'; import { LogEntryComponent } from './components/log-entry/log-entry.component'; const appRoutes: Routes = [ @@ -84,7 +84,7 @@ const appRoutes: Routes = [ CalculatorResultsComponent, FixedVarResultsComponent, SectionResultsComponent, RemousResultsComponent, ResultsGraphComponent, GraphTypeSelectComponent, CalcCanvasComponent, SectionCanvasComponent, - SingleResultComponent + ResultElementComponent ], // entryComponents: [AlertDialog], providers: [ // services diff --git a/src/app/components/fixedvar-results/fixedvar-results.component.html b/src/app/components/fixedvar-results/fixedvar-results.component.html index b47085875..ad06bf53e 100644 --- a/src/app/components/fixedvar-results/fixedvar-results.component.html +++ b/src/app/components/fixedvar-results/fixedvar-results.component.html @@ -20,7 +20,7 @@ <tr *ngFor="let r of fixedResults; let i=index"> <td class="result_right {{getFixedResultClass(i)}}">{{r.label}}</td> <td class="result_center {{getFixedResultClass(i)}}"> - <single-result [result]=r.value> </single-result> + <result-element [result]=r.value> </result-element> </td> </tr> </table> @@ -35,10 +35,10 @@ </tr> <tr *ngFor="let r of varResults; let i=index"> <td class="result_center"> - <single-result [result]=r.param></single-result> + <result-element [result]=r.param></result-element> </td> <td class="result_center"> - <single-result [result]=r.result></single-result> + <result-element [result]=r.result></result-element> </td> </tr> </table> diff --git a/src/app/components/remous-results/remous-results.component.html b/src/app/components/remous-results/remous-results.component.html index bf217e669..34c05f337 100644 --- a/src/app/components/remous-results/remous-results.component.html +++ b/src/app/components/remous-results/remous-results.component.html @@ -36,19 +36,19 @@ <td>{{r.abs}}</td> <!-- <td>{{r.flu}}</td> --> <td> - <single-result [result]=r.flu></single-result> + <result-element [result]=r.flu></result-element> </td> <!-- <td>{{r.extraFlu}}</td> --> <td> - <single-result [result]=r.extraFlu></single-result> + <result-element [result]=r.extraFlu></result-element> </td> <!-- <td>{{r.tor}}</td> --> <td> - <single-result [result]=r.tor></single-result> + <result-element [result]=r.tor></result-element> </td> <!-- <td>{{r.extraTor}}</td> --> <td> - <single-result [result]=r.extraTor></single-result> + <result-element [result]=r.extraTor></result-element> </td> </tr> </table> diff --git a/src/app/components/single-result/single-result.component.html b/src/app/components/result-element/result-element.component.html similarity index 100% rename from src/app/components/single-result/single-result.component.html rename to src/app/components/result-element/result-element.component.html diff --git a/src/app/components/single-result/single-result.component.ts b/src/app/components/result-element/result-element.component.ts similarity index 93% rename from src/app/components/single-result/single-result.component.ts rename to src/app/components/result-element/result-element.component.ts index 8a5994b2f..42a742ae6 100644 --- a/src/app/components/single-result/single-result.component.ts +++ b/src/app/components/result-element/result-element.component.ts @@ -7,10 +7,10 @@ import { InternationalisationService } from "../../services/internationalisation import { OnChanges } from "@angular/core/src/metadata/lifecycle_hooks"; @Component({ - selector: "single-result", - templateUrl: "./single-result.component.html" + selector: "result-element", + templateUrl: "./result-element.component.html" }) -export class SingleResultComponent implements OnChanges { +export class ResultElementComponent implements OnChanges { @Input("result") private _result: ResultElement; diff --git a/src/app/components/section-results/section-results.component.html b/src/app/components/section-results/section-results.component.html index 02e93f988..ca8759915 100644 --- a/src/app/components/section-results/section-results.component.html +++ b/src/app/components/section-results/section-results.component.html @@ -13,10 +13,10 @@ <tr *ngFor="let r of sectionResults; let i=index" [class]="getResultClass(i)"> <td class="result_label">{{r.label}}</td> <td class="result_value"> - <single-result [result]=r.value></single-result> + <result-element [result]=r.value></result-element> </td> </tr> </table> </div> </div> -</div> +</div> \ No newline at end of file -- GitLab