Merge pull request #730 from rufener/bugfix

Bugfix
sitn · Mar 29, 2023 · aa63011 · aa63011
2 parents f72ed6b + e293869
commit aa63011
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/front/src/components/Affaires/ControleGeometre/controleGeometre.css b/front/src/components/Affaires/ControleGeometre/controleGeometre.css
@@ -1,43 +1,53 @@
-.controleGeometre {
+#controleGeometre .controleGeometre {
     width: 100%;
     float: left;
 }
 
-.controleGeometre .label {
+
+#controleGeometre .controleGeometre .label {
     display: block;
 }
 
-table, th, td {
+
+#controleGeometre table, #controleGeometre th, #controleGeometre td {
     border: 1px solid lightgray;
     border-collapse: collapse;
 }
-th, td {
+
+#controleGeometre th, #controleGeometre td {
     padding: 5px;
 }
-th {
+
+#controleGeometre th {
     vertical-align: bottom;
 }
-th.ctrl_radiobtn {
+
+#controleGeometre th.ctrl_radiobtn {
     writing-mode: vertical-lr;
     transform: rotate(180deg);
     vertical-align: top;
 }
-td {
+
+#controleGeometre td {
     vertical-align: middle;
 }
-.ctrl_title {
+
+#controleGeometre .ctrl_title {
     font-style: italic;
     background-color: lightgray;
 }
-.ctrl_label {
+
+#controleGeometre .ctrl_label {
     text-align: left;
     width: 700px;
 }
-.ctrl_radiobtn {
+
+#controleGeometre .ctrl_radiobtn {
     text-align: center;
     width: 32px;
 }
-.md-radio {
+
+#controleGeometre .md-radio {
     margin: 0px;
     padding: 0px;
     vertical-align: middle;

diff --git a/front/src/components/Affaires/ControleGeometre/controleGeometre.html b/front/src/components/Affaires/ControleGeometre/controleGeometre.html
@@ -1,4 +1,4 @@
-<div class="controleGeometre">
+<div id="controleGeometre" class="controleGeometre">
     <md-card>
         <md-card-header class="justifyTitleBtn">
             <div class="md-title">
@@ -352,11 +352,6 @@
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.des_tampon_geom_date_initiale" :value="1"></md-radio></td>
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.des_tampon_geom_date_initiale" :value="2"></md-radio></td>
                                                     </tr>
-                                                    <tr>
-                                                        <td class="ctrl_label">Tampon "Modifié le" et date du jour</td>
-                                                        <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.des_tampon_modifie_date" :value="1"></md-radio></td>
-                                                        <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.des_tampon_modifie_date" :value="2"></md-radio></td>
-                                                    </tr>
                                                     <tr>
                                                         <td colspan="3" class="ctrl_title">Plan</td>
                                                     </tr>
@@ -365,11 +360,6 @@
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.plan_tampon_geom_date_initiale" :value="1"></md-radio></td>
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.plan_tampon_geom_date_initiale" :value="2"></md-radio></td>
                                                     </tr>
-                                                    <tr>
-                                                        <td class="ctrl_label">Tampon "Modifié le" et date du jour</td>
-                                                        <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.plan_tampon_modifie_date" :value="1"></md-radio></td>
-                                                        <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.plan_tampon_modifie_date" :value="2"></md-radio></td>
-                                                    </tr>
                                                 </tbody>
                                             </table>
                                         </div>
@@ -440,7 +430,7 @@
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.des_tampon_geom_date_initiale" :value="2"></md-radio></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="ctrl_label">Tampon "Visé le" et date du jour</td>
+                                                        <td class="ctrl_label">Tampon "Actualisé le" et date du jour</td>
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.des_tampon_vise_date" :value="1"></md-radio></td>
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.des_tampon_vise_date" :value="2"></md-radio></td>
                                                     </tr>
@@ -453,7 +443,7 @@
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.plan_tampon_geom_date_initiale" :value="2"></md-radio></td>
                                                     </tr>
                                                     <tr>
-                                                        <td class="ctrl_label">Tampon "Visé le" et date du jour</td>
+                                                        <td class="ctrl_label">Tampon "Actualisé le" et date du jour</td>
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.plan_tampon_vise_date" :value="1"></md-radio></td>
                                                         <td class="ctrl_radiobtn"><md-radio v-model="controleGeometre.plan_tampon_vise_date" :value="2"></md-radio></td>
                                                     </tr>

diff --git a/front/src/components/Affaires/Facturation/Emoluments/emoluments.css b/front/src/components/Affaires/Facturation/Emoluments/emoluments.css
@@ -35,7 +35,7 @@
   height: 20px;
 }
 
-#emolumentsDialog .md-field .md-input, .md-field .md-textarea {
+#emolumentsDialog .md-field .md-input, #emolumentsDialog .md-field .md-textarea {
   height: 32px;
 }
 
@@ -133,14 +133,14 @@
 }
 
 #emolumentsDialog .hideNulls {
-  font-size: 0px !important;
+  font-size: 0px;
 }
 
 #emolumentsDialog .customTable .customTableHead {
   width: calc(100% - 1em);
 }
 
-#emolumentsDialog .customTable .customTableBody, .customTable .customTableHead {
+#emolumentsDialog .customTable .customTableBody, #emolumentsDialog .customTable .customTableHead {
   display: block;
 }