AnisB
/
XJC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
thierry
Viiciouss 7 years ago
parent 54fc4fdc79 acc91ab9c7
commit 1010360ee1
11 changed files with 64 additions and 13 deletions
Show Stats Download Patch File Download Diff File

2
src/app/components/admin/liste-op-commercial/liste-op-commercial.component.html
Unescape Escape View File

@ -13,7 +13,7 @@
<div class="col-md-12" id="listeOpPart1">
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Liste des operations commerciales ({{filteredOpCommercials?.length}})</h4>
<label>Vous avez accumulé un total de : {{this.admin.avantageCumule}} €</label>
<div class="btn-block flex-center align-middle" style="padding-top: 2%;">
<!--<button class="btn btn-primary btn-rounded waves-light" id="nouvelleOp" (click)="goToCreaOpCom()">Nouvelle opération Commerciale</button>-->
<!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarteEnvoyer()">Historique carte envoyer</button>-->

20
src/app/components/admin/liste-op-commercial/liste-op-commercial.component.ts
Unescape Escape View File

@ -11,6 +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';
import { Admin } from '../../../../models/Admin';
@Component({
selector: 'app-liste-op-commercial',
@ -25,14 +26,18 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
opCommDataValider: OperationCommerciale[];
opCommDataBloquer: FirebaseListObservable<any[]>;
profileData: FirebaseListObservable<any[]>;
adminData: FirebaseListObservable<any[]>;
admin: Admin;
commercant: Commercant;
databaseRef: any;
opCommercials: any;
filteredOpCommercials: any;
test: any;
filters = {};
avantageCumulerAdmin: string;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router) {
this.admin = new Admin();
this.opComm = new OperationCommerciale();
this.databaseRef = firebase.database().ref();
this.opCommDataValider = [];
@ -41,6 +46,21 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
this.user.subscribe(
(auth) => {
if (auth) {
// Admin
this.adminData = this.afDb.list('/Admin/', {
query: {
orderByChild: 'uid',
equalTo: auth.uid
}
}
);
this.adminData.forEach(avantage => {
avantage.forEach(elementavantage => {
this.admin = elementavantage;
console.log(this.admin.avantageCumule);
});
});
this.opCommDataBloquer = this.afDb.list('/OperationCommercial/',{
query: {

8
src/app/components/opCommercial/creation-op-com/creation-op-com.component.html
Unescape Escape View File

@ -7,16 +7,16 @@
<i class="fa fa-address-card prefix grey-text"></i>
<input type="text" id="orangeForm-Familyname" [(ngModel)]="opComm.name" placeholder="Name">
</div>
<div class="md-form">
<div class="md-form birthdayPar">
<i class="fa fa-calendar-check-o prefix grey-text"></i>
<input type="date" id="orangeForm-Date" [(ngModel)]="opComm.dateDebut" placeholder="Date debut" required min="minDateTimeTest" max="maxDateTimeTest" name="dateDeb" #dateDeb="ngModel">
<input type="date" id="orangeForm-Date" class="col-md-3" [(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 | date:'dd/MM/yyyy'}} et 01/01/2117</i></strong>.
</div>
</div>
<div class="md-form">
<div class="md-form birthdayPar">
<i class="fa fa-calendar-times-o prefix grey-text"></i>
<input type="date" id="orangeForm-Date" [(ngModel)]="opComm.dateFin" placeholder="Date fin" required min="minDateTimeTest" max="maxDateTimeTest" name="dateFin" #dateFin="ngModel">
<input type="date" id="orangeForm-Date" class="col-md-3" [(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>{{opComm.dateDebut | date:'dd/MM/yyyy'}} et 01/01/2117</i></strong>.
</div>

4
src/app/components/opCommercial/creation-op-com/creation-op-com.component.scss
Unescape Escape View File

@ -2,6 +2,10 @@
padding: 5%;
}
.birthdayPar {
display: flex;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;

8
src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.html
Unescape Escape View File

@ -55,9 +55,9 @@
<label for="femme">Femme</label>
</div>
</form>
<div class="md-form">
<div class="md-form birthdayPar">
<i class="fa fa-birthday-cake prefix grey-text"></i>
<input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Date de naissance" required min="minDateTimeTest" max="maxDateTimeTest" name="birthday" #birthday="ngModel">
<input type="date" id="orangeForm-Birthday" class="col-md-2" [(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>
@ -153,9 +153,9 @@
</div>
<div class="md-form">
<div class="md-form birthdayPar">
<i class="fa fa-birthday-cake prefix grey-text"></i>
<input type="date" id="orangeForm-Birthday" [(ngModel)]="birthdayTemp" placeholder="Date de naissance" name="birthday" #birthday="ngModel">
<input type="date" id="orangeForm-Birthday" class="col-md-2" [(ngModel)]="birthdayTemp" placeholder="Date de naissance" name="birthday" #birthday="ngModel">
<div *ngIf="(birthdayTemp !== parrain.birthday) && (birthday.dirty || birthday.touched)" class="alert alert-danger">
La date de naissance doit être la même que celle de <strong><i>{{parrain.firstname}} {{parrain.familyname}}</i></strong>.
</div>

4
src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.scss
Unescape Escape View File

@ -7,6 +7,10 @@
margin-bottom: 10vh;
}
.birthdayPar {
display: flex;
}
#subCard1 {
background-repeat: no-repeat;
background-size: 100%;

4
src/app/components/profil/edit-profil/edit-profil.component.html
Unescape Escape View File

@ -90,9 +90,9 @@
<input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Birthday">
</div>
-->
<div class="md-form">
<div class="md-form birthdayPar">
<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" class="col-md-4" [(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>

4
src/app/components/profil/edit-profil/edit-profil.component.scss
Unescape Escape View File

@ -2,6 +2,10 @@
padding-top: 10%;
}
.birthdayPar {
display: flex;
}
.inputfile {
width: 0.1px;
height: 0.1px;

4
src/app/components/register/register.component.html
Unescape Escape View File

@ -42,9 +42,9 @@
</div>
</form>
<div class="md-form">
<div class="md-form birthdayPar">
<i class="fa fa-birthday-cake prefix grey-text"></i>
<input type="date" id="orangeForm-Birthday" [(ngModel)]="parrain.birthday" placeholder="Date de naissance" required min="minDateTimeTest" max="maxDateTimeTest" name="birthday" #birthday="ngModel">
<input type="date" id="orangeForm-Birthday" class="col-md-2" [(ngModel)]="parrain.birthday" placeholder="Date de naissance" required min="minDateTimeTest" max="maxDateTimeTest" name="birthday" #birthday="ngModel">
<div *ngIf="(validationBirthdayParrain()) && (birthday.dirty || birthday.touched)" class="alert alert-danger">
Votre date de naissance doit être comprise entre <strong><i>01/01/1917 et 01/01/2117</i></strong>.
</div>

4
src/app/components/register/register.component.scss
Unescape Escape View File

@ -2,6 +2,10 @@
padding: 5%;
}
.birthdayPar {
display: flex;
}
.inputfile {
width: 0.1px;
height: 0.1px;

15
src/models/Admin.ts
Unescape Escape View File

@ -0,0 +1,15 @@
import { FireImg } from './FireImg';
export class Admin
{
uid: string;
avantageCumule: string;
email: string;
status: string;
constructor() {
this.uid = '';
this.avantageCumule = '';
this.email = '';
this.status = '';
}
}
Write Preview
Loading…
Cancel
Save