From 00709b569b54a768bcf192734aaad20dc5b3fed1 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Mon, 4 Dec 2017 10:49:59 +0100
Subject: [PATCH] =?UTF-8?q?adaptation=20du=20composant=20RemousResultsComp?=
=?UTF-8?q?onent=20=C3=A0=20MDBootstrap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../calculator-results.component.html | 2 +-
.../remous-results.component.html | 99 +++++++++++--------
2 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/src/app/components/calculator-results/calculator-results.component.html b/src/app/components/calculator-results/calculator-results.component.html
index 3997d1738..357aa90de 100644
--- a/src/app/components/calculator-results/calculator-results.component.html
+++ b/src/app/components/calculator-results/calculator-results.component.html
@@ -1,5 +1,5 @@
<div class="container-fluid">
- <div class="row resultchart">
+ <div class="row">
<div class="col-8 mx-auto">
<chart *ngIf="showVarResults" [type]="graph_type" [data]="graph_data" [options]="graph_options">
</chart>
diff --git a/src/app/components/remous-results/remous-results.component.html b/src/app/components/remous-results/remous-results.component.html
index d08c8bb81..2fd74e10f 100644
--- a/src/app/components/remous-results/remous-results.component.html
+++ b/src/app/components/remous-results/remous-results.component.html
@@ -1,45 +1,58 @@
-<div style="width:50%">
- <chart [type]="graph1_type" [data]="graph1_data" [options]="graph1_options"></chart>
- <chart *ngIf="_extraGraph" [type]="graph2_type" [data]="graph2_data" [options]="graph2_options"></chart>
-</div>
-<br/>
-<div style="text-align:center;">
- <!-- journal -->
- <table style="float: left">
- <thead>
- <tr>
- <th>{{uitextTitreJournal}}</th>
- </tr>
- </thead>
- <tr *ngFor="let r of _logEntries">
- <td align="left">{{r}}</td>
- </tr>
- </table>
+<div class="container-fluid">
+ <div class="row">
+ <div class="col-12 mx-auto">
+ <chart [type]="graph1_type" [data]="graph1_data" [options]="graph1_options"></chart>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-12 mx-auto">
+ <chart *ngIf="_extraGraph" [type]="graph2_type" [data]="graph2_data" [options]="graph2_options"></chart>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-xs-12 col-lg-10 mx-auto">
+ <!-- journal -->
+ <table class="table">
+ <thead>
+ <tr>
+ <th>{{uitextTitreJournal}}</th>
+ </tr>
+ </thead>
+ <tr *ngFor="let r of _logEntries">
+ <td align="left">{{r}}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
<br/>
- <!-- résultats numériques -->
- <table style="float: left">
- <thead>
- <tr>
- <th></th>
- <th>{{uitextLigneFluviale}}</th>
- <th></th>
- <th>{{uitextLigneTorrentielle}}</th>
- <th></th>
- </tr>
- <tr>
- <th>{{uitextAbscisse}}</th>
- <th>{{uitextTirant}}</th>
- <th>{{_extraParamLabel}}</th>
- <th>{{uitextTirant}}</th>
- <th>{{_extraParamLabel}}</th>
- </tr>
- </thead>
- <tr *ngFor="let r of _results; let i=index" [class]="getResultClass(i)">
- <td>{{r.abs}}</td>
- <td>{{r.flu}}</td>
- <td>{{r.extraFlu}}</td>
- <td>{{r.tor}}</td>
- <td>{{r.extraTor}}</td>
- </tr>
- </table>
+ <div class="row">
+ <div class="col-xs-12 col-lg-6 mx-auto">
+ <!-- résultats numériques -->
+ <table class="table">
+ <thead>
+ <tr>
+ <th></th>
+ <th>{{uitextLigneFluviale}}</th>
+ <th></th>
+ <th>{{uitextLigneTorrentielle}}</th>
+ <th></th>
+ </tr>
+ <tr>
+ <th>{{uitextAbscisse}}</th>
+ <th>{{uitextTirant}}</th>
+ <th>{{_extraParamLabel}}</th>
+ <th>{{uitextTirant}}</th>
+ <th>{{_extraParamLabel}}</th>
+ </tr>
+ </thead>
+ <tr *ngFor="let r of _results; let i=index" [class]="getResultClass(i)">
+ <td>{{r.abs}}</td>
+ <td>{{r.flu}}</td>
+ <td>{{r.extraFlu}}</td>
+ <td>{{r.tor}}</td>
+ <td>{{r.extraTor}}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
</div>
\ No newline at end of file
--
GitLab