Merge pull request #728 from rufener/bugfix

Bugfix
sitn · Mar 21, 2023 · 4b04e10 · 4b04e10
2 parents 8dd5358 + 0506184
commit 4b04e10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/front/src/components/Affaires/Facturation/Emoluments/emoluments.html b/front/src/components/Affaires/Facturation/Emoluments/emoluments.html
@@ -1132,7 +1132,7 @@ <h3>Répartition des émoluments dans les factures</h3>
                 <tr id="form_detail.travauxBureau_title4.4">
                   <td class="tg-0lax subtitle" :colspan="6 + 2* Number(form_general.nb_batiments)">4.4 Surfaces</td>
                 </tr>
-                <tr v-if="!emolument_priorite || form_detail.travauxBureau23.priorite" v-show="!emolument_priorite || !affaire.type_id === typesAffaires_conf.cadastration" id="form_detail.travauxBureau23">
+                <tr v-if="!emolument_priorite || form_detail.travauxBureau23.priorite" v-show="!emolument_priorite || !(affaire.type_id === typesAffaires_conf.cadastration)" id="form_detail.travauxBureau23">
                   <td class="tg-0lax code">{{ form_detail.travauxBureau23.code }}</td>
                   <td class="tg-0lax position">{{ form_detail.travauxBureau23.nom }}</td>
                   <td class="tg-0lax alignCenter unite">{{ form_detail.travauxBureau23.unite }}</td>
@@ -1156,7 +1156,7 @@ <h3>Répartition des émoluments dans les factures</h3>
                     <td class="tg-0lax montant alignRight"><span v-if="Number(form_detail_batiment[i-1].travauxBureau24.montant>0)">{{ form_detail_batiment[i-1].travauxBureau24.montant }} CHF</span></td>
                   </template>
                 </tr>
-                <tr v-if="!emolument_priorite || form_detail.travauxBureau25.priorite" v-show="!emolument_priorite || affaire.type_id === typesAffaires_conf.cadastration" id="form_detail.travauxBureau25">
+                <tr v-if="!emolument_priorite || form_detail.travauxBureau25.priorite" v-show="!emolument_priorite || (affaire.type_id === typesAffaires_conf.cadastration)" id="form_detail.travauxBureau25">
                   <td class="tg-0lax code">{{ form_detail.travauxBureau25.code }}</td>
                   <td class="tg-0lax position">{{ form_detail.travauxBureau25.nom }}</td>
                   <td class="tg-0lax alignCenter unite">{{ form_detail.travauxBureau25.unite }}</td>

diff --git a/front/src/components/PreavisExternes/preavisExternesEditDecision.css b/front/src/components/PreavisExternes/preavisExternesEditDecision.css
@@ -1,30 +1,37 @@
-.tg {
+#preavisEditDecision .tg {
     border-collapse: collapse;
     border-spacing: 10;
     width: 1350px;
 }
 
-.tg tr {
+#preavisEditDecision .tg tr {
     height: 45px;
     border-color: black;
     border-style: solid;
     border-width: 1px;
 }
 
-.tg td, .tg th {
+#preavisEditDecision .tg td, #preavisEditDecision .tg th {
     padding: 20px 10px 20px 10px;
 }
 
-.oldVersion {
+#preavisEditDecision .oldVersion {
     font-style: italic;
     color: gray;
 }
 
-.table_glossaire {
+#preavisEditDecision .table_glossaire {
     border-collapse: collapse;
     border: 1px solid black;
 }
 
-.table_glossaire tr {
+#preavisEditDecision .table_glossaire tr {
     border: 1px dashed black;
+}
+
+#preavisEditDecision .table_glossaire_add {
+    width: 50px !important;
+}
+#preavisEditDecision .table_glossaire_text {
+    width: 1400px !important;
 }