liste carte envoyer ok liste scan en cours

thierry
Tmadkaud 7 years ago
parent 7eb759fb45
commit d06f9c1796

@ -33,6 +33,6 @@ export const AppRoutes = [
{path: 'historiqueCarte', component: CarteEnvoyerComponent, canActivate: [AuthGuard]},
{path: 'listOpCommercialAdmin', component: ListeOpCommercialComponent, canActivate: [AuthGuard]},
{path: 'demandeOpCommercialAdmin', component: DemandeOpCommercialComponent, canActivate: [AuthGuard]},
{path: 'ListCarteEnvoyerAdmin', component: ListCarteEnvoyerComponent, canActivate: [AuthGuard]},
{path: 'ListScanEffecterAdmin', component: ListScanEffecterComponent, canActivate: [AuthGuard]}
{path: 'ListCarteEnvoyerAdmin/:idOp', component: ListCarteEnvoyerComponent, canActivate: [AuthGuard]},
{path: 'ListScanEffecterAdmin/:idOp', component: ListScanEffecterComponent, canActivate: [AuthGuard]}
];

@ -1,39 +1,85 @@
<app-nav-admin></app-nav-admin>
<div class="container" style="padding-top:5%">
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste de vos cartes de parrainage</h4>
<div class="list-group">
<div class="card mainCard" *ngFor="let crt of carteParrData | async">
<div class="row">
<img class="col-md-6 card-image mb-1 subCard1" src={{crt.carteTemplate.downloadURL}}>
<!--<div class="col-md-6 card-image mb-1 subCard1" [ngStyle]="{ 'background-image': 'url(' + crt.carteTemplate.downloadURL + ')'}">
<div class="col-md-12">
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Apercu de votre opération commerciale</h4>
<div class="card mainCard">
<div class="row" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{opComm?.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="row firstRow">
<div *ngIf="commercant !== undefined" >
<div class="col-md-6 flex-center card-block cardPart1"></div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2">
<p></p>
</div>
<div class="col-md-6 flex-center card-block cardPart1">{{opComm?.commercantOpCom.commercialName}}</div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + opComm?.commercantOpCom.image.downloadURL + ')'}">
</div>
</div>
<div class="row secondRow">
<div class="col-md-6 flex-center cardPart3"><p></p></div>
<div class="col-md-6 flex-center cardPart4"><p></p></div>
<div class="col-md-6 flex-center cardPart3"><p>{{opComm?.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{opComm?.uid}}</p></div>
</div>
</div>
</div>-->
</div>
<div class="col-md-6 card subCard2">
<label>Status de la carte: {{crt.status}}</label>
<label>date Debut: {{crt.dateDebut | date:'dd/MM/yyyy'}}</label>
<label>date Fin: {{crt.dateFin | date:'dd/MM/yyyy'}}</label>
<label>avantage Cumule: {{crt.avantageCumule}}</label>
<label>avantage Recuperer: {{crt.avantageRecuperer}}</label>
<label>ID de la carte: {{crt.uid}}</label>
<div class="card-block row">
<div class="col-md-12" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{opComm?.validationXJC}}</label>
<label>Operation Commerciale: {{opComm?.name}}</label>
</div>
<div id="opAvantages">
<label>Avantage parrain: {{opComm?.avantageParrain}}</label>
<label>Avantage filleul: {{opComm?.avantageFilleul}}</label>
</div>
<div id="opLogs">
<label>Carte(s) envoyée(s): {{opComm?.nbEnvoie}}</label>
<label>Carte(s) scannée(s): {{opComm?.nbScan}}</label>
<label>Carte(s) débitée(s): {{opComm?.nbDebiter}}</label>
</div>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
<h100 class="float-right">Du {{opComm?.dateDebut | date:'dd/MM/yyyy'}} au {{opComm?.dateFin | date:'dd/MM/yyyy'}}</h100>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-12">
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste des cartes de parrainages issu de l'opération commerciale ci-dessus : {{opComm?.name}}</h4>
<div class="list-group">
<div class="card mainCard" *ngFor="let crt of carteParList | async">
<div class="row">
<img class="col-md-6 card-image mb-1 subCard1" src={{crt.carteTemplate.downloadURL}}>
<!--<div class="col-md-6 card-image mb-1 subCard1" [ngStyle]="{ 'background-image': 'url(' + crt.carteTemplate.downloadURL + ')'}">
<div class="view">
<div class="row firstRow">
<div *ngIf="commercant !== undefined" >
<div class="col-md-6 flex-center card-block cardPart1"></div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2">
<p></p>
</div>
</div>
</div>
<div class="row secondRow">
<div class="col-md-6 flex-center cardPart3"><p></p></div>
<div class="col-md-6 flex-center cardPart4"><p></p></div>
</div>
</div>
</div>-->
<div class="col-md-6 card subCard2">
<label>Status de la carte: {{crt.status}}</label>
<label>date Debut: {{crt.dateDebut | date:'dd/MM/yyyy'}}</label>
<label>date Fin: {{crt.dateFin | date:'dd/MM/yyyy'}}</label>
<label>avantage Cumule: {{crt.avantageCumule}}</label>
<label>avantage Recuperer: {{crt.avantageRecuperer}}</label>
<label>ID de la carte: {{crt.uid}}</label>
</div>
</div>
</div>
</div>
</div>
</div>

@ -1,3 +1,7 @@
.container {
padding-top:5%;
}
.mainCard {
margin-top: 5%;
width: 100%;
@ -44,3 +48,36 @@
.cardPart4 {
//background-color: yellow;
}
#subCard2Part1 {
padding-top: 5%;
display: flex;
flex-direction: column
}
#subCard2Part2 {
padding-top: 5%;
}
#subCard2Part3 {
padding-right: 5%;
padding-top: 0%;
padding-bottom: 1%;
}
#opTitle {
display: flex;
flex-direction: column
}
#opAvantages {
display: flex;
flex-direction: column;
padding-top: 2%;
}
#opLogs {
display: flex;
flex-direction: column;
padding-top: 5%;
}

@ -1,15 +1,60 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { OperationCommerciale } from '../../../../models/OperationCommerciale';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
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 { ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-list-carte-envoyer',
templateUrl: './list-carte-envoyer.component.html',
styleUrls: ['./list-carte-envoyer.component.scss']
styleUrls: ['./list-carte-envoyer.component.scss'],
providers: [AuthService, OpCommercialService]
})
export class ListCarteEnvoyerComponent implements OnInit {
export class ListCarteEnvoyerComponent implements OnInit, OnDestroy {
opComm: OperationCommerciale;
opCommList: FirebaseListObservable<any[]>;
carteParList: FirebaseListObservable<any[]>;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService,
private route: ActivatedRoute, private opComService: OpCommercialService) {
constructor() { }
this.route.params.subscribe(params => {
this.carteParList = this.afDb.list('/CarteParrainage/', {
query: {
orderByChild: 'operationCommercialID',
equalTo: params['idOp']
}
});
this.opCommList = this.afDb.list('/OperationCommercial/', {
query: {
orderByChild: 'uid',
equalTo: params['idOp']
}
});
this.opCommList.forEach(op => {
op.forEach(element => {
this.opComm = element;
});
});
/*this.opCommList.forEach(op => {
op.forEach(element => {
this.opComm = element;
});
});*/
});
}
ngOnInit() {
}
ngOnDestroy() {
}
}

@ -11,7 +11,7 @@
<button (click)="goToProfil()">Back</button>
-->
<app-nav-admin></app-nav-admin>
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste des cartes envoyées</h4>
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste des scans effectués</h4>
<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>-->
@ -19,10 +19,10 @@
</div>
<div class="list-group">
<div class="card mainCard" *ngFor="let op of opCommData | async">
<div class="card mainCard" *ngFor="let scan of ScanList | 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">
<img src="{{scan.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="row firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</div>

@ -1,15 +1,64 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { OperationCommerciale } from '../../../../models/OperationCommerciale';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
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 { ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-list-scan-effecter',
templateUrl: './list-scan-effecter.component.html',
styleUrls: ['./list-scan-effecter.component.scss']
styleUrls: ['./list-scan-effecter.component.scss'],
providers: [AuthService, OpCommercialService]
})
export class ListScanEffecterComponent implements OnInit {
export class ListScanEffecterComponent implements OnInit, OnDestroy {
constructor() { }
opComm: OperationCommerciale;
opCommList: FirebaseListObservable<any[]>;
ScanList: FirebaseListObservable<any[]>;
ngOnInit() {
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService,
private route: ActivatedRoute, private opComService: OpCommercialService) {
this.route.params.subscribe(params => {
this.opCommList = this.afDb.list('/OperationCommercial/', {
query: {
orderByChild: 'uid',
equalTo: params['idOp']
}
});
this.opCommList.forEach(op => {
op.forEach(element => {
this.opComm = element;
this.ScanList = this.afDb.list('/Scan/', {
query: {
orderByChild: 'operationCommercial/uid',
equalTo: params['idOp']
}
});
});
});
/*this.opCommList.forEach(op => {
op.forEach(element => {
this.opComm = element;
});
});*/
});
}
ngOnInit() {
}
ngOnDestroy() {
}
}

@ -59,8 +59,8 @@
<div class="col-md-2" id="subCard2Part2">
<button class="btn btn-outline-primary btn-rounded">Tarif</button>
<button class="btn btn-outline-default btn-rounded" (click)="bloquer(op.uid)">Bloquer</button>
<button class="btn btn-outline-info btn-rounded" (click)="goToCarteEnvoyer()">CrtEnv</button>
<button class="btn btn-outline-info btn-rounded" (click)="goToScanEffectuer()">Scans</button>
<button class="btn btn-outline-info btn-rounded" (click)="goToCarteEnvoyer(op.uid)">CrtEnv</button>
<button class="btn btn-outline-info btn-rounded" (click)="goToScanEffectuer(op.uid)">Scans</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">

@ -88,11 +88,11 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
);
}
goToCarteEnvoyer() {
this.router.navigate(['ListCarteEnvoyerAdmin']);
goToCarteEnvoyer(id: string) {
this.router.navigate(['ListCarteEnvoyerAdmin', id]);
}
goToScanEffectuer() {
this.router.navigate(['ListScanEffecterAdmin']);
goToScanEffectuer(id: string) {
this.router.navigate(['ListScanEffecterAdmin', id]);
}
applyFilters(listFiltrer: any, listAFiltrer: any) {
this.filteredOpCommercials = _.filter(this.opCommercials, _.conforms(this.filters));

@ -167,6 +167,7 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
this.scan.dateCreation = new Date (Date.now());
this.scan.carteParrainID = this.filleul.idCard;
this.scan.carteFilleulID = this.filleul.idCard;
this.scan.operationCommercial = this.opComm;
console.log(Date.now());
this.scan.valeurParrain = this.opComm.avantageParrain;
this.scan.valeurFilleul = this.opComm.avantageFilleul;
@ -295,7 +296,8 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
dateCreation: new Date(),
valeurParrain: '',
valeurFilleul: '',
type: ''
type: '',
operationCommercial: new OperationCommerciale()
};
}
}

@ -1,4 +1,5 @@
//nouvelle operation commercial / nouvelle carte
import { OperationCommerciale } from './OperationCommerciale';
export class Scan
{
uid: string;
@ -8,6 +9,7 @@ export class Scan
valeurParrain: string;
valeurFilleul: string;
type: string;
operationCommercial: OperationCommerciale;
constructor() {
@ -18,6 +20,7 @@ export class Scan
this.valeurParrain = '';
this.valeurFilleul = '';
this.type = '';
this.operationCommercial = new OperationCommerciale();
}
/*
addParrain(addStatus, addEmail, addFamilyname, addFirstname) {

Loading…
Cancel
Save