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 fe446e7c9d c23e91aede
commit d9759312ee
4 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File

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

@ -52,7 +52,6 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy {
});
this.opCommDataRejeter = this.afDb.list('/OperationCommercial/',{
query: {
orderByChild: 'validationXJC',
@ -107,6 +106,9 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy {
// this.router.navigate(['/']);
}
}
ngOnDestroy() {}
ngOnDestroy() {
this.opCommDataEnCours = null;
this.opCommDataRejeter = null;
}
}

103
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>
<h5 class="wow fadeInDown"><label class="blue-text font-bold">Vous avez accumulé un total de :</label> {{this.admin.avantageCumule === '' ? '0' : this.admin.avantageCumule}} €</h5>
<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>-->
@ -21,66 +21,67 @@
</div>
<div class="list-group wow fadeInLeftBig">
<div class="card mainCard" *ngFor="let op of filteredOpCommercials">
<div class="row no-margin" id="testt">
<div class="col-md-6 d-flex flex-column " id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
<div *ngFor="let op of filteredOpCommercials">
<div class="card mainCard" *ngIf="(op.status != 'Bloqué')">
<div class="row no-margin" id="testt">
<div class="col-md-6 d-flex flex-column " id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block no-margin">
<div class="col-md-12 col-sm-12" id="subCard2Part1">
<div id="opTitle">
<label>Tarif XJC: {{op.tarifXJCParrain=== ''? '0' : op.tarifXJCParrain}} €</label>
<label>Operation Commerciale: {{op.name}}</label>
<label>Commercant: {{op.commercantOpCom.commercialName}}</label>
<div class="col-md-6 card subCard2">
<div class="card-block no-margin">
<div class="col-md-12 col-sm-12" id="subCard2Part1">
<div id="opTitle">
<label>Tarif XJC: {{op.tarifXJCParrain=== ''? '0' : op.tarifXJCParrain}} €</label>
<label>Operation Commerciale: {{op.name}}</label>
<label>Commercant: {{op.commercantOpCom.commercialName}}</label>
</div>
<div id="opAvantages">
<label>Avantage parrain: {{op.avantageParrain === ''? '0' : op.avantageParrain}} €</label>
<label>Avantage filleul: {{op.avantageFilleul === ''? '0' : op.avantageFilleul}} €</label>
</div>
<div id="opLogs">
<label>Carte(s) envoyée(s): {{op.nbEnvoie}}</label>
<label>Carte(s) scannée(s): {{op.nbScan}}</label>
<label>Carte(s) débitée(s): {{op.nbDebiter}}</label>
</div>
</div>
<div id="opAvantages">
<label>Avantage parrain: {{op.avantageParrain === ''? '0' : op.avantageParrain}} €</label>
<label>Avantage filleul: {{op.avantageFilleul === ''? '0' : op.avantageFilleul}} €</label>
<div class="btn-block d-flex flex-lg-row flex-md-column flex-sm-row" id="subCard2Part2">
<button class="btn btn-outline-default btn-rounded" (click)="bloquer(op.uid)">Bloquer</button>
<button class="btn btn-outline-info btn-rounded" (click)="goToCarteEnvoyer(op.uid)">Cartes</button>
<button class="btn btn-outline-info btn-rounded" (click)="goToScanEffectuer(op.uid)">Scans</button>
</div>
<div id="opLogs">
<label>Carte(s) envoyée(s): {{op.nbEnvoie}}</label>
<label>Carte(s) scannée(s): {{op.nbScan}}</label>
<label>Carte(s) débitée(s): {{op.nbDebiter}}</label>
</div>
</div>
<div class="btn-block d-flex flex-lg-row flex-md-column flex-sm-row" id="subCard2Part2">
<button class="btn btn-outline-default btn-rounded" (click)="bloquer(op.uid)">Bloquer</button>
<button class="btn btn-outline-info btn-rounded" (click)="goToCarteEnvoyer(op.uid)">Cartes</button>
<button class="btn btn-outline-info btn-rounded" (click)="goToScanEffectuer(op.uid)">Scans</button>
</div>
</div>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-check-square-o" aria-hidden="true"></i>Validation:
<label class="font-bold" *ngIf="op.validationXJC == 'Validé'" style="color:#00C851; margin-bottom: 0">{{op.validationXJC}}</label>
<label class="font-bold" *ngIf="op.validationXJC == 'En Cours'" style="color:#ffbb33; margin-bottom: 0">{{op.validationXJC}}</label>
<label class="font-bold" *ngIf="op.validationXJC == 'Rejeté'" style="color:#ff4444; margin-bottom: 0">{{op.validationXJC}}</label>
</li>
<li class="float-right" style="padding-right: 2%"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut:
<label class="font-bold" *ngIf="op.status == 'Active'" style="color:#00C851; margin-bottom: 0">{{op.status}}</label>
<label class="font-bold" *ngIf="op.status == 'Inactive'" style="color:#ffbb33; margin-bottom: 0">{{op.status}}</label>
<label class="font-bold" *ngIf="op.status == 'Bloqué'" style="color:#ff4444; margin-bottom: 0">{{op.status}}</label>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-check-square-o" aria-hidden="true"></i>Validation:
<label class="font-bold" *ngIf="op.validationXJC == 'Validé'" style="color:#00C851; margin-bottom: 0">{{op.validationXJC}}</label>
<label class="font-bold" *ngIf="op.validationXJC == 'En Cours'" style="color:#ffbb33; margin-bottom: 0">{{op.validationXJC}}</label>
<label class="font-bold" *ngIf="op.validationXJC == 'Rejeté'" style="color:#ff4444; margin-bottom: 0">{{op.validationXJC}}</label>
</li>
<li class="float-right" style="padding-right: 2%"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut:
<label class="font-bold" *ngIf="op.status == 'Active'" style="color:#00C851; margin-bottom: 0">{{op.status}}</label>
<label class="font-bold" *ngIf="op.status == 'Inactive'" style="color:#ffbb33; margin-bottom: 0">{{op.status}}</label>
<label class="font-bold" *ngIf="op.status == 'Bloqué'" style="color:#ff4444; margin-bottom: 0">{{op.status}}</label>
</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
<!-- Card footer -->
</div>
</div>
</div>

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

@ -28,11 +28,11 @@
</div>
<div class="md-form">
<i class="fa fa-euro prefix grey-text"></i>
<input type="number" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageParrain" placeholder="Avantage parrain" step="any" style="margin-left: 5%;">
<input type="number" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageParrain" placeholder="Avantage parrain" step="any">
</div>
<div class="md-form">
<i class="fa fa-euro prefix grey-text"></i>
<input type="number" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageFilleul" placeholder="Avantage filleul" step="any" style="margin-left: 5%;">
<input type="number" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageFilleul" placeholder="Avantage filleul" step="any">
</div>
</div>

2
src/app/components/opCommercial/debiter-carte/debiter-carte.component.html
Unescape Escape View File

@ -33,7 +33,7 @@
<div class="md-form">
<i class="fa fa-euro prefix grey-text"></i>
<input type="text" id="orangeForm-Familyname" [(ngModel)]="valeurRecup" placeholder="Combien le parrain souhaite utiliser ?" style="margin-left: 5%" ><!--[(ngModel)]="filleul.idCard"-->
<input type="text" id="orangeForm-ValeurRecup" [(ngModel)]="valeurRecup" placeholder="Combien le parrain souhaite utiliser ?"><!--[(ngModel)]="filleul.idCard"-->
</div>
<!--
<div class="md-form">

Write Preview
Loading…
Cancel
Save