correction bug 05 10 2017

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

@@ -1,7 +1,8 @@
 <app-nav-admin></app-nav-admin>
-<div class="container" style="padding-top:5%">
+<div class="container">
 
-  <div class="col-md-12">
+  <div class="col-md-12" id="listeCartePart1">
+    <button class="btn btn-default btn-rounded waves-light" (click)="goToOpComAdmin()">Retour</button>
     <h4 class="font-up mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Aperçu de votre opération commerciale</h4>
     <div class="card mainCard wow fadeInLeft">
       <div class="row no-margin" id="testt">
@@ -53,7 +54,8 @@
     </div>
   </div>
 
-  <div class="col-md-12">
+  <hr>
+  <div class="col-md-12" id="listeCartePart2">
     <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Liste des cartes de parrainages issues de l'opération commerciale ci-dessus : {{opComm?.name}} ({{(carteParList | async)?.length}})</h4>
     <div class="list-group wow fadeInLeftBig">
       <div class="card mainCard" *ngFor="let crt of carteParList | async">
@@ -77,9 +79,16 @@
             </div>
           </div>-->
           <div class="col-md-6 card subCard2issu">
-            <label>ID de la carte: {{crt.uid}}</label>
-            <label>Avantage Cumule: {{crt.avantageCumule}} €</label>
-            <label>Avantage Recuperer: {{crt.avantageRecuperer}} €</label>
+            <div class="row">
+              <div class="col-md-7">
+                <label>ID de la carte: {{crt.uid}}</label>
+                <label>Avantage Cumule: {{crt.avantageCumule}} €</label>
+                <label>Avantage Recuperer: {{crt.avantageRecuperer}} €</label>
+              </div>
+              <div class="col-md-2">
+                <button class="btn btn-outline-primary btn-rounded" (click)="hideme[i] = !hideme[i]">{{show ? 'Cacher Détails' : 'Détails'}}</button>
+              </div>
+            </div>
           </div>
         </div>
         <!-- Card footer -->
@@ -90,6 +99,15 @@
           </ul>
         </div>
         <!-- Card footer -->
+        <div class="card" [hidden]="!hideme[i]" style="height:20rem; overflow-y: auto;">
+          <div class="card-body">
+            <ul class="list-group wow fadeInDown">
+              <li class="list-group-item justify-content-between align-items-center" *ngFor="let hst of crt.historique">
+                <p class="font-weight-normal" style="padding-top: 2%">{{hst}}</p>
+              </li>
+            </ul>
+          </div>
+        </div>
       </div>
     </div>
   </div>

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

@@ -1,5 +1,5 @@
 .container {
-  padding-top:5%;
+  padding-top:10%;
 }
 
 .mainCard {
@@ -100,6 +100,14 @@
   margin-left: 0;
 }
 
+#listeCartePart1 {
+  padding-bottom: 10%;
+}
+
+#listeCartePart2 {
+  padding-bottom: 10%;
+}
+
 @media screen and (max-width: 720px) {
   .container {
     padding-top: 20%;

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

@@ -23,9 +23,11 @@ export class ListCarteEnvoyerComponent implements OnInit, OnDestroy {
   opComm: OperationCommerciale;
   opCommList: FirebaseListObservable<any[]>;
   carteParList: FirebaseListObservable<any[]>;
+  hideme = {};
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private authService: AuthService,
               private route: ActivatedRoute, private opComService: OpCommercialService) {
+    this.hideme = {}; // init is required
 
     this.route.params.subscribe(params => {
       this.carteParList = this.afDb.list('/CarteParrainage/', {
@@ -53,6 +55,17 @@ export class ListCarteEnvoyerComponent implements OnInit, OnDestroy {
     });
   }
 
+  showDetails(item){
+    Object.keys(this.hideme).forEach(h => {
+      this.hideme[h] = false;
+    });
+    this.hideme[item.id] = true;
+  }
+
+  goToOpComAdmin(){
+    this.router.navigate(['/listOpCommercialAdmin']);
+  }
+
   ngOnInit() {
   }
   ngOnDestroy() {

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

@@ -11,6 +11,9 @@
 <button (click)="goToProfil()">Back</button>
 -->
   <app-nav-admin></app-nav-admin>
+  <div class="btn-block">
+    <button class="btn btn-default btn-rounded waves-light" (click)="goToOpComAdmin()">Retour</button>
+  </div>
   <div class="card col-md-12 wow fadeInLeft" id="scanPart2">
     <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 2%;">Liste des scans effectués ({{(scanList | async)?.length}})</h4>
     <div class="row">

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

@@ -4,3 +4,7 @@
 .card {
   padding: 5%;
 }
+
+#scanPart2 {
+  margin-top: 5%;
+}

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

@@ -57,6 +57,10 @@ export class ListScanEffecterComponent implements OnInit, OnDestroy {
     });
   }
 
+  goToOpComAdmin(){
+    this.router.navigate(['/listOpCommercialAdmin']);
+  }
+
   ngOnInit() {
   }
   ngOnDestroy() {

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

@@ -10,8 +10,10 @@
 <button (click)="goToProfil()">Back</button>
 -->
   <app-nav-admin></app-nav-admin>
-  <div class="col-md-12">
+
+  <div class="col-md-12" id="listeOpPart1">
     <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Liste des operations commerciales ({{filteredOpCommercials?.length}})</h4>
+
     <div class="btn-block flex-center align-middle" style="padding-top: 2%;">
       <!--<button class="btn btn-primary btn-rounded waves-light" id="nouvelleOp" (click)="goToCreaOpCom()">Nouvelle opération Commerciale</button>-->
       <!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarteEnvoyer()">Historique carte envoyer</button>-->
@@ -81,7 +83,8 @@
 
 
 
-  <div class="col-md-12">
+
+  <div class="col-md-12" id="listeOpPart2">
     <h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Historique des opérations bloquées ({{(opCommDataBloquer | async)?.length}})</h4>
     <div class="btn-block flex-center align-middle" style="padding-top: 2%;">
       <!--<button class="btn btn-primary btn-rounded waves-light" id="nouvelleOp" (click)="goToCreaOpCom()">Nouvelle opération Commerciale</button>-->

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

@@ -87,6 +87,14 @@
   margin-left: 0;
 }
 
+#listeOpPart1 {
+  padding-bottom: 10%;
+}
+
+#listeOpPart2 {
+  padding-bottom: 10%;
+}
+
 @media screen and (max-width: 720px) {
   .container {
     padding-top: 20%;

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

@@ -364,6 +364,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
         // document.body.appendChild(canvas);
         console.log('avant blob');
         canvas.toBlob(blob => {
+
           const nouvelleImg = new Image();
           const storageRef = firebase.storage().ref();
           nouvelleImg.setAttribute('crossOrigin', 'anonymous');
@@ -383,7 +384,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
             firebase.database().ref().update(updates);
             console.log('fin du blob');
           });
-        });
+        }, 'image/jpeg', 20);
       }
     });
   }