Merge branch 'thierry' of ssh://git.marbelium.com:10023/Viiciouss/XJC into anis

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

@@ -5,7 +5,7 @@
   <div class="col-md-12" id="demandes">
     <h4 class="h5 text-center mb-4" style="padding-top: 5%;">Nouvelles demandes d'opérations</h4>
     <div class="list-group">
-      <div class="card mainCard" *ngFor="let op of opCommData | async">
+      <div class="card mainCard" *ngFor="let op of opCommDataEnCours | async">
         <div class="row" id="testt">
           <div class="col-md-6 mb-1 subCard1" id="subCard1">
             <img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
@@ -59,7 +59,7 @@
     <h4 class="h5 text-center mb-4" style="padding-top: 5%;">Historique des cartes rejeter</h4>
     <div class="list-group">
 
-      <div class="card mainCard" *ngFor="let op of opCommData | async">
+      <div class="card mainCard" *ngFor="let op of opCommDataBloquer | async">
         <div class="row" id="testt">
           <div class="col-md-6 mb-1 subCard1" id="subCard1">
             <img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">

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

@@ -20,7 +20,8 @@ import { Commercant } from '../../../../models/Commercant';
 export class DemandeOpCommercialComponent implements OnInit, OnDestroy  {
   opComm: OperationCommerciale;
   user: Observable<firebase.User>;
-  opCommData: FirebaseListObservable<any[]>;
+  opCommDataEnCours: FirebaseListObservable<any[]>;
+  opCommDataBloquer: FirebaseListObservable<any[]>;
   profileData: FirebaseListObservable<any[]>;
   commercant: Commercant;
 
@@ -34,12 +35,19 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy  {
       (auth) => {
         // console.log("afAuth.authState : " + auth.toJSON());
         if (auth) {
-          this.opCommData = this.afDb.list('/OperationCommercial/',{
+          this.opCommDataEnCours = this.afDb.list('/OperationCommercial/',{
             query: {
               orderByChild: 'validationXJC',
               equalTo: 'En Cours'
             }
           }).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
+
+          this.opCommDataBloquer = this.afDb.list('/OperationCommercial/',{
+            query: {
+              orderByChild: 'validationXJC',
+              equalTo: 'Bloquer'
+            }
+          }).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
         }
         console.log(auth.uid);
       }

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

@@ -40,6 +40,7 @@
           <div class="card-block row">
             <div class="col-md-8" id="subCard2Part1">
               <div id="opTitle">
+                <label>Validation: {{op.validationXJC}}</label>
                 <label>Operation Commerciale: {{op.name}}</label>
               </div>
               <div id="opAvantages">