version stable 27 09 2017

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

@@ -3,35 +3,24 @@
   <h4 class="h5 text-center mb-4" style="padding-top: 5%;">Historique des cartes envoyées</h4>
   <!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToOpCom()">Retour aux Opérations commerciales</button>-->
   <div class="list-group">
-    <div *ngFor="let op of opCommData | async; let i = index;">
+    <div *ngFor="let crt of carteParData | async; let i = index;">
       <div class="card mainCard">
         <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">
-            <div class="view">
-              <div class="row firstRow">
-                <div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</div>
-                <div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
-
-                </div>
-              </div>
-              <div class="row secondRow">
-                <div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
-                <div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
-              </div>
-            </div>
-          </div>
+          <img class="col-md-6 card-image mb-1 subCard1" id="image1" alt="Responsive image" src={{crt.carteTemplate.downloadURL}}>
+          <!--<div class="col-md-6 mb-1 subCard1" id="subCard1">
+            <img src="{{crt.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
+          </div>-->
           <div class="col-md-6 card subCard2">
             <div class="card-block row">
               <div class="col-md-8" id="subCard2Part1">
                 <div id="opTitle">
-                  <label>Nom: {{op.name}}</label>
-                  <label>Prénom: {{op.firstname}}</label>
-                  <label>ID: {{op.uid}}</label>
+                  <label>Nom: {{crt.parrainCarte.familyname}}</label>
+                  <label>Prénom: {{crt.parrainCarte.firstname}}</label>
+                  <label>ID: {{crt.uid}}</label>
                 </div>
                 <div id="opAvantages">
-                  <label>Avantage cummulé:</label>
-                  <label>Avantage récupérer:</label>
+                  <label>Avantage cummulé: {{crt.avantageCumule}}</label>
+                  <label>Avantage récupérer: {{crt.avantageRecuperer}}</label>
                 </div>
               </div>
               <div class="col-md-2" id="subCard2Part2">
@@ -41,7 +30,7 @@
               </div>
             </div>
             <div class="card-block col-md-12" id="subCard2Part3">
-              <h100 class="float-right">Du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</h100>
+              <h100 class="float-right">Du {{crt.dateDebut | date:'dd/MM/yyyy'}} au {{crt.dateFin | date:'dd/MM/yyyy'}}</h100>
             </div>
           </div>
         </div>

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

@@ -18,9 +18,8 @@ import { Commercant } from '../../../../models/Commercant';
   providers: [AuthService, OpCommercialService]
 })
 export class CarteEnvoyerComponent implements OnInit {
-  opComm: OperationCommerciale;
   user: Observable<firebase.User>;
-  opCommData: FirebaseListObservable<any[]>;
+  carteParData: FirebaseListObservable<any[]>;
   profileData: FirebaseListObservable<any[]>;
   // Cas2Image: Observable<Canvas2Image>;
   commercant: Commercant;
@@ -30,7 +29,6 @@ export class CarteEnvoyerComponent implements OnInit {
 
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
-    this.opComm = new OperationCommerciale();
     this.hideme = {}; // init is required
 
     this.user = afAuth.authState;
@@ -39,7 +37,7 @@ export class CarteEnvoyerComponent implements OnInit {
       (auth) => {
         // console.log("afAuth.authState : " + auth.toJSON());
         if (auth) {
-          this.opCommData = this.afDb.list('/CarteParrainage/', {
+          this.carteParData = this.afDb.list('/CarteParrainage/', {
               query: {
                 orderByChild: 'commercantCarte/uid',
                 equalTo: auth.uid.toString()

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

@@ -13,7 +13,7 @@
   <app-nav-commercant></app-nav-commercant>
   <h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste de vos operations commercials</h4>
   <div class="row" style="padding-top: 5%;">
-    <!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCreaOpCom()">Nouvelle opération Commerciale</button>-->
+    <button class="btn btn-primary btn-rounded waves-light" (click)="goToCreaOpCom()">Nouvelle opération Commerciale</button>
     <!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarteEnvoyer()">Historique carte envoyer</button>-->
     <!--<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Profil</button>-->
   </div>

src/app/components/profil/profil.component.html

@@ -76,7 +76,6 @@
             <!--<p><i class="fa fa-quote-left"></i> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eos, adipisci</p>-->
           </div>
           <button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()">Editer profile</button>
-          <button class="btn btn-default btn-rounded waves-light" (click)="logout()"> <!--*ngIf="(user | async)?.uid"-->Logout</button>
 
         </div>
 
@@ -142,7 +141,6 @@
 
 
           <button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()">Editer profile</button>
-          <button class="btn btn-default btn-rounded waves-light" (click)="logout()"> <!--*ngIf="(user | async)?.uid"-->Logout</button>
 
         </div>