Skip to content
Snippets Groups Projects
Commit 06edcf3f authored by francois.grand's avatar francois.grand
Browse files

suppression des div container superflus, les composants Angular de l'appli ne... 

suppression des div container superflus, les composants Angular de l'appli ne génèrent que des div de type "row"
parent 00709b56
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 222 additions and 239 deletions
src/app/app.component.html
+ 8
− 6
View file @ 06edcf3f
......@@ -61,11 +61,13 @@
<main>
<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>
<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>
</div>
</main>
<footer>
......@@ -74,4 +76,4 @@
<br>
<a href="http://www.irstea.fr/">Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</a>
</div> -->
</footer>
</footer>
\ No newline at end of file
src/app/calculators/cond_distri/conddistri.component.html
+ 3
− 5
View file @ 06edcf3f
<div class="container-fluid">
<div class="row">
<div class="col">
<h1>{{uitextTitre}}</h1>
</div>
<div class="row">
<div class="col">
<h1>{{uitextTitre}}</h1>
</div>
</div>
<hydrocalc type="ConduiteDistributrice"></hydrocalc>
\ No newline at end of file
src/app/calculators/generic/calculator.component.html
+ 11
− 13
View file @ 06edcf3f
<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>
<div class="container-fluid">
<div class="row ">
<div class="col text-center">
<p></p>
</div>
<div class="row ">
<div class="col text-center">
<p></p>
</div>
</div>
<div class="row ">
<div class="col text-center">
<button type="button" class="button_compute" name="Calculer" (click)="doCompute()">{{uitextCalculer}}</button>
</div>
<div class="row ">
<div class="col text-center">
<button type="button" class="button_compute" name="Calculer" (click)="doCompute()">{{uitextCalculer}}</button>
</div>
</div>
<div class="row ">
<div class="col text-center">
<p></p>
</div>
<div class="row ">
<div class="col text-center">
<p></p>
</div>
</div>
<calc-results [style.display]="getResultsStyleDisplay()"></calc-results>
......
src/app/calculators/lechapt-calmon/lechaptcalmon.component.html
+ 5
− 1
View file @ 06edcf3f
<h1>{{uitextTitre}}</h1>
<div class="row">
<div class="col">
<h1>{{uitextTitre}}</h1>
</div>
</div>
<hydrocalc type="LechaptCalmon"></hydrocalc>
\ No newline at end of file
src/app/calculators/regime-uniforme/regime-uniforme.component.html
+ 5
− 1
View file @ 06edcf3f
<h1>{{uitextTitre}}</h1>
<div class="row">
<div class="col">
<h1>{{uitextTitre}}</h1>
</div>
</div>
<hydrocalc type="RegimeUniforme"></hydrocalc>
\ No newline at end of file
src/app/calculators/remous/remous.component.html
+ 5
− 1
View file @ 06edcf3f
<h1>{{uitextTitre}}</h1>
<div class="row">
<div class="col">
<h1>{{uitextTitre}}</h1>
</div>
</div>
<hydrocalc type="CourbeRemous"></hydrocalc>
\ No newline at end of file
src/app/calculators/section-param/section-param.component.html
+ 5
− 1
View file @ 06edcf3f
<h1>{{uitextTitre}}</h1>
<div class="row">
<div class="col">
<h1>{{uitextTitre}}</h1>
</div>
</div>
<hydrocalc type="SectionParametree"></hydrocalc>
\ No newline at end of file
src/app/components/calculator-results/calculator-results.component.html
+ 31
− 48
View file @ 06edcf3f
<div class="container-fluid">
<div class="row">
<div class="col-8 mx-auto">
<chart *ngIf="showVarResults" [type]="graph_type" [data]="graph_data" [options]="graph_options">
</chart>
</div>
<div class="row">
<div class="col-8 mx-auto">
<chart *ngIf="showVarResults" [type]="graph_type" [data]="graph_data" [options]="graph_options">
</chart>
</div>
</div>
<div class="container-fluid">
<div class="row">
<!-- table des résultats fixés -->
<div class="col-4 mx-auto" *ngIf="showFixedResults">
<div class="container">
<div class="row">
<div class="col-12">
<table class="table">
<tr>
<th>{{uitextParamFixes}}</th>
<th>{{uitextValeurs}}</th>
</tr>
<!-- <tr *ngFor="let r of _fixedResults; let i=index" [class]="getFixedResultClass(i)"> -->
<tr *ngFor="let r of _fixedResults; let i=index">
<td class="result_label {{getFixedResultClass(i)}}">{{r.label}}</td>
<td class="result_value {{getFixedResultClass(i)}}">{{r.value}}</td>
</tr>
</table>
</div>
</div>
</div>
</div>
<div class="row">
<!-- table des résultats fixés -->
<div class="col-4 mx-auto" *ngIf="showFixedResults">
<table class="table">
<tr>
<th>{{uitextParamFixes}}</th>
<th>{{uitextValeurs}}</th>
</tr>
<!-- <tr *ngFor="let r of _fixedResults; let i=index" [class]="getFixedResultClass(i)"> -->
<tr *ngFor="let r of _fixedResults; let i=index">
<td class="result_label {{getFixedResultClass(i)}}">{{r.label}}</td>
<td class="result_value {{getFixedResultClass(i)}}">{{r.value}}</td>
</tr>
</table>
</div>
<!-- table des résultats variés -->
<div class="col-5 mx-auto" *ngIf="showVarResults">
<div class="container">
<div class="row">
<div class="col-12">
<table class="table table-striped">
<tr>
<th>{{_variableParamHeader}}</th>
<th>{{_variableResultHeader}}</th>
</tr>
<tr *ngFor="let r of _varResults; let i=index">
<td class="result_label">{{r.param}}</td>
<td class="result_value">{{r.result}}</td>
</tr>
</table>
</div>
</div>
</div>
</div>
<!-- table des résultats variés -->
<div class="col-5 mx-auto" *ngIf="showVarResults">
<table class="table table-striped">
<tr>
<th>{{_variableParamHeader}}</th>
<th>{{_variableResultHeader}}</th>
</tr>
<tr *ngFor="let r of _varResults; let i=index">
<td class="result_label">{{r.param}}</td>
<td class="result_value">{{r.result}}</td>
</tr>
</table>
</div>
</div>
\ No newline at end of file
src/app/components/field-set/field-set.html
+ 4
− 6
View file @ 06edcf3f
<div class="container-fluid">
<div class="row">
<div class="col-12 fieldset_title">
{{title}}
</div>
<div class="row">
<div class="col-12 fieldset_title">
{{title}}
</div>
</div>
......@@ -24,4 +22,4 @@
</select-field-line>
<check-field-line *ngIf="p.isCheck" [formId]=formId [id]=p.id></check-field-line>
</ng-template>
</ng-template>
\ No newline at end of file
src/app/components/param-field-line/param-field-line.html
+ 50
− 54
View file @ 06edcf3f
<div class="container-fluid">
<div class="row">
<!-- titre -->
<div class="col-3 param_title">
{{title}}
</div>
<div class="row">
<!-- titre -->
<div class="col-3 param_title">
{{title}}
</div>
<!-- input de saisie de la valeur -->
<div class="col-3 col-sm-2">
<param-input [inputDisabled]="isInputDisabled" [computeNodeType]="nodeType" [symbol]="symbol"></param-input>
</div>
<!-- input de saisie de la valeur -->
<div class="col-3 col-sm-2">
<param-input [inputDisabled]="isInputDisabled" [computeNodeType]="nodeType" [symbol]="symbol"></param-input>
</div>
<!-- radio "fixé" -->
<div class="col-sm-2 col-md-2 col-lg-1">
<input *ngIf="hasRadioFix()" type="radio" name="radio_param_{{symbol}}" value="fix" (click)="onRadioClick(symbol, 'fix')"
[checked]=radioFixCheck [disabled]=isDisabled id="radio_fix" />
<label *ngIf="hasRadioFix()" for="radio_fix">{{uitextParamFixe}}</label>
</div>
<!-- radio "fixé" -->
<div class="col-sm-2 col-md-2 col-lg-1">
<input *ngIf="hasRadioFix()" type="radio" name="radio_param_{{symbol}}" value="fix" (click)="onRadioClick(symbol, 'fix')"
[checked]=radioFixCheck [disabled]=isDisabled id="radio_fix" />
<label *ngIf="hasRadioFix()" for="radio_fix">{{uitextParamFixe}}</label>
</div>
<!-- radio "varier" -->
<div class="col-sm-2 col-md-2 col-lg-1">
<input *ngIf="hasRadioVar()" type="radio" name="radio_param_{{symbol}}" value="var" (click)="onRadioClick(symbol,
<!-- radio "varier" -->
<div class="col-sm-2 col-md-2 col-lg-1">
<input *ngIf="hasRadioVar()" type="radio" name="radio_param_{{symbol}}" value="var" (click)="onRadioClick(symbol,
'var')" [checked]=radioVarCheck [disabled]=isDisabled id="radio_var" />
<label *ngIf="hasRadioVar()" for="radio_var">{{uitextParamVarier}}</label>
</div>
<label *ngIf="hasRadioVar()" for="radio_var">{{uitextParamVarier}}</label>
</div>
<!-- radio "calculer" -->
<div class="col-sm-3 col-md-2 col-lg-2">
<input *ngIf="hasRadioCal()" type="radio" name="radio_param_{{symbol}}" value="cal" (click)="onRadioClick(symbol,
<!-- radio "calculer" -->
<div class="col-sm-3 col-md-2 col-lg-2">
<input *ngIf="hasRadioCal()" type="radio" name="radio_param_{{symbol}}" value="cal" (click)="onRadioClick(symbol,
'cal')" [checked]=radioCalCheck [disabled]=isDisabled id="radio_cal" />
<label *ngIf="hasRadioCal()" for="radio_cal">{{uitextParamCalculer}}</label>
</div>
<label *ngIf="hasRadioCal()" for="radio_cal">{{uitextParamCalculer}}</label>
</div>
</div>
<div class="container-fluid" [style.display]="isVarRadio">
<div class="row">
<div class="col-sm-1 col-md-5"></div>
<div class="col-sm-4 col-md-3 col-lg-2">
{{uitextValeurMini}}
</div>
<div class="col-2">
<!-- <input [(ngModel)]="_param.minValue"> -->
<input type="text" class="input-alternate" name="inputmin" placeholder="min" [(ngModel)]="_param.minValue" />
</div>
<div class="row" [style.display]="isVarRadio">
<div class="col-sm-1 col-md-5"></div>
<div class="col-sm-4 col-md-3 col-lg-2">
{{uitextValeurMini}}
</div>
<div class="col-2">
<!-- <input [(ngModel)]="_param.minValue"> -->
<input type="text" class="input-alternate" name="inputmin" placeholder="min" [(ngModel)]="_param.minValue" />
</div>
</div>
<div class="row">
<div class="col-sm-1 col-md-5"></div>
<div class="col-sm-4 col-md-3 col-lg-2">
{{uitextValeurMaxi}}
</div>
<div class="col-2">
<!-- <input [(ngModel)]="_param.maxValue"> -->
<input type="text" class="input-alternate" name="inputmax" placeholder="max" [(ngModel)]="_param.maxValue" />
</div>
<div class="row" [style.display]="isVarRadio">
<div class="col-sm-1 col-md-5"></div>
<div class="col-sm-4 col-md-3 col-lg-2">
{{uitextValeurMaxi}}
</div>
<div class="col-2">
<!-- <input [(ngModel)]="_param.maxValue"> -->
<input type="text" class="input-alternate" name="inputmax" placeholder="max" [(ngModel)]="_param.maxValue" />
</div>
</div>
<div class="row">
<div class="col-sm-1 col-md-5"></div>
<div class="col-sm-4 col-md-3 col-lg-2">
{{uitextPasVariation}}
</div>
<div class="col-2">
<!-- <input [(ngModel)]="_param.stepValue"> -->
<input type="text" class="input-alternate" name="inputstep" placeholder="step" [(ngModel)]="_param.stepValue" />
</div>
<div class="row" [style.display]="isVarRadio">
<div class="col-sm-1 col-md-5"></div>
<div class="col-sm-4 col-md-3 col-lg-2">
{{uitextPasVariation}}
</div>
<div class="col-2">
<!-- <input [(ngModel)]="_param.stepValue"> -->
<input type="text" class="input-alternate" name="inputstep" placeholder="step" [(ngModel)]="_param.stepValue" />
</div>
</div>
\ No newline at end of file
src/app/components/param-input/param-input.component.html
+ 20
− 22
View file @ 06edcf3f
<div class="container">
<div class="row" *ngIf="displayTitle">
<div class="col-12">
{{uitextParamInput}}
</div>
<div class="row" *ngIf="displayTitle">
<div class="col-12">
{{uitextParamInput}}
</div>
</div>
<div class="row">
<div class="col-12">
<form>
<div class="md-form">
<!-- <input mdbActive type="text" class="form-control" id="form1" name="email" mdbInputValidate> -->
<input type="text" class="input-alternate" id="form1" name="form1" [disabled]="_inputDisabled" placeholder="{{_paramDef.symbol}}"
[ngModel]="_uiValue.uncheckedValueString" (ngModelChange)="setValue($event)" />
<label class="active" for="form1" *ngIf="displayTitle">{{uitextParamInput}}</label>
<small class="text-danger">{{_message}}</small>
</div>
</form>
</div>
<div class="row">
<div class="col-10">
<form>
<div class="md-form">
<!-- <input mdbActive type="text" class="form-control" id="form1" name="email" mdbInputValidate> -->
<input type="text" class="input-alternate" id="form1" name="form1" [disabled]="_inputDisabled" placeholder="{{_paramDef.symbol}}"
[ngModel]="_uiValue.uncheckedValueString" (ngModelChange)="setValue($event)" />
<label class="active" for="form1" *ngIf="displayTitle">{{uitextParamInput}}</label>
<small class="text-danger">{{_message}}</small>
</div>
</form>
</div>
</div>
<div class="row" *ngIf="displayTitle">
<div class="col-12">
{{_message}}
</div>
<div class="row" *ngIf="displayTitle">
<div class="col-12">
{{_message}}
</div>
</div>
</div>
\ No newline at end of file
src/app/components/remous-results/remous-results.component.html
+ 49
− 51
View file @ 06edcf3f
<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 class="row">
<div class="col-12 mx-auto">
<chart [type]="graph1_type" [data]="graph1_data" [options]="graph1_options"></chart>
</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-12 mx-auto">
<chart *ngIf="_extraGraph" [type]="graph2_type" [data]="graph2_data" [options]="graph2_options"></chart>
</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>
</div>
<div class="row">
<div class="col-xs-12 col-lg-10 mx-auto">
<!-- journal -->
<table class="table">
<thead>
<tr>
<th>{{uitextTitreJournal}}</th>
</tr>
</table>
</div>
</thead>
<tr *ngFor="let r of _logEntries">
<td align="left">{{r}}</td>
</tr>
</table>
</div>
<br/>
<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>
</div>
<br/>
<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>
</table>
</div>
<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>
\ No newline at end of file
src/app/components/section-results/section-results.component.html
+ 13
− 15
View file @ 06edcf3f
<div class="container-fluid">
<div class="row">
<div class="col-xs-2 col-md-6">
<!-- graphique -->
<section-canvas class="float-xs-none float-md-right" #sectionCanvas></section-canvas>
</div>
<div class="row">
<div class="col-xs-2 col-md-6">
<!-- graphique -->
<section-canvas class="float-xs-none float-md-right" #sectionCanvas></section-canvas>
</div>
<div class="col-xs-2 col-md-6">
<!-- tableau de valeurs -->
<table>
<tr *ngFor="let r of _results; let i=index" [class]="getResultClass(i)">
<td class="result_label">{{r.label}}</td>
<td class="result_value">{{r.value}}</td>
</tr>
</table>
</div>
<div class="col-xs-2 col-md-6">
<!-- tableau de valeurs -->
<table>
<tr *ngFor="let r of _results; let i=index" [class]="getResultClass(i)">
<td class="result_label">{{r.label}}</td>
<td class="result_value">{{r.value}}</td>
</tr>
</table>
</div>
</div>
\ No newline at end of file
src/app/components/select-field-line/select-field-line.html
+ 13
− 15
View file @ 06edcf3f
<div class="container-fluid">
<div class="row">
<!-- titre -->
<div class="col-3 select_title">
{{_select.label}}
</div>
<div class="row">
<!-- titre -->
<div class="col-3 select_title">
{{_select.label}}
</div>
<!-- liste déroulante -->
<div class="col-4 col-sm-3">
<div class="btn-group" dropdown (click)="onSelect($event)">
<button dropdownToggle class="btn grey darken-3 dropdown-toggle waves-light" type="button" mdbRippleRadius>
{{currentLabel}}
</button>
<div class="dropdown-menu">
<a class="dropdown-item" *ngFor="let e of entries" [value]=e.value>{{e.label}}</a>
</div>
<!-- liste déroulante -->
<div class="col-4 col-sm-3">
<div class="btn-group" dropdown (click)="onSelect($event)">
<button dropdownToggle class="btn grey darken-3 dropdown-toggle waves-light" type="button" mdbRippleRadius>
{{currentLabel}}
</button>
<div class="dropdown-menu">
<a class="dropdown-item" *ngFor="let e of entries" [value]=e.value>{{e.label}}</a>
</div>
</div>
</div>
......
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