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

correction du bug d'affichage des champs min/max/pas dans le cas "paramètre à varier"

parent 1b1254e5
No related branches found
No related tags found
No related merge requests found
<field-set [style.display]="getFieldsetStyleDisplay(fs.id)" *ngFor="let fs of fieldSets" [id]=fs.id [fieldSet]=fs (onRadio)=onRadioClick($event) (onSelectChange)=onSelectChanged($event)></field-set>
<table>
<field-set [style.display]="getFieldsetStyleDisplay(fs.id)" *ngFor="let fs of fieldSets" [id]=fs.id [fieldSet]=fs (onRadio)=onRadioClick($event)
(onSelectChange)=onSelectChanged($event)></field-set>
</table>
<div style="text-align:center;">
<button type="button" class="button_compute" name="Calculer" (click)="doCompute()" i18n="@@hyd_compute">Calculer</button>
......
<table>
<tr id="tr_type_section_title">
<td colspan="5">
<div class="fieldset_title">{{_fieldSet.label}}</div>
</td>
</tr>
<!--
<tr>
<td colspan="5">
<div class="fieldset_title">{{_fieldSet.label}}</div>
</td>
</tr>
<!--
<tr id="tr_fs_hydraulique_header">
<td colspan="2"></td>
<td *ngIf="hasRadioFix()" align="center" class="radio_param_header" i18n="@@radio_param_header_fix">Paramètre fixé</td>
......@@ -12,12 +11,9 @@
<td *ngIf="hasRadioCal()" align="center" class="radio_param_header" i18n="@@radio_param_header_cal">Paramètre à calculer</td>
</tr>
-->
<tr id="tr_type_section_fs" *ngFor="let p of _fieldSet.fields">
<td *ngIf="p.isInput" colspan="5">
<param-field-line [computeNodeType]=_fieldSet.computeNodeType [symbol]=p.symbol (onRadio)=onRadioClick($event)></param-field-line>
</td>
<td *ngIf="p.isSelect" colspan="5">
<select-field-line [id]=p.id (onSelectChange)=onSelectChanged($event)></select-field-line>
</td>
</tr>
</table>
\ No newline at end of file
<tr *ngFor="let p of _fieldSet.fields">
<td colspan="5">
<param-field-line *ngIf="p.isInput" [computeNodeType]=_fieldSet.computeNodeType [symbol]=p.symbol (onRadio)=onRadioClick($event)></param-field-line>
<select-field-line *ngIf="p.isSelect" [id]=p.id (onSelectChange)=onSelectChanged($event)></select-field-line>
</td>
</tr>
......@@ -143,6 +143,10 @@ export class ParamFieldLineComponent {
return this._param.radioState == ParamRadioConfig.VAR;
}
private get isVarRadio(): string {
return this.isRadioVarChecked ? "block" : "none";
}
/*
* gestion des événements clic sur les radios :
* envoi d'un message au composant parent
......
<tr id="tr_FT_rLargeurFond">
<tr>
<td align="right" class="param_title">{{title}}</td>
<td>
<!--
<input id="champ_FT_rLargeurFond" type="text" value="2.5" maxlength="30" name="FT_rLargeurFond" />
-->
<param-input [inputDisabled]="isInputDisabled" [computeNodeType]="nodeType" [symbol]="symbol"></param-input>
</td>
<td align="center" class="radio_param">
......@@ -25,7 +22,8 @@
<label *ngIf="hasRadioCal()" for="radio_cal" i18n="@@radio_param_header_cal">calculer</label>
</td>
</tr>
<tr *ngIf="isRadioVarChecked">
<!--
<tr [style.display]="isVarRadio">
<td></td>
<td></td>
<td>
......@@ -33,12 +31,9 @@
</td>
<td>
<input [(ngModel)]="_param.minValue">
<!--
<tr *ngIf="isRadioVarChecked()">
-->
</td>
</tr>
<tr *ngIf="isRadioVarChecked">
<tr [style.display]="isVarRadio">
<td></td>
<td></td>
<td>
......@@ -48,7 +43,7 @@
<input [(ngModel)]="_param.maxValue">
</td>
</tr>
<tr *ngIf="isRadioVarChecked">
<tr [style.display]="isVarRadio">
<td></td>
<td></td>
<td>
......@@ -57,4 +52,35 @@
<td>
<input [(ngModel)]="_param.stepValue">
</td>
</tr>
-->
<!--
<tr [style.display]="isVarRadio">
<div align="center">
De la valeur minimum
<input [(ngModel)]="_param.minValue">
</div>
<div align="center">
&nbsp; à la valeur maximum
<input [(ngModel)]="_param.maxValue">
</div>
<div align="center">
&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;avec un pas de :
<input [(ngModel)]="_param.stepValue">
</div>
</tr>
-->
<tr [style.display]="isVarRadio">
<div align="center">
De la valeur minimum
<input [(ngModel)]="_param.minValue">
</div>
<div align="center">
&nbsp; à la valeur maximum
<input [(ngModel)]="_param.maxValue">
</div>
<div align="center">
&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;avec un pas de :
<input [(ngModel)]="_param.stepValue">
</div>
</tr>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment