admin demande de validation v2

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

@@ -27,6 +27,7 @@
               <div class="col-md-8" id="subCard2Part1">
                 <div id="opTitle">
                   <label>Validation: {{op.validationXJC}}</label>
+                  <label>Status: {{op.status}}</label>
                   <label>Operation Commerciale: {{op.name}}</label>
                 </div>
                 <div id="opAvantages">
@@ -81,6 +82,7 @@
               <div class="col-md-8" id="subCard2Part1">
                 <div id="opTitle">
                   <label>Validation: {{op.validationXJC}}</label>
+                  <label>Status: {{op.status}}</label>
                   <label>Operation Commerciale: {{op.name}}</label>
                 </div>
                 <div id="opAvantages">

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

@@ -41,6 +41,7 @@
               <div class="col-md-8" id="subCard2Part1">
                 <div id="opTitle">
                   <label>Validation: {{op.validationXJC}}</label>
+                  <label>Status: {{op.status}}</label>
                   <label>Operation Commerciale: {{op.name}}</label>
                 </div>
                 <div id="opAvantages">
@@ -55,7 +56,7 @@
               </div>
               <div class="col-md-2" id="subCard2Part2">
                 <button class="btn btn-outline-primary btn-rounded">Tarif</button>
-                <button class="btn btn-outline-default btn-rounded">Bloquer</button>
+                <button class="btn btn-outline-default btn-rounded" (click)="bloquer(op.uid)">Bloquer</button>
                 <button class="btn btn-outline-info btn-rounded">CrtEnv</button>
                 <button class="btn btn-outline-info btn-rounded">Scans</button>
               </div>
@@ -81,7 +82,7 @@
     </div>
     <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">
@@ -103,6 +104,7 @@
               <div class="col-md-8" id="subCard2Part1">
                 <div id="opTitle">
                   <label>Validation: {{op.validationXJC}}</label>
+                  <label>Status: {{op.status}}</label>
                   <label>Operation Commerciale: {{op.name}}</label>
                 </div>
                 <div id="opAvantages">
@@ -116,7 +118,7 @@
                 </div>
               </div>
               <div class="col-md-2" id="subCard2Part2">
-                <button class="btn btn-outline-primary btn-rounded">Débloquer</button>
+                <button class="btn btn-outline-primary btn-rounded" (click)="debloquer(op)">Débloquer</button>
               </div>
             </div>
             <div class="card-block col-md-12" id="subCard2Part3">

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

@@ -21,14 +21,17 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy  {
   opComm: OperationCommerciale;
   user: Observable<firebase.User>;
   opCommData: FirebaseListObservable<any[]>;
+  opCommDataValider: OperationCommerciale[];
+  opCommDataBloquer: FirebaseListObservable<any[]>;
   profileData: FirebaseListObservable<any[]>;
   commercant: Commercant;
-
+  databaseRef: any;
 
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
     this.opComm = new OperationCommerciale();
-
+    this.databaseRef = firebase.database().ref();
+    this.opCommDataValider = [];
     this.user = afAuth.authState;
     this.commercant = new Commercant();
     this.user.subscribe(
@@ -40,6 +43,26 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy  {
               orderByChild: 'validationXJC',
               equalTo: 'validé'
             }
+          }).map((array) => array.filter(opCoVal => opCoVal.status !== 'bloqué')) as FirebaseListObservable<any[]>;
+
+          /*_jobs => _jobs.filter(job => job.price > price)
+
+          this.opCommData.forEach(opval => {
+            opval.forEach(opvalElement => {
+              console.log('opvalElement.status: ' + opvalElement.status);
+              if (opvalElement.status !== 'bloqué') {
+                this.opCommDataValider.push(opvalElement);
+              }else if (opvalElement.status === 'bloqué') {
+                this.opCommDataValider.splice(opvalElement);
+              }
+            });
+          });*/
+
+          this.opCommDataBloquer = this.afDb.list('/OperationCommercial/',{
+            query: {
+              orderByChild: 'status',
+              equalTo: 'bloqué'
+            }
           }).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
         }
         console.log(auth.uid);
@@ -47,6 +70,44 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy  {
     );
   }
 
+  bloquer(uidRejeter: string){
+    const opEnvRef = this.databaseRef.child('OperationCommercial').child(uidRejeter).child('status');
+    opEnvRef.set('bloqué');
+  }
+
+  debloquer(opDebloquer: OperationCommerciale){
+    var todayTemp = new Date(Date.now());
+    var debutTemp = new Date(opDebloquer.dateDebut);
+    var finTemp = new Date(opDebloquer.dateFin);
+
+    console.log('todayTemp: ' + todayTemp.getTime());
+    console.log('debutTemp: ' + debutTemp.getTime());
+    console.log('finTemp: ' + finTemp.getTime());
+
+    if (todayTemp.getTime() >= debutTemp.getTime() && todayTemp.getTime() <= finTemp.getTime()) {
+      opDebloquer.status = 'Active';
+      opDebloquer.validationXJC = 'validé';
+    } else {
+      opDebloquer.status = 'Inactive';
+    }
+
+    const opDebloquerRef = this.databaseRef.child('OperationCommercial').child(opDebloquer.uid.toString()).child('status');
+    opDebloquerRef.set(opDebloquer.status);
+  }
+
+  carteEnvoyer(op: OperationCommerciale){
+    this.opCommData = this.afDb.list('/CarteParrainage/',{
+      query: {
+        orderByChild: 'operationCommercialID',
+        equalTo: op.uid
+      }
+    }).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
+  }
+
+  scanEffectuer(opDebloquer: OperationCommerciale){
+
+  }
+
   ngOnInit() {
     try {
       this.user.subscribe(

src/models/OperationCommerciale.ts

@@ -19,6 +19,7 @@ export class OperationCommerciale
   nbEnvoie: string;
   nbDebiter: string;
   validationXJC: string;
+
   constructor() {
     this.uid = '';
     this.name = '';