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

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

@@ -1,15 +1,51 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { Observable } from 'rxjs/Observable';
+
+import { OperationCommerciale } from '../../../../models/OperationCommerciale';
+import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
+
+import * as firebase from 'firebase/app';
+import { AngularFireAuth } from 'angularfire2/auth';
+import { AuthService } from '../../../services/auth/auth.service';
+import { OpCommercialService } from '../../../services/opCommercial/op-commercial.service';
+import { Commercant } from '../../../../models/Commercant';
 
 @Component({
   selector: 'app-liste-op-commercial',
   templateUrl: './liste-op-commercial.component.html',
-  styleUrls: ['./liste-op-commercial.component.scss']
+  styleUrls: ['./liste-op-commercial.component.scss'],
+  providers: [AuthService, OpCommercialService]
 })
-export class ListeOpCommercialComponent implements OnInit {
+export class ListeOpCommercialComponent implements OnInit, OnDestroy  {
+  opComm: OperationCommerciale;
+  user: Observable<firebase.User>;
+  opCommData: FirebaseListObservable<any[]>;
+  profileData: FirebaseListObservable<any[]>;
+  commercant: Commercant;
 
-  constructor() { }
+  constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
+              private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
+
+  }
 
   ngOnInit() {
+    try {
+      this.user.subscribe(
+        (auth) => {
+          if (auth) {
+            console.log(auth.uid);
+          } else {
+            // this.router.navigate(['/']);
+          }
+        });
+    } catch (e) {
+      // No content response..
+      console.log(e);
+      // this.router.navigate(['/']);
+    }
   }
+  ngOnDestroy() {}
 
 }

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

@@ -61,7 +61,8 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
   yearTest: number;
 
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
-              private router: Router, private route: ActivatedRoute) {
+              private router: Router, private route: ActivatedRoute,
+              private authService: AuthService, private opComService: OpCommercialService) {
     this.user = afAuth.authState;
 
 
@@ -365,6 +366,8 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
   }
   //////
   ngOnInit() {
+    this.subscription = this.opComService.getParrains()
+      .subscribe(parrains => this.parrainsTest = parrains);
   }
 //////
 

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

@@ -1,15 +1,6 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
 
-import * as html2canvas from 'html2canvas';
-// import * as Canvas2Ime from '../../../../../node_modules/canvas2image/canvas2image.js';
-// const Canvas2Image = require('canvas2image');
-// const { CAN } = Canvas2Image;
-// import 'canvas2image';
-
-
-// import * as $ from 'jquery';
-// import $ from 'jquery';
 import { Observable } from 'rxjs/Observable';
 
 import { OperationCommerciale } from '../../../../models/OperationCommerciale';
@@ -20,15 +11,7 @@ import { AngularFireAuth } from 'angularfire2/auth';
 import { AuthService } from '../../../services/auth/auth.service';
 import { OpCommercialService } from '../../../services/opCommercial/op-commercial.service';
 import { Commercant } from '../../../../models/Commercant';
-/*require('jsdom').env('', function(err, window) {
- if (err) {
- console.error(err);
- return;
- }
 
- var $ = require('jquery')(window);
- });*/
-// import { Image } from '../../../../models/Image';
 @Component({
   selector: 'app-op-commercial',
   templateUrl: './op-commercial.component.html',