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

admin demande de validation v1

Browse Source
thierry
Tmadkaud 7 years ago
parent 62f113971b
commit db7fa6e403
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File

11
src/app/components/admin/demande-op-commercial/demande-op-commercial.component.html
Unescape Escape View File

@ -40,8 +40,8 @@
</div>
</div>
<div class="col-md-2" id="subCard2Part2">
<button type="button" class="btn btn-success btn-rounded waves-light" mdbRippleRadius>Valider</button>
<button type="button" class="btn btn-danger btn-rounded waves-light" mdbRippleRadius>Rejeter</button>
<button type="button" class="btn btn-success btn-rounded waves-light" mdbRippleRadius (click)="valider(op.uid)">Valider</button>
<button type="button" class="btn btn-danger btn-rounded waves-light" mdbRippleRadius (click)="rejeter(op.uid)">Rejeter</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
@ -59,7 +59,7 @@
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Historique des cartes rejeter</h4>
<div class="list-group">
<div class="card mainCard" *ngFor="let op of opCommDataBloquer | async">
<div class="card mainCard" *ngFor="let op of opCommDataRejeter | async">
<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">
@ -80,6 +80,7 @@
<div class="card-block row">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{op.validationXJC}}</label>
<label>Operation Commerciale: {{op.name}}</label>
</div>
<div id="opAvantages">
@ -93,9 +94,7 @@
</div>
</div>
<div class="col-md-2" id="subCard2Part2">
<button class="btn btn-outline-primary btn-rounded">Envoyer</button>
<button class="btn btn-outline-default btn-rounded">Scanner</button>
<button class="btn btn-outline-info btn-rounded">Débiter</button>
<button class="btn btn-outline-primary btn-rounded" (click)="valider(op.uid)">Valider</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">

18
src/app/components/admin/demande-op-commercial/demande-op-commercial.component.ts
Unescape Escape View File

@ -21,7 +21,7 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy {
opComm: OperationCommerciale;
user: Observable<firebase.User>;
opCommDataEnCours: FirebaseListObservable<any[]>;
opCommDataBloquer: FirebaseListObservable<any[]>;
opCommDataRejeter: FirebaseListObservable<any[]>;
profileData: FirebaseListObservable<any[]>;
commercant: Commercant;
databaseRef: any;
@ -43,10 +43,10 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy {
}
}).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
this.opCommDataBloquer = this.afDb.list('/OperationCommercial/',{
this.opCommDataRejeter = this.afDb.list('/OperationCommercial/',{
query: {
orderByChild: 'validationXJC',
equalTo: 'Rejeté'
equalTo: 'rejeté'
}
}).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
}
@ -54,14 +54,14 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy {
}
);
}
rejeter(){
const opEnvRef = this.databaseRef.child('OperationCommercial').child('validationXJC');
opEnvRef.set('Rejeté');
rejeter(uidRejeter: string){
const opEnvRef = this.databaseRef.child('OperationCommercial').child(uidRejeter).child('validationXJC');
opEnvRef.set('rejeté');
}
valider(){
const opEnvRef = this.databaseRef.child('OperationCommercial').child('validationXJC');
opEnvRef.set('Validé');
valider(uidValider: string){
const opEnvRef = this.databaseRef.child('OperationCommercial').child(uidValider).child('validationXJC');
opEnvRef.set('validé');
}
ngOnInit() {

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

@ -39,6 +39,7 @@
<div class="card-block row">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{op.validationXJC}}</label>
<label>Operation Commerciale: {{op.name}}</label>
</div>
<div id="opAvantages">

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

@ -35,14 +35,18 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
(auth) => {
// console.log("afAuth.authState : " + auth.toJSON());
if (auth) {
this.opCommData = this.afDb.list('/OperationCommercial/').map((array) => array.reverse()) as FirebaseListObservable<any[]>;
this.opCommData = this.afDb.list('/OperationCommercial/',{
query: {
orderByChild: 'validationXJC',
equalTo: 'validé'
}
}).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
}
console.log(auth.uid);
}
);
}
ngOnInit() {
try {
this.user.subscribe(

6
src/app/components/opCommercial/op-commercial/op-commercial.component.html
Unescape Escape View File

@ -54,9 +54,9 @@
</div>
</div>
<div class="col-md-2" id="subCard2Part2">
<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-primary btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'rejeté') || (op.validationXJC === 'bloqué')" (click)="goToEnCart(op.uid)">Envoyer</button>
<button class="btn btn-outline-default btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'rejeté') || (op.validationXJC === 'bloqué')" (click)="goToScanCart(op.uid)">Scanner</button>
<button class="btn btn-outline-info btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'rejeté') || (op.validationXJC === 'bloqué')" (click)="goToDebiterCart(op.uid)">Débiter</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">

Write Preview
Loading…
Cancel
Save