validation date tri de toute les listes

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

@@ -29,6 +29,7 @@
                   <label>Validation: {{op.validationXJC}}</label>
                   <label>Status: {{op.status}}</label>
                   <label>Operation Commerciale: {{op.name}}</label>
+                  <label>Commercant: {{op.commercantOpCom.commercialName}}</label>
                 </div>
                 <div id="opAvantages">
                   <label>Avantage parrain: {{op.avantageParrain}}</label>

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

@@ -19,7 +19,8 @@
     </div>
     <div class="list-group">
 
-      <div class="card mainCard" *ngFor="let op of opCommData | async">
+      <div class="card mainCard" *ngFor="let op of filteredOpCommercials">
+
         <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">
@@ -43,6 +44,7 @@
                   <label>Validation: {{op.validationXJC}}</label>
                   <label>Status: {{op.status}}</label>
                   <label>Operation Commerciale: {{op.name}}</label>
+                  <label>Commercant: {{op.commercantOpCom.commercialName}}</label>
                 </div>
                 <div id="opAvantages">
                   <label>Avantage parrain: {{op.avantageParrain}}</label>
@@ -106,6 +108,7 @@
                   <label>Validation: {{op.validationXJC}}</label>
                   <label>Status: {{op.status}}</label>
                   <label>Operation Commerciale: {{op.name}}</label>
+                  <label>Commercant: {{op.commercantOpCom.commercialName}}</label>
                 </div>
                 <div id="opAvantages">
                   <label>Avantage parrain: {{op.avantageParrain}}</label>

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

@@ -6,6 +6,7 @@ import { OperationCommerciale } from '../../../../models/OperationCommerciale';
 import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
 
 import * as firebase from 'firebase/app';
+import * as _ from 'lodash';
 import { AngularFireAuth } from 'angularfire2/auth';
 import { AuthService } from '../../../services/auth/auth.service';
 import { OpCommercialService } from '../../../services/opCommercial/op-commercial.service';
@@ -26,7 +27,10 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy  {
   profileData: FirebaseListObservable<any[]>;
   commercant: Commercant;
   databaseRef: any;
+  opCommercials: any;
+  filteredOpCommercials: any;
 
+  filters = {};
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
     this.opComm = new OperationCommerciale();
@@ -38,12 +42,26 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy  {
       (auth) => {
         // console.log("afAuth.authState : " + auth.toJSON());
         if (auth) {
-          this.opCommData = this.afDb.list('/OperationCommercial/',{
+          /*this.opCommData = this.afDb.list('/OperationCommercial/',{
             query: {
               orderByChild: 'validationXJC',
               equalTo: 'validé'
             }
           }).map((array) => array.filter(opCoVal => opCoVal.status !== 'bloqué')) as FirebaseListObservable<any[]>;
+*/
+          this.afDb.list('/OperationCommercial/')
+            .subscribe(opComs => {
+              this.opCommercials = opComs;
+              this.applyFilters(this.filteredOpCommercials, this.opCommercials);
+              this.filterEgual('validationXJC', 'validé');
+              this.applyFilters(this.filteredOpCommercials, this.opCommercials);
+              this.filterDifferentDe('status', 'bloqué');
+
+              this.applyFilters(this.filteredOpCommercials, this.opCommercials);
+              console.log(opComs);
+              console.log(this.opCommercials);
+              console.log(this.filteredOpCommercials);
+            });
 
           /*_jobs => _jobs.filter(job => job.price > price)
 
@@ -70,6 +88,18 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy  {
     );
   }
 
+  applyFilters(listFiltrer: any, listAFiltrer: any) {
+    this.filteredOpCommercials = _.filter(this.opCommercials, _.conforms(this.filters));
+  }
+
+  filterEgual(property: string, query: string) {
+    this.filters[property] = val => val === query;
+  }
+
+  filterDifferentDe(property: string, query: string) {
+    this.filters[property] = val => val !== query;
+  }
+
   bloquer(uidRejeter: string){
     const opEnvRef = this.databaseRef.child('OperationCommercial').child(uidRejeter).child('status');
     opEnvRef.set('bloqué');

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

@@ -45,7 +45,7 @@ export class CarteEnvoyerComponent implements OnInit {
                 equalTo: auth.uid.toString()
               }
             }
-          );
+          ).map((array) => array.reverse()) as FirebaseListObservable<any[]>;;
 
           this.carteParData.forEach(crt => {
             crt.forEach(crtElement => {

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

@@ -49,7 +49,7 @@ export class CarteParrainageComponent implements OnInit, OnDestroy {
                 equalTo: auth.uid.toString()
               }
             }
-          );
+          ).map((array) => array.reverse()) as FirebaseListObservable<any[]>;;
           this.carteParrData.forEach(car => {
             car.forEach(elementCar => {
               this.updateCarteStatus(elementCar);

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

@@ -9,14 +9,22 @@
       </div>
       <div class="md-form">
         <i class="fa fa-calendar-check-o prefix grey-text"></i>
-        <input type="date" id="orangeForm-Date" [(ngModel)]="opComm.dateDebut" placeholder="Date debut">
+        <input type="date" id="orangeForm-Date" [(ngModel)]="opComm.dateDebut" placeholder="Date debut" required min="minDateTimeTest" max="maxDateTimeTest" name="dateDeb" #dateDeb="ngModel">
+        <div *ngIf="(validationDateDebut()) && (dateDeb.dirty || dateDeb.touched)"  class="alert alert-danger">
+          La date de début doit être comprise entre <strong><i>{{todayDateTimeTest}} et 01/01/2117</i></strong>.
+        </div>
       </div>
       <div class="md-form">
         <i class="fa fa-calendar-times-o prefix grey-text"></i>
-        <input type="date" id="orangeForm-Date" [(ngModel)]="opComm.dateFin" placeholder="Date fin">
+        <input type="date" id="orangeForm-Date" [(ngModel)]="opComm.dateFin" placeholder="Date fin" required min="minDateTimeTest" max="maxDateTimeTest" name="dateFin" #dateFin="ngModel">
+        <div *ngIf="(validationDateFin()) && (dateFin.dirty || dateFin.touched)"  class="alert alert-danger">
+          La date de fin doit être comprise entre <strong><i>{{todayDateTimeTest}} et 01/01/2117</i></strong>.
+        </div>
       </div>
 
 
+
+
       <div class="md-form">
         <i class="fa fa-file-picture-o prefix grey-text"></i>
         <input type="file" id="orangeForm-File"  name="file" style="padding-top: 1%;">

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

@@ -36,12 +36,21 @@ export class CreationOpComComponent implements OnInit, OnDestroy {
 
   user: Observable<firebase.User>;
   opCommData: FirebaseListObservable<any[]>;
-
+  minDateTimeTest: Date;
+  maxDateTimeTest: Date;
+  debutDateTimeTest: Date;
+  finDateTimeTest: Date;
+  todayDateTimeTest: Date;
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
     this.opComm = new OperationCommerciale();
 
     this.user = afAuth.authState;
+    this.minDateTimeTest = new Date('1917-01-01');
+    this.maxDateTimeTest = new Date('2117-01-01');
+    this.debutDateTimeTest = new Date(this.opComm.dateDebut);
+    this.finDateTimeTest = new Date(this.opComm.dateFin);
+    this.todayDateTimeTest = new Date(Date.now());
   }
 
   creerOpComm() {
@@ -70,13 +79,42 @@ export class CreationOpComComponent implements OnInit, OnDestroy {
               this.opComm.validationXJC = 'En Cours';
               console.log('element.uid: ' + element.uid);
               this.opComService.saveOpComm(element, this.opComm);
+              this.goToOpComm();
             });
           });
         }
       }
     );
+
   }
+  validationDateDebut(){
+
+    this.debutDateTimeTest = new Date(this.opComm.dateDebut);
+    this.finDateTimeTest = new Date(this.opComm.dateFin);
+    this.todayDateTimeTest = new Date(Date.now());
+    this.todayDateTimeTest = new Date(this.todayDateTimeTest.getTime() - 50000000);
+    if (this.debutDateTimeTest.getTime() <= (this.todayDateTimeTest.getTime())
+      || this.debutDateTimeTest.getTime() >= this.maxDateTimeTest.getTime()) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
 
+  validationDateFin(){
+
+    this.debutDateTimeTest = new Date(this.opComm.dateDebut);
+    this.finDateTimeTest = new Date(this.opComm.dateFin);
+    this.todayDateTimeTest = new Date(Date.now());
+
+    if (this.finDateTimeTest.getTime() <= this.debutDateTimeTest.getTime()
+      || this.finDateTimeTest.getTime() >= this.maxDateTimeTest.getTime()) {
+      return true;
+    } else {
+      return false;
+    }
+  }
   ngOnInit() {
     try {
       this.user.subscribe(

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

@@ -145,6 +145,7 @@ export class DebiterCarteComponent implements OnInit, OnDestroy {
     this.cartePar.historique.push(elementCarteHist);
     const crtHistoriqueRef = this.databaseRef.child('CarteParrainage').child(this.cartePar.uid.toString()).child('historique');
     crtHistoriqueRef.set(this.cartePar.historique);
+    this.goToOpComm();
   }
   filter(query: string) {
     this.filteredParrainsTest = (query) ?

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

@@ -55,9 +55,9 @@
       </form>
       <div class="md-form">
         <i class="fa fa-birthday-cake prefix grey-text"></i>
-        <input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Birthday" required min="1917-01-01" max="2117-01-01" name="birthday" #birthday="ngModel">
-        <div *ngIf="((parrain.birthday != '01/01/1917') || birthday.errors) && (email.dirty || email.touched)"  class="alert alert-danger">
-          Votre date de naissance doit être comprise entre <strong><i>1917-01-01 et 2117-01-01</i></strong>.
+        <input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Birthday" required min="minDateTimeTest" max="maxDateTimeTest" name="birthday" #birthday="ngModel">
+        <div *ngIf="(validationBirthday())"  class="alert alert-danger">
+          Votre date de naissance doit être comprise entre <strong><i>01/01/1917 et 01/01/2117</i></strong>.
         </div>
       </div>
       <div class="md-form">
@@ -94,7 +94,7 @@
         </div>
       </div>
       <div class="text-center" style="margin-top:5%">
-        <button class="btn btn-light-green waves-light" [disabled]="email.errors" (click)="registerNewParrain()">Creer nouveau parrain & envoyer carte</button>
+        <button class="btn btn-light-green waves-light" [disabled]="email.errors || validationBirthday()" (click)="registerNewParrain()">Creer nouveau parrain & envoyer carte</button>
         <button class="btn btn-cyan" (click)="goToOpComm()">Back</button>
       </div>
     </div>
@@ -165,7 +165,7 @@
         </div>
       </div>
       <div class="text-center" style="margin-top:5%">
-        <button class="btn btn-light-green waves-light" [disabled]="(parSelect === '') || (birthdayTemp !== parrain.birthday)" (click)="creerCartePar()">Envoyer Carte {{parSelect}}</button>
+        <button class="btn btn-light-green waves-light" [disabled]="(parSelect === '') || (birthdayTemp !== parrain.birthday)" (click)="envoyerCartePar()">Envoyer Carte {{parSelect}}</button>
         <button class="btn btn-cyan" (click)="goToOpComm()">Back</button>
       </div>
     </div>

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

@@ -60,6 +60,9 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
 
   yearTest: number;
 
+  minDateTimeTest: Date;
+  maxDateTimeTest: Date;
+  parrainDateTimeTest: Date;
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private route: ActivatedRoute,
               private authService: AuthService, private opComService: OpCommercialService) {
@@ -73,7 +76,9 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
     this.commercant = new Commercant();
     this.cartePar = new CarteParrainage();
     this.parrainAffList = null;
-
+    this.minDateTimeTest = new Date('1917-01-01');
+    this.maxDateTimeTest = new Date('2117-01-01');
+    this.parrainDateTimeTest = new Date(this.parrain.birthday);
     this.yearTest = this.parrain.birthday.getFullYear();
     this.databaseRef = firebase.database().ref();
     this.user.subscribe(
@@ -112,6 +117,13 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
                 this.cartePar.dateDebut = this.opComm.dateDebut;
                 this.cartePar.dateFin = this.opComm.dateFin;
 
+                console.log('bla' + this.minDateTimeTest);
+                console.log('bla' + this.maxDateTimeTest);
+                console.log('bla' + this.minDateTimeTest.getTime());
+                console.log('bla' + this.maxDateTimeTest.getTime());
+
+                console.log('bla' + this.parrainDateTimeTest);
+                console.log('bla' + this.parrainDateTimeTest.getTime());
 
                 var todayTemp = new Date(Date.now());
                 var debutTemp = new Date(this.opComm.dateDebut);
@@ -186,10 +198,20 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
   }
 //////
 
+  validationBirthday(){
+    this.parrainDateTimeTest = new Date(this.parrain.birthday);
+    if (this.parrainDateTimeTest.getTime() <= this.minDateTimeTest.getTime()
+      || this.parrainDateTimeTest.getTime() >= this.maxDateTimeTest.getTime()) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   registerNewParrain() {
 
     this.parrain.status = 'Parrain';
-
+    this.parrain.birthday = this.parrainDateTimeTest;
     this.parrain.secretCode = this.getRandomArbitrary(1111, 9999).toString();
     this.parrain.password = this.getRandomArbitrary(111111, 999999).toString();
     // this.authService.signUp(this.parrain);
@@ -224,10 +246,12 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
         firebase.auth().signOut();
         firebase.auth().signInWithEmailAndPassword(this.commercant.email, this.commercant.password);
         console.log('avant logout firebase.auth().currentUser.uid: '+ firebase.auth().currentUser.uid);
+        this.goToOpComm();
       } catch (e) {
         // No content response..
         console.log('error dans envoyer carte !')
         console.log(e);
+        this.goToOpComm();
         // this.router.navigate(['/']);
       }
 
@@ -298,7 +322,10 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
     console.log('this.cartePar.dateFin : ' + this.cartePar.dateFin);
   }
 
-
+  envoyerCartePar(){
+    this.creerCartePar();
+    this.goToOpComm();
+  }
   creerCartePar() {
     // this.opComService.creerCartePar(this.cartePar); inutile
     this.sectionToImage(this.cartePar);

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

@@ -42,7 +42,7 @@ export class OpCommercialComponent implements OnInit, OnDestroy {
                 equalTo: auth.uid.toString()
               }
             }
-          );
+          ).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
 
           this.profileData = this.afDb.list('/' + auth.displayName + '/', {
               query: {

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

@@ -179,6 +179,7 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
     userRef.set(this.scan);
 
     this.updateCarte();
+    this.goToOpComm();
   }
   updateCarte() {
     console.log(+this.cartePar.avantageCumule);

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

@@ -79,10 +79,20 @@
               <label for="femme">Femme</label>
             </div>
           </form>
+          <!--
           <div class="md-form">
             <i class="fa fa-birthday-cake prefix grey-text"></i>
             <input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Birthday">
           </div>
+-->
+          <div class="md-form">
+            <i class="fa fa-birthday-cake prefix grey-text"></i>
+            <input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Birthday" required min="minDateTimeTest" max="maxDateTimeTest" name="birthday" #birthday="ngModel">
+            <div *ngIf="(validationBirthday())"  class="alert alert-danger">
+              Votre date de naissance doit être comprise entre <strong><i>01/01/1917 et 01/01/2117</i></strong>.
+            </div>
+          </div>
+
           <div class="md-form">
             <i class="fa fa-user prefix grey-text"></i>
             <input type="text" id="orangeForm-Familyname" [(ngModel)]="parrain.telephone" placeholder="{{parrain.telephone}}">

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

@@ -30,7 +30,9 @@ export class EditProfilComponent implements OnInit {
   confirmOldPassword: string;
   newPassword: string;
   ConfirmPassword: string;
-
+  minDateTimeTest: Date;
+  maxDateTimeTest: Date;
+  parrainDateTimeTest: Date;
   constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
               private router: Router, private authService: AuthService ) {
     this.localUser = new User();
@@ -42,7 +44,9 @@ export class EditProfilComponent implements OnInit {
     this.ConfirmPassword = '';
     this.imageProfil = 'https://ssl.prcdn.com/uk/people/default-profile.png?1406639312';
     this.user = afAuth.authState;
-
+    this.minDateTimeTest = new Date('1917-01-01');
+    this.maxDateTimeTest = new Date('2117-01-01');
+    this.parrainDateTimeTest = new Date(this.parrain.birthday);
     this.user.subscribe(
       (auth) => {
         console.log(auth.displayName);
@@ -74,10 +78,17 @@ export class EditProfilComponent implements OnInit {
         }
       }
     );
-
   }
 
-
+  validationBirthday(){
+    this.parrainDateTimeTest = new Date(this.parrain.birthday);
+    if (this.parrainDateTimeTest.getTime() <= this.minDateTimeTest.getTime()
+      || this.parrainDateTimeTest.getTime() >= this.maxDateTimeTest.getTime()) {
+      return true;
+    } else {
+      return false;
+    }
+  }
 
   modifyPasswordSection() {
     if (this.modifiermdp === false) {
@@ -97,7 +108,7 @@ export class EditProfilComponent implements OnInit {
       } else if (this.localUser.status === 'Commercant') {
         this.authService.modifyProfile(this.localUser, this.commercant);
       }
-      console.log('erreur mot de passe pas changer');
+      this.goToProfil();
     } else {
       if (this.localUser.status === 'Parrain') {
         this.parrain.password = this.newPassword;
@@ -106,6 +117,7 @@ export class EditProfilComponent implements OnInit {
         this.commercant.password = this.newPassword;
         this.authService.modifyProfile(this.localUser, this.commercant);
       }
+      this.goToProfil();
     }
   }
 

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

@@ -41,10 +41,15 @@
           <label for="femme">Femme</label>
         </div>
       </form>
+
       <div class="md-form">
         <i class="fa fa-birthday-cake prefix grey-text"></i>
-        <input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Birthday">
+        <input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Birthday" required min="minDateTimeTest" max="maxDateTimeTest" name="birthday" #birthday="ngModel">
+        <div *ngIf="(validationBirthdayParrain())"  class="alert alert-danger">
+          Votre date de naissance doit être comprise entre <strong><i>01/01/1917 et 01/01/2117</i></strong>.
+        </div>
       </div>
+
       <div class="md-form">
         <i class="fa fa-tty prefix grey-text"></i>
         <input type="text" id="orangeForm-Username" required minlength="10" [(ngModel)]="parrain.telephone" placeholder="Telephone" name="telephone" #telephone="ngModel">

src/app/components/register/register.component.ts

@@ -22,13 +22,18 @@ export class RegisterComponent implements OnInit, OnDestroy {
   ConfirmPasswordParrain: String;
   ConfirmPasswordCommercant: String;
   test: boolean;
-
+  minDateTimeTest: Date;
+  maxDateTimeTest: Date;
+  parrainDateTimeTest: Date;
 
   constructor(private router: Router, private authService: AuthService) {
     this.currentUser = new User();
     this.parrain = new Parrain();
     this.commercant = new Commercant();
     this.test = false;
+    this.minDateTimeTest = new Date('1917-01-01');
+    this.maxDateTimeTest = new Date('2117-01-01');
+    this.parrainDateTimeTest = new Date(this.parrain.birthday);
   }
 
   register() {
@@ -61,6 +66,16 @@ export class RegisterComponent implements OnInit, OnDestroy {
     return Math.trunc(Math.random() * (max - min) + min);
   }
 
+  validationBirthdayParrain(){
+    this.parrainDateTimeTest = new Date(this.parrain.birthday);
+    if (this.parrainDateTimeTest.getTime() <= this.minDateTimeTest.getTime()
+      || this.parrainDateTimeTest.getTime() >= this.maxDateTimeTest.getTime()) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   loadHomeComponent() {
     this.router.navigate(['/']);
   }