Skip to content

Commit

Permalink
fix calcul 2.29
Browse files Browse the repository at this point in the history
  • Loading branch information
rufener committed Mar 20, 2023
1 parent a7f619a commit b2727d8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,8 @@ export default {
return
}
// 2.29 = 2.21 + ... + 2.28
// 2.29 = 2.23 + ... + 2.28
this.form_detail.travauxTerrain25.nombre =
Number(this.form_detail.travauxTerrain17.nombre) +
Number(this.form_detail.travauxTerrain18.nombre) +
Number(this.form_detail.travauxTerrain19.nombre) +
Number(this.form_detail.travauxTerrain20.nombre) +
Number(this.form_detail.travauxTerrain21.nombre) +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ <h3>Répartition des émoluments dans les factures</h3>
<td class="tg-0lax position">{{ form_detail.travauxTerrain17.nom }}</td>
<td class="tg-0lax alignCenter unite">{{ form_detail.travauxTerrain17.unite }}</td>
<td class="tg-0lax alignRight prix_unitaire">{{ form_detail.travauxTerrain17.prix_unitaire }} CHF</td>
<td class="tg-0lax nombre"><md-field class="nbField"><md-input :disabled="disabled" v-model="form_detail.travauxTerrain17.nombre" class="nbInput" v-bind:class="{ highlightEmolument: Number(form_detail.travauxTerrain17.nombre)>0, hideNulls: Number(form_detail.travauxTerrain17.nombre)==0 }" @keyup="terrainBureau_autocompletion(); updateMontants()" @focus="$event.target.select()" onkeypress="return /[0-9]|[.]/g.test(event.key)"></md-input></md-field></td>
<td class="tg-0lax nombre"><md-field class="nbField"><md-input :disabled="disabled" v-model="form_detail.travauxTerrain17.nombre" class="nbInput" v-bind:class="{ highlightEmolument: Number(form_detail.travauxTerrain17.nombre)>0, hideNulls: Number(form_detail.travauxTerrain17.nombre)==0 }" @keyup="updateMontants()" @focus="$event.target.select()" onkeypress="return /[0-9]|[.]/g.test(event.key)"></md-input></md-field></td>
<td class="tg-0lax montant alignRight"><span v-if="Number(form_detail.travauxTerrain17.montant>0)">{{ form_detail.travauxTerrain17.montant }} CHF</span></td>
<template v-for="i in form_general.nb_batiments">
<td class="tg-0lax nombre batiment-separator notEditable"></td>
Expand All @@ -504,7 +504,7 @@ <h3>Répartition des émoluments dans les factures</h3>
<td class="tg-0lax position">{{ form_detail.travauxTerrain18.nom }}</td>
<td class="tg-0lax alignCenter unite">{{ form_detail.travauxTerrain18.unite }}</td>
<td class="tg-0lax alignRight prix_unitaire">{{ form_detail.travauxTerrain18.prix_unitaire }} CHF</td>
<td class="tg-0lax nombre"><md-field class="nbField"><md-input :disabled="disabled" v-model="form_detail.travauxTerrain18.nombre" class="nbInput" v-bind:class="{ highlightEmolument: Number(form_detail.travauxTerrain18.nombre)>0, hideNulls: Number(form_detail.travauxTerrain18.nombre)==0 }" @keyup="terrainBureau_autocompletion(); updateMontants()" @focus="$event.target.select()" onkeypress="return /[0-9]|[.]/g.test(event.key)"></md-input></md-field></td>
<td class="tg-0lax nombre"><md-field class="nbField"><md-input :disabled="disabled" v-model="form_detail.travauxTerrain18.nombre" class="nbInput" v-bind:class="{ highlightEmolument: Number(form_detail.travauxTerrain18.nombre)>0, hideNulls: Number(form_detail.travauxTerrain18.nombre)==0 }" @keyup="updateMontants()" @focus="$event.target.select()" onkeypress="return /[0-9]|[.]/g.test(event.key)"></md-input></md-field></td>
<td class="tg-0lax montant alignRight"><span v-if="Number(form_detail.travauxTerrain18.montant>0)">{{ form_detail.travauxTerrain18.montant }} CHF</span></td>
<template v-for="i in form_general.nb_batiments">
<td class="tg-0lax nombre batiment-separator notEditable"></td>
Expand Down

0 comments on commit b2727d8

Please sign in to comment.