scanner et envoyer carte correction faute

thierry
Tmadkaud 7 years ago
parent d73471050b
commit 77f5ee5d23

@ -15,7 +15,7 @@
<div class="well">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Envoyer Carte</h5>
<p class="text-center mb-4" style="padding-top: 2%;">Choisissez quelle type de parrain à qui envoyer la carte</p>
<p class="text-center mb-4" style="padding-top: 2%;">Choisissez quel type de parrain à qui envoyer la carte</p>
<form class="form-inline flex-center">
<div class="md-form" style="padding-left: 2%;">
<input name="group2" type="radio" class="with-gap" id="Newparrain" value="Newparrain" (click)="initParSelect()" [(ngModel)]="radioParrain">
@ -36,11 +36,11 @@
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Familyname" [(ngModel)]="parrain.familyname" placeholder="Family name">
<input type="text" id="orangeForm-Familyname" [(ngModel)]="parrain.familyname" placeholder="Nom de famille">
</div>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Firstname" [(ngModel)]="parrain.firstname" placeholder="Firstname">
<input type="text" id="orangeForm-Firstname" [(ngModel)]="parrain.firstname" placeholder="Prénom">
</div>
<form class="form-inline">
<div class="md-form">
@ -55,7 +55,7 @@
</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="minDateTimeTest" max="maxDateTimeTest" name="birthday" #birthday="ngModel">
<input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Date de naissance" 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>
@ -64,7 +64,7 @@
<i class="fa fa-envelope prefix grey-text"></i>
<input type="email" id="orangeForm-email" [(ngModel)]="parrain.email" placeholder="Email" name="email" required pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$" #email="ngModel">
<div *ngIf="email.errors && email.errors.pattern && (email.dirty || email.touched)" class="alert alert-danger">
Email is required and format should be <strong><i>john@parrain.fr</i></strong>.
Votre <strong>email</strong> est requis et doit avoir ce format : <strong><i>john@parrain.fr</i></strong>.
</div>
</div>
<label>
@ -95,7 +95,7 @@
</div>
<div class="text-center" style="margin-top:5%">
<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>
<button class="btn btn-cyan" (click)="goToOpComm()">Retour</button>
</div>
</div>
<!-- Fin Si cest un nouveau parrain -->
@ -115,6 +115,7 @@
</div>
</div>
-->
<p>Vous avez selectionné: {{parSelect}}</p>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input
@ -132,9 +133,9 @@
<div class="md-form" style="padding-top:2%;">
<i class="fa fa-birthday-cake prefix grey-text"></i>
<input type="date" id="orangeForm-Birthday" [(ngModel)]="birthdayTemp" placeholder="Birthday" name="birthday" #birthday="ngModel">
<input type="date" id="orangeForm-Birthday" [(ngModel)]="birthdayTemp" placeholder="Date de naissance" name="birthday" #birthday="ngModel">
<div *ngIf="(birthdayTemp !== parrain.birthday) && (birthday.dirty || birthday.touched)" class="alert alert-danger">
Birthday is required and it should be the same of <strong><i>{{parrain.firstname}} {{parrain.familyname}}</i></strong>.
La date de naissance doit être la même que celle de <strong><i>{{parrain.firstname}} {{parrain.familyname}}</i></strong>.
</div>
</div>
@ -166,7 +167,7 @@
</div>
<div class="text-center" style="margin-top:5%">
<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>
<button class="btn btn-cyan" (click)="goToOpComm()">Retour</button>
</div>
</div>

@ -74,7 +74,7 @@
<!-- Si cest un filleul existant -->
<div *ngIf="true">
<p>{{filleulSelect}}</p>
<p>Vous avez selectionné: {{filleulSelect}}</p>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input
@ -105,8 +105,8 @@
données, y compris notre Utilisation des cookies.
</label>
<div class="text-center" style="margin-top:5%">
<button class="btn btn-light-green waves-light" [disabled]="filleulSelect === ''" (click)="scanCarteFil()">Scanner Carte du filleul</button>
<button class="btn btn-cyan" (click)="goToOpComm()">Back</button>
<button class="btn btn-light-green waves-light" [disabled]="filleulSelect === ''" (click)="scanCarteFil()">Scanner Carte du filleul {{filleulSelect}}</button>
<button class="btn btn-cyan" (click)="goToOpComm()">Retour</button>
</div>
</div>
<!-- Fin Si cest un filleul existant -->
@ -117,7 +117,7 @@
<hr>
<div class="card col-md-12 wow fadeInLeft" id="scanPart2">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Liste de vos scans</h5>
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Liste des scans</h5>
<div class="row">
<!--Grid column-->
<!--*ngFor="let scan of scanList | async"-->
@ -137,10 +137,9 @@
<!--Card content-->
<div class="card-body text-center">
<p class="card-text mr-2 ml-2">Scan ID: {{scan.uid}}</p>
<p class="card-text mr-2 ml-2">Carte Parrain ID: {{scan.carteParrainID}}</p>
<p class="card-text mr-2 ml-2">Carte Filleul ID: {{scan.carteFilleulID}}</p>
<p class="card-text mr-2 ml-2">Valeur Parrain: {{scan.valeurParrain}}</p>
<p class="card-text mr-2 ml-2">Valeur Filleul: {{scan.valeurFilleul}}</p>
<p class="card-text mr-2 ml-2">Carte ID: {{scan.carteParrainID}}</p>
<p class="card-text mr-2 ml-2">Valeur Parrain: {{scan.valeurParrain}} €</p>
<p class="card-text mr-2 ml-2">Valeur Filleul: {{scan.valeurFilleul}} €</p>
</div>
<!--/.Card content-->

@ -32,13 +32,11 @@
<div class="card-body">
<!--Name-->
<h4 class="card-title wow fadeInDown"><p>Salut {{localUser.firstname}} {{localUser.familyname}}</p></h4>
<h4 class="card-title wow fadeInDown"><p>{{localUser.firstname}} {{localUser.familyname}}</p></h4>
<hr>
<ul class="list-group wow fadeInLeft">
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Status :</label> {{localUser.status}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Email :</label> {{localUser.email}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Nom :</label> {{localUser.familyname}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Prénom :</label> {{localUser.firstname}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Sex :</label> {{localUser.sex}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Date de naissance :</label> {{localUser.birthday | date:'dd/MM/yyyy'}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Téléphone :</label> {{localUser.telephone}}</li>
@ -101,7 +99,7 @@
<div class="card-body">
<!--Name-->
<h4 class="card-title wow fadeInDown"><p>Salut {{localUser.commercialName}}</p></h4>
<h4 class="card-title wow fadeInDown"><p>{{localUser.commercialName}}</p></h4>
<hr>
<ul class="list-group wow fadeInLeft">

Loading…
Cancel
Save