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

status carte v1

Browse Source
thierry
Tmadkaud 7 years ago
parent 277040a8ea
commit d3ee852898
5 changed files with 74 additions and 15 deletions
Show Stats Download Patch File Download Diff File

1
src/app/components/carteParrainage/carte-envoyer/carte-envoyer.component.html
Unescape Escape View File

@ -14,6 +14,7 @@
<div class="card-block row">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>Status de la carte: {{crt.status}}</label>
<label>Nom: {{crt.parrainCarte.familyname}}</label>
<label>Prénom: {{crt.parrainCarte.firstname}}</label>
<label>ID: {{crt.uid}}</label>

28
src/app/components/carteParrainage/carte-envoyer/carte-envoyer.component.ts
Unescape Escape View File

@ -10,6 +10,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 {CarteParrainage} from "../../../../models/CarteParrainage";
@Component({
selector: 'app-carte-envoyer',
@ -26,11 +27,12 @@ export class CarteEnvoyerComponent implements OnInit {
show: boolean = false;
i: number;
hideme = {};
databaseRef: any;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
this.hideme = {}; // init is required
this.databaseRef = firebase.database().ref();
this.user = afAuth.authState;
this.commercant = new Commercant();
this.user.subscribe(
@ -45,6 +47,13 @@ export class CarteEnvoyerComponent implements OnInit {
}
);
this.carteParData.forEach(crt => {
crt.forEach(crtElement => {
// this.commercant = crtElement;
this.updateCarteStatus(crtElement);
});
});
this.profileData = this.afDb.list('/' + auth.displayName + '/', {
query: {
orderByChild: 'uid',
@ -74,6 +83,23 @@ export class CarteEnvoyerComponent implements OnInit {
this.hideme[item.id] = true;
}
updateCarteStatus(maCarte: CarteParrainage){
var todayTemp = new Date(Date.now());
var debutTemp = new Date(maCarte.dateDebut);
var finTemp = new Date(maCarte.dateFin);
console.log('todayTemp: ' + todayTemp.getTime());
console.log('debutTemp: ' + debutTemp.getTime());
console.log('finTemp: ' + finTemp.getTime());
if (todayTemp.getTime() >= debutTemp.getTime() && todayTemp.getTime() <= finTemp.getTime()) {
maCarte.status = 'Active';
} else {
maCarte.status = 'Inactive';
}
const carteStatusRef = this.databaseRef.child('CarteParrainage').child(maCarte.uid.toString()).child('status');
carteStatusRef.set(maCarte.status);
}
ngOnInit() {
try {
this.user.subscribe(

1
src/app/components/carteParrainage/carte-parrainage/carte-parrainage.component.html
Unescape Escape View File

@ -24,6 +24,7 @@
</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>

23
src/app/components/carteParrainage/carte-parrainage/carte-parrainage.component.ts
Unescape Escape View File

@ -28,12 +28,15 @@ export class CarteParrainageComponent implements OnInit, OnDestroy {
commercant: Commercant;
carteParr: CarteParrainage;
carteParrData: FirebaseListObservable<any[]>;
// carteParrDataActif: FirebaseListObservable<any[]>;
// carteParrDataInactif: FirebaseListObservable<any[]>;
profileData: FirebaseListObservable<any[]>;
commList: FirebaseListObservable<any[]>;
databaseRef: any;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase, private router: Router) {
this.carteParr = new CarteParrainage();
this.databaseRef = firebase.database().ref();
this.user = afAuth.authState;
this.parrain = new Parrain();
@ -49,6 +52,7 @@ export class CarteParrainageComponent implements OnInit, OnDestroy {
);
this.carteParrData.forEach(car => {
car.forEach(elementCar => {
this.updateCarteStatus(elementCar);
this.commList = this.afDb.list('/Commercant/', {
query: {
orderByChild: 'uid',
@ -80,11 +84,28 @@ export class CarteParrainageComponent implements OnInit, OnDestroy {
this.parrain = element;
});
});
}
}
);
}
updateCarteStatus(maCarte: CarteParrainage){
var todayTemp = new Date(Date.now());
var debutTemp = new Date(maCarte.dateDebut);
var finTemp = new Date(maCarte.dateFin);
if (todayTemp.getTime() >= debutTemp.getTime() && todayTemp.getTime() <= finTemp.getTime()) {
maCarte.status = 'Active';
} else {
maCarte.status = 'Inactive';
}
const carteStatusRef = this.databaseRef.child('CarteParrainage').child(maCarte.uid.toString()).child('status');
carteStatusRef.set(maCarte.status);
}
ngOnInit() {
try {
this.user.subscribe(

36
src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.ts
Unescape Escape View File

@ -111,7 +111,17 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
this.cartePar.operationCommercialID = this.opComm.uid;
this.cartePar.dateDebut = this.opComm.dateDebut;
this.cartePar.dateFin = this.opComm.dateFin;
console.log('this.opComm.dateFin: ' + this.opComm.dateFin);
var todayTemp = new Date(Date.now());
var debutTemp = new Date(this.opComm.dateDebut);
var finTemp = new Date(this.opComm.dateFin);
if (todayTemp.getTime() >= debutTemp.getTime() && todayTemp.getTime() <= finTemp.getTime()) {
this.cartePar.status = 'Active';
} else {
this.cartePar.status = 'Inactive';
}
/*
var dateTest = this.opComm.dateFin.toString().split(/[- :]/);
this.cartePar.dateFin = new Date(Number(dateTest[0]), Number(dateTest[1]) - 1,
@ -131,7 +141,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
);
this.carteParList.forEach(carte => {
carte.forEach(elementCarte => {
console.log("elementCarte..parrainCarte.uid : " + elementCarte.parrainCarte.uid);
console.log('elementCarte..parrainCarte.uid : ' + elementCarte.parrainCarte.uid);
this.parrainAffList = this.afDb.list('/Parrain/', {
query: {
orderByChild: 'uid',
@ -147,7 +157,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
firstname : elementparAf.firstname,
familyname: elementparAf.familyname
});
console.log("elementparAf.firstname" + elementparAf.firstname);
console.log('elementparAf.firstname' + elementparAf.firstname);
});
});
});
@ -220,7 +230,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
}
getIdParrain(parUid) {
var parlistTemp = this.afDb.list('/Parrain/', {
const parlistTemp = this.afDb.list('/Parrain/', {
query: {
orderByChild: 'uid',
equalTo: parUid
@ -293,12 +303,12 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
useCORS: true,
logging: true,
onrendered: function (canvas) {
var context = canvas.getContext('2d');
var img = new Image();
const context = canvas.getContext('2d');
const img = new Image();
var offsets = document.getElementById('subCard1').getBoundingClientRect();
var imgTop = offsets.top;
var imgLeft = offsets.left;
const offsets = document.getElementById('subCard1').getBoundingClientRect();
const imgTop = offsets.top;
const imgLeft = offsets.left;
img.onload = function () {
context.drawImage(img, imgLeft, imgTop);
@ -310,15 +320,15 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
// document.body.appendChild(canvas);
console.log('avant blob');
canvas.toBlob(blob => {
var nouvelleImg = new Image();
let storageRef = firebase.storage().ref();
const nouvelleImg = new Image();
const storageRef = firebase.storage().ref();
nouvelleImg.setAttribute('crossOrigin', 'anonymous');
nouvelleImg.src = blob;
console.log('blob : ' + blob);
console.log('maCarteP.uid: ' + maCarteP.uid);
storageRef.child('CarteParrainage/' + maCarteP.uid + '/carteTemplate').put(blob).then((snapshot) => {
let updates = {};
const updates = {};
maCarteP.carteTemplate.path = 'CarteParrainage/' + maCarteP.uid + '/carteTemplate';
maCarteP.carteTemplate.filename = maCarteP.name;
maCarteP.carteTemplate.downloadURL = snapshot.downloadURL;
@ -361,7 +371,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
ngOnDestroy() {
this.validC = '';
if(this.subscription){
if (this.subscription){
this.subscription.unsubscribe();
}

Write Preview
Loading…
Cancel
Save