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

src/app/components/admin/list-scan-effecter/list-scan-effecter.component.html

@@ -19,7 +19,7 @@
   </div>
   <div class="list-group">
 
-    <div class="card mainCard" *ngFor="let scan of ScanList | async">
+    <div class="card mainCard" *ngFor="let scan of scanList | async">
       <div class="row" id="testt">
         <div class="col-md-6 mb-1 subCard1" id="subCard1">
           <img src="{{scan.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">

src/app/components/admin/list-scan-effecter/list-scan-effecter.component.ts

@@ -22,7 +22,7 @@ export class ListScanEffecterComponent implements OnInit, OnDestroy {
 
   opComm: OperationCommerciale;
   opCommList: FirebaseListObservable<any[]>;
-  ScanList: FirebaseListObservable<any[]>;
+  scanList: FirebaseListObservable<any[]>;
 
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private authService: AuthService,
@@ -40,7 +40,7 @@ export class ListScanEffecterComponent implements OnInit, OnDestroy {
           this.opComm = element;
 
 
-          this.ScanList = this.afDb.list('/Scan/', {
+          this.scanList = this.afDb.list('/Scan/', {
             query: {
               orderByChild: 'operationCommercial/uid',
               equalTo: params['idOp']

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

@@ -14,6 +14,7 @@
             <div class="card-block row">
               <div class="col-md-8" id="subCard2Part1">
                 <div id="opTitle">
+                  <label>ID Operation Commerciale: {{crt.operationCommercialID}}</label>
                   <label>Status de la carte: {{crt.status}}</label>
                   <label>Nom: {{crt.parrainCarte.familyname}}</label>
                   <label>Prénom: {{crt.parrainCarte.firstname}}</label>

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

@@ -246,12 +246,12 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
         firebase.auth().signOut();
         firebase.auth().signInWithEmailAndPassword(this.commercant.email, this.commercant.password);
         console.log('avant logout firebase.auth().currentUser.uid: '+ firebase.auth().currentUser.uid);
-        this.goToOpComm();
+        // this.goToOpComm();
       } catch (e) {
         // No content response..
         console.log('error dans envoyer carte !')
         console.log(e);
-        this.goToOpComm();
+        // this.goToOpComm();
         // this.router.navigate(['/']);
       }
 

src/app/components/opCommercial/scanner-carte/scanner-carte.component.ts

@@ -43,6 +43,8 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
 
   commList: FirebaseListObservable<any[]>;
   opCommList: FirebaseListObservable<any[]>;
+  scanList: FirebaseListObservable<any[]>;
+
   filleulExistList: FirebaseListObservable<any[]>;
 
   databaseRef: any;
@@ -98,6 +100,12 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
             this.opCommList.forEach(op => {
               op.forEach(element => {
                 this.opComm = element;
+                this.scanList = this.afDb.list('/Scan/', {
+                  query: {
+                    orderByChild: 'operationCommercial/uid',
+                    equalTo: params['idOp']
+                  }
+                });
               });
             });
           });
@@ -165,7 +173,7 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
 
     this.scan.uid = firebase.database().ref().child('Scan').push().key;
     this.scan.dateCreation = new Date (Date.now());
-    this.scan.carteParrainID = this.filleul.idCard;
+    this.scan.carteParrainID = this.cartePar.parrainCarte.uid;
     this.scan.carteFilleulID = this.filleul.idCard;
     this.scan.operationCommercial = this.opComm;
     console.log(Date.now());