version apres rdv v2

src/app/components/admin/demande-op-commercial/demande-op-commercial.component.html

@@ -17,7 +17,7 @@
             </div>
             <div class="subCard1-row d-flex flex-row">
               <div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
-              <div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
+              <div class="operation-id flex-center"><p class="white-text info-text font-bold"></p></div>
             </div>
           </div>
           <div class="col-md-6 card subCard2">

src/app/components/admin/list-carte-envoyer/list-carte-envoyer.component.html

@@ -16,7 +16,7 @@
           </div>
           <div class="subCard1-row d-flex flex-row">
             <div class="operation-data flex-center"><p class="white-text info-text font-bold">{{opComm?.name}}</p></div>
-            <div class="operation-id flex-center"><p class="white-text info-text font-bold">{{opComm?.uid}}</p></div>
+            <div class="operation-id flex-center"><p class="white-text info-text font-bold"></p></div>
           </div>
         </div>
         <div class="col-md-6 card subCard2">

src/app/components/admin/liste-op-commercial/liste-op-commercial.component.html

@@ -34,7 +34,7 @@
               </div>
               <div class="subCard1-row d-flex flex-row">
                 <div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
-                <div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
+                <div class="operation-id flex-center"><p class="white-text info-text font-bold"></p></div>
               </div>
             </div>
             <div class="col-md-6 card subCard2">
@@ -111,7 +111,7 @@
             </div>
             <div class="subCard1-row d-flex flex-row">
               <div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
-              <div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
+              <div class="operation-id flex-center"><p class="white-text info-text font-bold"></p></div>
             </div>
           </div>
           <div class="col-md-6 card subCard2">

src/app/components/login/login.component.html

@@ -1,6 +1,6 @@
 <div class="card">
   <div class="well">
-        <p class="h5 text-center mb-4">Connection</p>
+        <p class="h5 text-center mb-4">Connexion</p>
         <form (keydown)="keyDownFunction($event)">
           <!--<div> ID: {{ (user | async)?.uid }} </div>
           <div> Email: {{ (user | async)?.email }} </div>-->

src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.html

@@ -82,8 +82,8 @@
             </div>
           </div>
           <div class="subCard1-row d-flex flex-row">
-            <div class="operation-data flex-center"><p class="white-text info-text font-bold">Avantage: {{cartePar.operationCommercialCarte.avantageFilleul}} €</p></div>
-            <div class="operation-id flex-center"><p class="white-text info-text font-bold">{{parrain.familyname}} {{parrain.firstname}}</p></div>
+            <div class="operation-data flex-center"><p class="white-text info-text font-bold">{{((cartePar.operationCommercialCarte.avantageFilleul === '0') || (cartePar.operationCommercialCarte.avantageFilleul === ''))? '' : 'Avantage filleul : ' + cartePar.operationCommercialCarte.avantageFilleul + ' €'}}</p></div>
+            <div class="operation-id flex-center"><p class="white-text info-text font-bold">Parrain: {{parrain.familyname}} {{parrain.firstname}}</p></div>
           </div>
           <div class="text-center" id="dateFin">
             <label class="white-text info-text font-bold">Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>
@@ -176,8 +176,8 @@
             </div>
           </div>
           <div class="subCard1-row d-flex flex-row">
-            <div class="operation-data flex-center"><p class="white-text info-text font-bold">Avantage: {{cartePar.operationCommercialCarte.avantageFilleul}} €</p></div>
-            <div class="operation-id flex-center"><p class="white-text info-text font-bold">{{cartePar.parrainCarte.familyname}} {{cartePar.parrainCarte.firstname}}</p></div>
+            <div class="operation-data flex-center"><p class="white-text info-text font-bold">{{((cartePar.operationCommercialCarte.avantageFilleul === '0') || (cartePar.operationCommercialCarte.avantageFilleul === ''))? '' : 'Avantage filleul : ' + cartePar.operationCommercialCarte.avantageFilleul + ' €'}}</p></div>
+            <div class="operation-id flex-center"><p class="white-text info-text font-bold">Parrain : {{cartePar.parrainCarte.familyname}} {{cartePar.parrainCarte.firstname}}</p></div>
           </div>
           <div class="text-center" id="dateFin">
             <label class="white-text info-text font-bold">Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>

src/app/components/opCommercial/op-commercial/op-commercial.component.html

@@ -59,7 +59,7 @@
             </div>
             <div class="subCard1-row d-flex flex-row">
               <div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
-              <div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
+              <div class="operation-id flex-center"><p class="white-text info-text font-bold"></p></div>
             </div>
           </div>
           <div class="col-md-6 card subCard2">