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

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

@@ -27,7 +27,7 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy  {
   commercant: Commercant;
   databaseRef: any;
   tarifXJCParr: number;
-
+  tailleOpEncour: number;
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private authService: AuthService,
               private opComService: OpCommercialService, private toastrService: ToastrService) {
@@ -48,6 +48,16 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy  {
             }
           }).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
 
+          this.opCommDataEnCours.$ref
+            .orderByChild('validationXJC')
+            .equalTo('En Cours')
+            .on('child_added', (child) => {
+              console.log('iiiii' + child);
+              this.toastrService.success("Nouvelle demande d'opération commerciale" );
+            });
+
+
+
           this.opCommDataRejeter = this.afDb.list('/OperationCommercial/',{
             query: {
               orderByChild: 'validationXJC',

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

@@ -32,7 +32,7 @@ export class ListCarteEnvoyerComponent implements OnInit, OnDestroy {
     this.route.params.subscribe(params => {
       this.carteParList = this.afDb.list('/CarteParrainage/', {
           query: {
-            orderByChild: 'operationCommercialID',
+            orderByChild: 'operationCommercialCarte/uid',
             equalTo: params['idOp']
           }
         });

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

@@ -157,7 +157,7 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy  {
   carteEnvoyer(op: OperationCommerciale){
     this.opCommData = this.afDb.list('/CarteParrainage/',{
       query: {
-        orderByChild: 'operationCommercialID',
+        orderByChild: 'operationCommercialCarte/uid',
         equalTo: op.uid
       }
     }).map((array) => array.reverse()) as FirebaseListObservable<any[]>;

src/app/components/home/home.component.html

@@ -9,7 +9,7 @@
         <div class="row pt-5 mt-3">
           <div class="col-md-12 mb-3">
             <div class="intro-info-content text-center">
-              <h1 class="display-3 mb-5 wow fadeInDown" data-wow-delay="0.3s">Parrain <a class="indigo-text font-bold">App</a></h1>
+              <h1 class="display-3 mb-5 wow fadeInDown" data-wow-delay="0.3s">Parraine <a class="indigo-text font-bold">Tes Amis</a></h1>
               <h5 class="font-up mb-5 mt-1 font-bold wow fadeInDown" data-wow-delay="0.3s">La Grosse Remise !</h5>
 
               <button class="btn btn-light-blue btn-lg wow fadeInDown waves-light" id="inscription" data-wow-delay="0.3s" mdbRippleRadius (click)="loadRegisterComponent();">S'inscrire</button>

src/app/components/navigationBar/nav-admin/nav-admin.component.html

@@ -1,6 +1,6 @@
 <navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar indigo">
   <logo>
-    <a class="logo navbar-brand waves-light" mdbRippleRadius><strong>ParrainApp</strong></a>
+    <a class="logo navbar-brand waves-light" mdbRippleRadius><strong>Parraine Tes Amis</strong></a>
   </logo>
   <links>
     <ul class="navbar-nav mr-auto">

src/app/components/navigationBar/nav-commercant/nav-commercant.component.html

@@ -1,7 +1,7 @@
 <!--Navbar-->
 <navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar indigo">
   <logo>
-    <a class="logo navbar-brand waves-light" mdbRippleRadius><strong>ParrainApp</strong></a>
+    <a class="logo navbar-brand waves-light" mdbRippleRadius><strong>Parraine Tes Amis</strong></a>
   </logo>
   <links>
       <ul class="navbar-nav mr-auto">

src/app/components/navigationBar/nav-parrain/nav-parrain.component.html

@@ -1,7 +1,7 @@
 <!--Navbar-->
 <navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar indigo">
   <logo>
-    <a class="logo navbar-brand waves-light" mdbRippleRadius><strong>ParrainApp</strong></a>
+    <a class="logo navbar-brand waves-light" mdbRippleRadius><strong>Parraine Tes Amis</strong></a>
   </logo>
   <links>
     <ul class="navbar-nav mr-auto">

src/app/components/navigationBar/navigationBar.component.html

@@ -1,7 +1,7 @@
 <!--Navbar-->
 <navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar indigo">
   <logo>
-    <a class="logo navbar-brand waves-light" mdbRippleRadius><strong>ParrainApp</strong></a>
+    <a class="logo navbar-brand waves-light" mdbRippleRadius><strong>Parraine Tes Amis</strong></a>
   </logo>
   <links>
     <ul class="navbar-nav mr-auto">

src/app/components/profil/edit-profil/edit-profil.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, EventEmitter } from '@angular/core';
+import { Component, OnInit, OnDestroy, EventEmitter } from '@angular/core';
 
 import { Observable } from 'rxjs/Observable';
 import { Router } from '@angular/router';
@@ -18,7 +18,7 @@ import { Commercant } from '../../../../models/Commercant';
   styleUrls: ['./edit-profil.component.scss'],
   providers: [AuthService]
 })
-export class EditProfilComponent implements OnInit {
+export class EditProfilComponent implements OnInit, OnDestroy {
 
   user: Observable<firebase.User>;
   localUser: any;
@@ -49,7 +49,7 @@ export class EditProfilComponent implements OnInit {
     this.parrainDateTimeTest = new Date(this.parrain.birthday);
     this.user.subscribe(
       (auth) => {
-        console.log(auth.displayName);
+        // console.log(auth.displayName);
         if (auth) {
           this.profileData = this.afDb.list('/' + auth.displayName + '/', {
               query: {
@@ -124,7 +124,7 @@ export class EditProfilComponent implements OnInit {
   goToProfil() {
     this.router.navigate(['/profil']);
   }
-
+  ngOnDestroy(){}
   ngOnInit() {
     var inputs = document.querySelectorAll( '.inputfile' );
     Array.prototype.forEach.call( inputs, function( input )

src/app/services/auth/auth.service.ts

@@ -119,10 +119,12 @@ export class AuthService {
                   console.log('salut le ' + this.utilisateur.email + ' ' + this.utilisateur.status + ' has signed!');
 
                   firebase.auth().onAuthStateChanged(function (userUpdate) {
-                    userUpdate.updateProfile({
-                      displayName: elementParrain.status,
-                      photoURL: elementParrain.image.downloadURL
-                    });
+                    if(userUpdate !== null){
+                      userUpdate.updateProfile({
+                        displayName: elementParrain.status,
+                        photoURL: elementParrain.image.downloadURL
+                      });
+                    }
                   });
                   if (this.utilisateur.status === 'Parrain') {
                     this.router.navigate(['/carteParrainageComponent']);
@@ -152,10 +154,12 @@ export class AuthService {
                 if (/*user.emailVerified*/true){
                   console.log('salut le ' + this.utilisateur.email + ' ' + this.utilisateur.status + ' has signed!');
                   firebase.auth().onAuthStateChanged(function (userUpdate) {
-                    userUpdate.updateProfile({
-                      displayName: elementCommercant.status,
-                      photoURL: elementCommercant.image.downloadURL
-                    });
+                    if (userUpdate !== null){
+                      userUpdate.updateProfile({
+                        displayName: elementCommercant.status,
+                        photoURL: elementCommercant.image.downloadURL
+                      });
+                    }
                   });
                   if (this.utilisateur.status === 'Parrain') {
                     this.router.navigate(['/carteParrainageComponent']);
@@ -257,13 +261,15 @@ export class AuthService {
       });
     }
     firebase.auth().onAuthStateChanged(function (userUpdate) {
-      userUpdate.updateProfile({
-        displayName: info.status,
-        photoURL: info.image.downloadURL
-      }).then(al => {
-        console.log('userUpdate.dispppp : ' + al);
-        // firebase.auth().signOut();
-      });
+      if (userUpdate !== null){
+        userUpdate.updateProfile({
+          displayName: info.status,
+          photoURL: info.image.downloadURL
+        }).then(al => {
+          console.log('userUpdate.dispppp : ' + al);
+          // firebase.auth().signOut();
+        });
+      }
     });
 
     return true;
@@ -291,10 +297,12 @@ export class AuthService {
       });
     }
     firebase.auth().onAuthStateChanged(function (userUpdate) {
-      userUpdate.updateProfile({
-        displayName: info.status,
-        photoURL: info.image.downloadURL
-      });
+      if (userUpdate !== null){
+        userUpdate.updateProfile({
+          displayName: info.status,
+          photoURL: info.image.downloadURL
+        });
+      }
       if (userUpdate) {
         console.log('userUpdate: ' + userUpdate);
       } else {