nav-admin logout + tarif xjc

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

@@ -25,6 +25,10 @@
           <div class="col-md-6 card subCard2">
             <div class="card-block row no-margin">
               <div class="col-md-8" id="subCard2Part1">
+                <div class="md-form">
+                  <input mdbActive type="number" id="form1" class="form-control" step="any">
+                  <label for="form1" class="">Tarif XJC</label>
+                </div>
                 <div id="opTitle">
                   <label>Operation Commerciale: {{op.name}}</label>
                   <label>Commercant: {{op.commercantOpCom.commercialName}}</label>
@@ -33,11 +37,6 @@
                   <label>Avantage parrain: {{op.avantageParrain}}</label>
                   <label>Avantage filleul: {{op.avantageFilleul}}</label>
                 </div>
-                <div id="opLogs">
-                  <label>Carte(s) envoyée(s): {{op.nbEnvoie}}</label>
-                  <label>Carte(s) scannée(s): {{op.nbScan}}</label>
-                  <label>Carte(s) débitée(s): {{op.nbDebiter}}</label>
-                </div>
               </div>
               <div class="col-md-2" id="subCard2Part2">
                 <button type="button" class="btn btn-success btn-rounded waves-light" mdbRippleRadius (click)="valider(op.uid)">Valider</button>
@@ -99,7 +98,7 @@
                 </div>
               </div>
               <div class="col-md-2" id="subCard2Part2">
-                <button class="btn btn-outline-primary btn-rounded" (click)="valider(op.uid)">Valider</button>
+                <button class="btn btn-success btn-rounded waves-light" (click)="valider(op.uid)">Valider</button>
               </div>
             </div>
           </div>

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

@@ -14,9 +14,12 @@
           </li>
     -->
     <ul class="navbar-nav nav-flex-icons">
-      <li class="nav-item">
-        <a class="nav-link waves-light" mdbRippleRadius>
-          xjc@gmail.com</a>
+      <li class="nav-item dropdown" dropdown>
+        <a dropdownToggle mdbRippleRadius type="button" class="nav-link dropdown-toggle waves-light" mdbRippleRadius>
+          xjc@gmail.com<span class="caret"></span></a>
+        <div *dropdownMenu class="dropdown-menu dropdown dropdown-primary" role="menu">
+          <a class="dropdown-item waves-light" mdbRippleRadius (click)="logout()">Se déconnecter</a>
+        </div>
       </li>
     </ul>
 

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

@@ -1,4 +1,12 @@
 import { Component, OnInit } from '@angular/core';
+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 { Observable } from 'rxjs/Observable';
+import { Commercant } from '../../../../models/Commercant';
+import { Router } from '@angular/router';
+
 
 @Component({
   selector: 'app-nav-admin',
@@ -6,8 +14,37 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./nav-admin.component.scss']
 })
 export class NavAdminComponent implements OnInit {
+  user: Observable<firebase.User>;
+  localUser: any;
+  profileData: FirebaseListObservable<any[]>;
+  imageProfil: string;
+  role: any;
+
+  constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
+              private router: Router, private authService: AuthService) {
+    this.user = afAuth.authState;
+    this.user.subscribe(
+      (auth) => {
+        if (auth) {
+          console.log(auth.displayName);
+          this.profileData = this.afDb.list('/' + auth.displayName + '/', {
+              query: {
+                orderByChild: 'uid',
+                equalTo: auth.uid.toString()
+              }
+            }
+          );
+        }
+      }
+    );
+  }
 
-  constructor() { }
+  logout() {
+    firebase.auth().signOut();
+    this.authService.logout();
+    this.user = null;
+    this.router.navigate(['/']);
+  }
 
   ngOnInit() {
   }

src/app/components/opCommercial/creation-op-com/creation-op-com.component.html

@@ -31,11 +31,11 @@
       </div>
       <div class="md-form">
         <i class="fa fa-euro prefix grey-text"></i>
-        <input type="text" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageParrain" placeholder="Avantage parrain">
+        <input type="number" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageParrain" placeholder="Avantage parrain" step="any">
       </div>
       <div class="md-form">
         <i class="fa fa-euro prefix grey-text"></i>
-        <input type="text" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageFilleul" placeholder="Avantage filleul">
+        <input type="number" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageFilleul" placeholder="Avantage filleul" step="any">
       </div>
     </div>