version plus clean pour presentation du 21 09 2017

src/app/components/login/login.component.html

@@ -1,8 +1,8 @@
 <div class="card">
   <div class="well">
         <p class="h5 text-center mb-4">Login</p>
-        <div> ID: {{ (user | async)?.uid }} </div>
-        <div> Email: {{ (user | async)?.email }} </div>
+        <!--<div> ID: {{ (user | async)?.uid }} </div>
+        <div> Email: {{ (user | async)?.email }} </div>-->
 
         <div class="md-form">
           <i class="fa fa-envelope prefix grey-text"></i>
@@ -22,7 +22,7 @@
 
         <div class="text-center" style="margin-top:5%">
           <button class="btn btn-dark-green" [disabled]="mail.errors || pass.errors" (click)="login()">Login <i class="fa fa-paper-plane-o ml-1"></i></button>
-          <button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>
+          <!--<button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>-->
         </div>
   </div>
 </div>

src/app/components/opCommercial/debiter-carte/debiter-carte.component.html

@@ -20,15 +20,18 @@
         <input type="text" id="orangeForm-Familyname" placeholder="ID carte" ><!--[(ngModel)]="filleul.idCard"-->
       </div>
 
-      <p>{{parSelect}}</p>
-      <input
-        #query
-        (keyup)="filter(query.value)"
-        type="text" class="form-control" placeholder="Cherchez Parrain Existants...">
-      <div *ngFor="let parrain of filteredParrainsTest">
-        <a (click)="getIdParrain(parrain.uid)">{{parrain.firstname}} {{parrain.familyname}}</a>
-      </div>
 
+      <div class="md-form">
+        <p>{{parSelect}}</p>
+        <i class="fa fa-user prefix grey-text"></i>
+        <input
+          #query
+          (keyup)="filter(query.value)"
+          type="text" class="form-control" placeholder="Cherchez Parrain Existants...">
+        <div *ngFor="let parrain of filteredParrainsTest">
+          <a (click)="getIdParrain(parrain.uid)">{{parrain.firstname}} {{parrain.familyname}}</a>
+        </div>
+      </div>
 
       <div class="md-form">
         <i class="fa fa-user prefix grey-text"></i>
@@ -50,7 +53,3 @@
 
   </div>
 </div>
-<figure>
-  <img src="https://www.sciencesetavenir.fr/assets/img/2016/03/09/cover-r4x3w1000-57df40df2241f-les-signes-de-la-douleur-chez-le-chat.jpg" alt="" />
-  <figcaption>Légende associée</figcaption>
-</figure>

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

@@ -25,6 +25,7 @@
         <div class="row secondRow">
           <div class="col-md-6 flex-center cardPart3"><p>{{cartePar.name}}</p></div>
           <div class="col-md-6 flex-center cardPart4"><p>{{cartePar.uid}}</p></div>
+          <div class="col-md-6 flex-center cardPart5"><p>Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</p></div>
         </div>
       </div>
     </div>
@@ -38,10 +39,11 @@
         <input name="group2" type="radio" class="with-gap" id="ParrainExist" value ="ParrainExist" (click)="initParSelect()" [(ngModel)]="radioParrain">
         <label for="ParrainExist">Parrain Existant</label>
       </div>
+      <!--
       <div class="md-form" style="padding-left: 2%;">
         <input name="group2" type="radio" class="with-gap" id="ParrainAffi" value ="ParrainAffi" (click)="initParSelect()" [(ngModel)]="radioParrain">
         <label for="ParrainAffi">Parrain Affilier</label>
-      </div>
+      </div>-->
     </form>
     <!-- Si cest un nouveau parrain -->
     <div *ngIf="radioParrain === 'Newparrain'">
@@ -103,19 +105,21 @@
         </div>
       </div>
       -->
-      <input
-      #query
-      (keyup)="filter(query.value)"
-      type="text" class="form-control" placeholder="Cherchez Parrains Existants...">
-      <div *ngFor="let parrain of filteredParrainsTest">
-        <a (click)="getIdParrain(parrain.uid)">{{parrain.firstname}} {{parrain.familyname}}</a>
-        <p>
-          {{parrain?.status}}
-        </p>
+      <div class="md-form">
+        <i class="fa fa-user prefix grey-text"></i>
+        <input
+        #query
+        (keyup)="filter(query.value)"
+        type="text" class="form-control" placeholder="Cherchez Parrains Existants...">
+        <div *ngFor="let parrain of filteredParrainsTest">
+          <a (click)="getIdParrain(parrain.uid)">{{parrain.firstname}} {{parrain.familyname}}</a>
+          <p>
+            {{parrain?.status}}
+          </p>
+        </div>
       </div>
 
 
-
       <div class="md-form" style="padding-top:2%;">
         <i class="fa fa-birthday-cake prefix grey-text"></i>
         <input type="date" id="orangeForm-Birthday" placeholder="Birthday">
@@ -133,7 +137,7 @@
     </div>
     <!-- Fin Si cest un parrain existant -->
 
-    <!-- Si cest un parrain connu et affilié -->
+    <!-- Si cest un parrain connu et affilié
     <div *ngIf="radioParrain === 'ParrainAffi'">
       <p>{{parSelect}}</p>
       <div class="dropdown" dropdown>
@@ -160,7 +164,7 @@
           <button class="btn btn-light-green waves-light" [disabled]="parSelect === ''" (click)="creerCartePar()">Envoyer Carte</button>
           <button class="btn btn-cyan" (click)="goToOpComm()">Back</button>
         </div>
-      </div>
+      </div>-->
     <!-- Fin Si cest  un parrain connu et affilié -->
     <button class="btn btn-blue waves-light" (click)="sectionToImage()"> screen </button>
     </div>

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

@@ -14,7 +14,6 @@ import { Commercant } from '../../../../models/Commercant';
 import { FireImg } from '../../../../models/FireImg';
 import { OperationCommerciale } from '../../../../models/OperationCommerciale';
 import { CarteParrainage } from '../../../../models/CarteParrainage';
-
 import { OpCommercialService } from '../../../services/opCommercial/op-commercial.service';
 import { Subject } from 'rxjs/Subject';
 import { Subscription } from 'rxjs/Subscription';
@@ -106,6 +105,12 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
                 this.cartePar.operationCommercialID = this.opComm.uid;
                 this.cartePar.dateDebut = this.opComm.dateDebut;
                 this.cartePar.dateFin = this.opComm.dateFin;
+                console.log('this.opComm.dateFin: '+ this.opComm.dateFin);
+                /*
+                var dateTest = this.opComm.dateFin.toString().split(/[- :]/);
+                this.cartePar.dateFin = new Date(Number(dateTest[0]), Number(dateTest[1]) - 1,
+                  Number(dateTest[2]), Number(dateTest[3]), Number(dateTest[4]), Number(dateTest[5]));
+                  */
                 this.cartePar.carteTemplate = this.opComm.carteTemplate;
               });
             });

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

@@ -38,12 +38,19 @@
           <div class="row">
             <div class="col-md-8" style="padding-top: 5%;">
               <label>Operation Commerciale: {{op.name}}</label>
+              <p>Avantage parrain:</p>
+              <p>Avantage filleul:</p>
+              <p>Carte(s) envoyée(s):</p>
+              <p>Carte(s) scannée(s):</p>
+              <p>Carte(s) débitée(s):</p>
+              <h100>Du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</h100>
             </div>
             <div class="col-md-2" style="padding-top: 5%;">
               <button class="btn btn-outline-primary btn-rounded" (click)="goToEnCart(op.uid)">Envoyer</button>
               <button class="btn btn-outline-default btn-rounded" (click)="goToScanCart(op.uid)">Scanner</button>
               <button class="btn btn-outline-info btn-rounded" (click)="goToDebiterCart(op.uid)">Débiter</button>
-              <button class="btn btn-outline-info btn-rounded" (click)="sectionToImage(op.carteTemplate.downloadURL, commercant.image.downloadURL)">screenShot</button>
+
+              <!--<button class="btn btn-outline-info btn-rounded" (click)="sectionToImage(op.carteTemplate.downloadURL, commercant.image.downloadURL)">screenShot</button>-->
             </div>
           </div>
         </div>

src/app/components/opCommercial/scanner-carte/scanner-carte.component.html

@@ -74,19 +74,21 @@
     <div *ngIf="radioFilleul === 'FilleulExist'">
 
       <p>{{filleulSelect}}</p>
-      <input
-        #query
-        (keyup)="filter(query.value)"
-        type="text" class="form-control" placeholder="Cherchez Filleul Existants...">
-      <div *ngFor="let filleul of filteredFilleulsTest">
-        <a (click)="getIdFilleul(filleul.uid)">{{filleul.firstname}} {{filleul.familyname}}</a>
-        <p>
-          Carte ID:
-          {{filleul?.idCard}}
-        </p>
+      <div class="md-form">
+        <i class="fa fa-user prefix grey-text"></i>
+        <input
+          #query
+          (keyup)="filter(query.value)"
+          type="text" class="form-control" placeholder="Cherchez Filleul Existants...">
+        <div *ngFor="let filleul of filteredFilleulsTest">
+          <a (click)="getIdFilleul(filleul.uid)">{{filleul.firstname}} {{filleul.familyname}}</a>
+          <p>
+            Carte ID:
+            {{filleul?.idCard}}
+          </p>
+        </div>
       </div>
 
-
       <div class="md-form" style="padding-top:2%;">
         <i class="fa fa-birthday-cake prefix grey-text"></i>
         <input type="date" id="orangeForm-Birthday" placeholder="Birthday">

src/app/components/register/register.component.html

@@ -82,7 +82,7 @@
       </label>
       <div class="text-center" style="margin-top:5%">
         <button class="btn btn-deep-orange" [disabled]="email.errors || password.errors || (parrain.password != ConfirmPasswordParrain)" (click)="register()">Sign up</button>
-        <button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>
+        <!--<button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>-->
       </div>
     </div>
     <!--Fin Si cest un parrain-->
@@ -138,7 +138,7 @@
       </label>
       <div class="text-center" style="margin-top:5%">
         <button class="btn btn-deep-orange" [disabled]="email.errors || password.errors || (commercant.password != ConfirmPasswordCommercant)" (click)="register()">S'inscrire</button>
-        <button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>
+        <!--<button class="btn btn-cyan" (click)="loadHomeComponent()">Back</button>-->
       </div>
     </div>
     <!--Fin Si cest un commercant-->