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

clean du code ts

Browse Source
thierry
Tmadkaud 7 years ago
parent 06134e1f3a
commit 0c19a798d7
24 changed files with 91 additions and 953 deletions
Show Stats Download Patch File Download Diff File

8
database.rules.json
Unescape Escape View File

@ -1,6 +1,12 @@
{
"rules": {
".read": true,
".write": true
".write": true,
"Admin": { ".indexOn": ["avantageCumule"] },
"Commercant": { ".indexOn": ["uid", "email"] },
"Parrain": { ".indexOn": ["uid", "email"] },
"OperationCommercial": { ".indexOn": ["uid", "validationXJC", "status", "commercantOpCom/uid"] },
"CarteParrainage": { ".indexOn": ["uid", "operationCommercialCarte/uid", "commercantCarte/uid", "parrainCarte/uid"] },
"Scan": { ".indexOn": ["uid", "operationCommercial/uid"] }
}
}

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

@ -1,9 +1,8 @@
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 { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
@ -27,10 +26,8 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy {
commercant: Commercant;
databaseRef: any;
tarifXJCParr: number;
tailleOpEncour: number;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService,
private opComService: OpCommercialService, private toastrService: ToastrService) {
private toastrService: ToastrService) {
this.opComm = new OperationCommerciale();
this.databaseRef = firebase.database().ref();
this.user = afAuth.authState;
@ -38,7 +35,6 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy {
this.tarifXJCParr = 0;
this.user.subscribe(
(auth) => {
// console.log("afAuth.authState : " + auth.toJSON());
if (auth) {
this.opCommDataEnCours = this.afDb.list('/OperationCommercial/',{
@ -52,7 +48,6 @@ export class DemandeOpCommercialComponent implements OnInit, OnDestroy {
.orderByChild('validationXJC')
.equalTo('En Cours')
.on('child_added', (child) => {
console.log('iiiii' + child);
this.toastrService.info("Nouvelle demande d'opération commerciale" );
});

20
src/app/components/admin/list-carte-envoyer/list-carte-envoyer.component.ts
Unescape Escape View File

@ -1,15 +1,12 @@
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 { AngularFireDatabase, FirebaseListObservable } 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';
@ -25,8 +22,7 @@ export class ListCarteEnvoyerComponent implements OnInit, OnDestroy {
carteParList: FirebaseListObservable<any[]>;
hideme = {};
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService,
private route: ActivatedRoute, private opComService: OpCommercialService) {
private router: Router, private route: ActivatedRoute) {
this.hideme = {}; // init is required
this.route.params.subscribe(params => {
@ -47,19 +43,7 @@ export class ListCarteEnvoyerComponent implements OnInit, OnDestroy {
this.opComm = element;
});
});
/*this.opCommList.forEach(op => {
op.forEach(element => {
this.opComm = element;
});
});*/
});
}
showDetails(item){
Object.keys(this.hideme).forEach(h => {
this.hideme[h] = false;
});
this.hideme[item.id] = true;
}
goToOpComAdmin(){

15
src/app/components/admin/list-scan-effecter/list-scan-effecter.component.ts
Unescape Escape View File

@ -1,15 +1,12 @@
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 { AngularFireDatabase, FirebaseListObservable } 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({
@ -25,8 +22,7 @@ export class ListScanEffecterComponent implements OnInit, OnDestroy {
scanList: FirebaseListObservable<any[]>;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService,
private route: ActivatedRoute, private opComService: OpCommercialService) {
private router: Router, private route: ActivatedRoute) {
this.route.params.subscribe(params => {
this.opCommList = this.afDb.list('/OperationCommercial/', {
@ -49,15 +45,10 @@ export class ListScanEffecterComponent implements OnInit, OnDestroy {
});
});
/*this.opCommList.forEach(op => {
op.forEach(element => {
this.opComm = element;
});
});*/
});
}
goToOpComAdmin(){
goToOpComAdmin() {
this.router.navigate(['/listOpCommercialAdmin']);
}

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

@ -3,7 +3,7 @@ import { Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { OperationCommerciale } from '../../../../models/OperationCommerciale';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import * as _ from 'lodash';
@ -32,7 +32,7 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
test: any;
filters = {};
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
private router: Router) {
this.opComm = new OperationCommerciale();
this.databaseRef = firebase.database().ref();
this.opCommDataValider = [];
@ -40,17 +40,8 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
this.commercant = new Commercant();
this.user.subscribe(
(auth) => {
// console.log("afAuth.authState : " + auth.toJSON());
if (auth) {
/*this.opCommData = this.afDb.list('/OperationCommercial/',{
query: {
orderByChild: 'validationXJC',
equalTo: 'validé'
}
}).map((array) => array.filter(opCoVal => opCoVal.status !== 'bloqué')) as FirebaseListObservable<any[]>;
*/
console.log('yyyyyyyyyy');
this.opCommDataBloquer = this.afDb.list('/OperationCommercial/',{
query: {
orderByChild: 'status',
@ -67,43 +58,7 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
this.opCommercials = opComs;
this.applyFilters(this.filteredOpCommercials, this.opCommercials);
this.filterDifferentDe('status', 'Bloqué');
console.log(opComs);
console.log(this.opCommercials);
console.log(this.filteredOpCommercials);
console.log('ttttttttttttt');
});
/*
this.test = this.afDb.list('/OperationCommercial/')
.subscribe(opComs => {
this.opCommercials = opComs;
this.applyFilters(this.filteredOpCommercials, this.opCommercials);
this.filterEgual('validationXJC', 'Validé');
this.applyFilters(this.filteredOpCommercials, this.opCommercials);
//this.filterDifferentDe('status', 'Bloqué');
//this.applyFilters(this.filteredOpCommercials, this.opCommercials);
console.log(opComs);
console.log(this.opCommercials);
console.log(this.filteredOpCommercials);
console.log('ttttttttttttt');
});
*/
/*_jobs => _jobs.filter(job => job.price > price)
this.opCommData.forEach(opval => {
opval.forEach(opvalElement => {
console.log('opvalElement.status: ' + opvalElement.status);
if (opvalElement.status !== 'bloqué') {
this.opCommDataValider.push(opvalElement);
}else if (opvalElement.status === 'bloqué') {
this.opCommDataValider.splice(opvalElement);
}
});
});*/
}
}
);
@ -127,7 +82,7 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
this.filters[property] = val => val !== query;
}
bloquer(uidRejeter: string){
bloquer(uidRejeter: string) {
const opEnvRef = this.databaseRef.child('OperationCommercial').child(uidRejeter).child('status');
opEnvRef.set('Bloqué');
}
@ -138,10 +93,6 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
var debutTemp = new Date(opDebloquer.dateDebut);
var finTemp = new Date(opDebloquer.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()) {
opDebloquer.status = 'Active';
opDebloquer.validationXJC = 'Validé';
@ -153,19 +104,6 @@ export class ListeOpCommercialComponent implements OnInit, OnDestroy {
opDebloquerRef.set(opDebloquer.status);
}
carteEnvoyer(op: OperationCommerciale){
this.opCommData = this.afDb.list('/CarteParrainage/',{
query: {
orderByChild: 'operationCommercialCarte/uid',
equalTo: op.uid
}
}).map((array) => array.reverse()) as FirebaseListObservable<any[]>;
}
scanEffectuer(opDebloquer: OperationCommerciale){
}
ngOnInit() {
try {
this.user.subscribe(

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

@ -2,15 +2,13 @@ import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { OperationCommerciale } from '../../../../models/OperationCommerciale';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } 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 {CarteParrainage} from '../../../../models/CarteParrainage';
@Component({
selector: 'app-carte-envoyer',
@ -22,7 +20,6 @@ export class CarteEnvoyerComponent implements OnInit {
user: Observable<firebase.User>;
carteParData: FirebaseListObservable<any[]>;
profileData: FirebaseListObservable<any[]>;
// Cas2Image: Observable<Canvas2Image>;
commercant: Commercant;
show: boolean = false;
i: number;
@ -30,7 +27,7 @@ export class CarteEnvoyerComponent implements OnInit {
databaseRef: any;
statutAffiche: string;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
private router: Router) {
this.hideme = {}; // init is required
this.statutAffiche = 'Toutes';
this.databaseRef = firebase.database().ref();
@ -39,7 +36,6 @@ export class CarteEnvoyerComponent implements OnInit {
this.user.subscribe(
(auth) => {
// console.log("afAuth.authState : " + auth.toJSON());
if (auth) {
this.carteParData = this.afDb.list('/CarteParrainage/', {
query: {
@ -49,13 +45,6 @@ export class CarteEnvoyerComponent implements OnInit {
}
).map((array) => array.reverse()) as FirebaseListObservable<any[]>;;
this.carteParData.forEach(crt => {
crt.forEach(crtElement => {
// this.commercant = crtElement;
//this.updateCarteStatus(crtElement);
});
});
this.profileData = this.afDb.list('/' + auth.displayName + '/', {
query: {
orderByChild: 'uid',
@ -73,38 +62,10 @@ export class CarteEnvoyerComponent implements OnInit {
);
}
activeCarte(afficheStatus: string){
activeCarte(afficheStatus: string) {
this.statutAffiche = afficheStatus;
}
goToOpCom(){
this.router.navigate(['/opCommercial']);
}
showDetails(item){
Object.keys(this.hideme).forEach(h => {
this.hideme[h] = false;
});
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(
@ -118,7 +79,7 @@ export class CarteEnvoyerComponent implements OnInit {
} catch (e) {
// No content response..
console.log(e);
//this.router.navigate(['/']);
// this.router.navigate(['/']);
}
}

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

@ -1,11 +1,9 @@
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 { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
@ -28,15 +26,13 @@ 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;
statutAffiche: string;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private opComService: OpCommercialService) {
private router: Router) {
this.carteParr = new CarteParrainage();
this.databaseRef = firebase.database().ref();
this.user = afAuth.authState;
@ -73,9 +69,6 @@ export class CarteParrainageComponent implements OnInit, OnDestroy {
});
});
this.profileData = this.afDb.list('/' + auth.displayName + '/', {
query: {
orderByChild: 'uid',
@ -99,21 +92,6 @@ export class CarteParrainageComponent implements OnInit, OnDestroy {
this.statutAffiche = afficheStatus;
}
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(
@ -130,8 +108,5 @@ export class CarteParrainageComponent implements OnInit, OnDestroy {
// this.router.navigate(['/']);
}
}
goToProfil(){
this.router.navigate(['/profil']);
}
ngOnDestroy() {}
}

7
src/app/components/home/home.component.ts
Unescape Escape View File

@ -1,9 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { FormsModule } from '@angular/forms';
import { Router } from '@angular/router';
import { HomeService } from '../../services/home/home.service';
import { OpCommercialService } from '../../services/opCommercial/op-commercial.service';
@ -41,9 +38,7 @@ export class HomeComponent implements OnInit {
this.loadComponentLogin = !this.loadComponentLogin;
this.loadComponentRegister = false;
}
loadHomeComponent() {
this.router.navigate(['/']);
}
ngOnInit() {
firebase.auth().signOut();
}

15
src/app/components/home/reset-password/reset-password.component.ts
Unescape Escape View File

@ -15,24 +15,13 @@ export class ResetPasswordComponent implements OnInit, OnDestroy {
emailExist: boolean;
profileDataParrainEmail: FirebaseListObservable<any[]>;
profileDataCommercantEmail: FirebaseListObservable<any[]>;
constructor(private router: Router, private afDb: AngularFireDatabase, private authService: AuthService) {
constructor(private router: Router, private afDb: AngularFireDatabase) {
this.email = '';
}
/*
keyDownFunction(event) {
if(event.keyCode === 13) {
console.log('you just clicked enter');
// rest of your code
if (this.email !== ''){
this.resetPass();
}
}
}*/
resetPass() {
if (this.email !== '') {
console.log(this.emailExist);
this.verifEmail(this.email);
console.log(this.emailExist);
}
}

25
src/app/components/login/login.component.ts
Unescape Escape View File

@ -1,17 +1,14 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { FormsModule } from '@angular/forms';
import { LoginService } from '../../services/login/login.service';
import { User } from '../../../models/User';
import { Parrain } from '../../../models/Parrain';
import { Commercant } from '../../../models/Commercant';
import { FireImg } from '../../../models/FireImg';
import {forEach} from "@angular/router/src/utils/collection";
import { AuthService } from '../../services/auth/auth.service';
@Component({
@ -38,33 +35,25 @@ export class LoginComponent implements OnInit, OnDestroy {
this.myUser = new User();
}
keyDownFunction(event) {
if(event.keyCode === 13) {
console.log('you just clicked enter');
if (event.keyCode === 13) {
// rest of your code
if(this.email !== '' && this.password !== ''){
if (this.email !== '' && this.password !== '') {
this.login();
}
}
}
login() {
try{
var tto = this.authService.signIn(this.email, this.password).catch(e => this.echecLogin = true);
console.log('iiiiiiiii' + tto);
}catch (e){
console.log('iiiiiiiii');
try {
this.authService.signIn(this.email, this.password).catch(e => this.echecLogin = true);
}catch (e) {
console.log(e);
}
}
loadHomeComponent() {
this.router.navigate(['/']);
}
loadResetPasswordComponent() {
this.router.navigate(['/ResetPassword']);
}
loadRegisterComponent() {
this.router.navigate(['/register']);
}
ngOnInit() {

6
src/app/components/navigationBar/nav-admin/nav-admin.component.ts
Unescape Escape View File

@ -1,10 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { AuthService } from '../../../services/auth/auth.service';
import { Observable } from 'rxjs/Observable';
import { Commercant } from '../../../../models/Commercant';
import { Router } from '@angular/router';
@ -15,9 +14,7 @@ import { Router } from '@angular/router';
})
export class NavAdminComponent implements OnInit {
user: Observable<firebase.User>;
localUser: any;
profileData: FirebaseListObservable<any[]>;
imageProfil: string;
role: any;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
@ -26,7 +23,6 @@ export class NavAdminComponent implements OnInit {
this.user.subscribe(
(auth) => {
if (auth) {
console.log(auth.displayName);
this.profileData = this.afDb.list('/' + auth.displayName + '/', {
query: {
orderByChild: 'uid',

7
src/app/components/navigationBar/nav-commercant/nav-commercant.component.ts
Unescape Escape View File

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { AuthService } from '../../../services/auth/auth.service';
@ -15,10 +15,8 @@ import { Router } from '@angular/router';
})
export class NavCommercantComponent implements OnInit {
user: Observable<firebase.User>;
localUser: any;
commercant: Commercant;
profileData: FirebaseListObservable<any[]>;
imageProfil: string;
role: any;
nameCommercant: string;
avatarCommercant: string;
@ -32,7 +30,6 @@ export class NavCommercantComponent implements OnInit {
this.user.subscribe(
(auth) => {
if (auth) {
console.log(auth.displayName);
this.profileData = this.afDb.list('/' + auth.displayName + '/', {
query: {
orderByChild: 'uid',
@ -43,9 +40,7 @@ export class NavCommercantComponent implements OnInit {
this.profileData.forEach(utilisateur => {
utilisateur.forEach(element => {
this.commercant = element;
console.log(this.commercant.commercialName);
if (this.commercant !== undefined) {
console.log(this.commercant.image.downloadURL);
this.nameCommercant = this.commercant.commercialName;
this.avatarCommercant = this.commercant.image.downloadURL;
}

7
src/app/components/navigationBar/nav-parrain/nav-parrain.component.ts
Unescape Escape View File

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { AuthService } from '../../../services/auth/auth.service';
@ -16,10 +16,8 @@ import { Router } from '@angular/router';
export class NavParrainComponent implements OnInit {
user: Observable<firebase.User>;
localUser: any;
parrain: Parrain;
profileData: FirebaseListObservable<any[]>;
imageProfil: string;
role: any;
nameParrain: string;
avatarParrain: string;
@ -33,7 +31,6 @@ export class NavParrainComponent implements OnInit {
this.user.subscribe(
(auth) => {
if (auth) {
console.log(auth.displayName);
this.profileData = this.afDb.list('/' + auth.displayName + '/', {
query: {
orderByChild: 'uid',
@ -44,9 +41,7 @@ export class NavParrainComponent implements OnInit {
this.profileData.forEach(utilisateur => {
utilisateur.forEach(element => {
this.parrain = element;
console.log(this.parrain.firstname);
if (this.parrain !== undefined) {
console.log(this.parrain.image.downloadURL);
this.nameParrain = this.parrain.firstname;
this.avatarParrain = this.parrain.image.downloadURL;
}

15
src/app/components/navigationBar/navigationBar.component.ts
Unescape Escape View File

@ -1,12 +1,9 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { FormsModule } from '@angular/forms';
import { ProfilService } from '../../services/profil/profil.service';
import { User } from '../../../models/User';
import { Parrain } from '../../../models/Parrain';
import { Commercant } from '../../../models/Commercant';
import { AuthService } from '../../services/auth/auth.service';
@ -23,19 +20,15 @@ import { AuthService } from '../../services/auth/auth.service';
export class NavigationBarComponent implements OnInit, OnDestroy{
user: Observable<firebase.User>;
localUser: any;
parrain: Parrain;
commercant: Commercant;
profileData: FirebaseListObservable<any[]>;
navElement1: string;
navElement2: string;
navElement3: string;
afficheLogout: boolean;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService) {
//this.updateNavBar();
}
@ -45,25 +38,19 @@ export class NavigationBarComponent implements OnInit, OnDestroy{
this.navElement2 = 'Login';
firebase.auth().onAuthStateChanged(function(user) {
if (user) {
this.afficheLogout = true;
console.log('is signed in.');
if (user.displayName === 'Parrain') {
this.localUser = user;
this.navElement1 = 'Profil Parrain';
this.navElement2 = 'Logout Parrain';
console.log('parrain fct: ' + this.navElement1);
} else if (user.displayName === 'Commercant') {
this.localUser = user;
this.navElement1 = 'Profil Commercant';
this.navElement2 = 'Logout Commercant';
}
} else {
this.afficheLogout = false;
console.log('No user is signed in.');
// No user is signed in.
this.element1 = 'Register';
this.element2 = 'login';
console.log('fct dans home: ' + this.navElement1);
}
});

51
src/app/components/opCommercial/creation-op-com/creation-op-com.component.ts
Unescape Escape View File

@ -1,19 +1,14 @@
import { Component, OnInit, OnDestroy, Input } from '@angular/core';
import { Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { OperationCommerciale } from '../../../../models/OperationCommerciale';
// import { AngularFire, FirebaseListObservable } from 'angularfire2';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import { ToastrService } from '../../../typescripts/angular-bootstrap-md/pro';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { AuthService } from '../../../services/auth/auth.service';
import { AngularFireAuthModule } from 'angularfire2/auth';
import { OpCommercialService } from '../../../services/opCommercial/op-commercial.service';
import { FireImg } from '../../../../models/FireImg';
@ -28,13 +23,10 @@ import {Commercant} from '../../../../models/Commercant';
})
export class CreationOpComComponent implements OnInit, OnDestroy {
@Input() folder: string;
fileList: FirebaseListObservable<FireImg[]>;
// imageList: Observable<Image[]>;
opComm: OperationCommerciale;
// selectedFiles: FileList;
user: Observable<firebase.User>;
opCommData: FirebaseListObservable<any[]>;
@ -51,15 +43,14 @@ export class CreationOpComComponent implements OnInit, OnDestroy {
dateFinVal: boolean;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService,
private opComService: OpCommercialService, private toastrService: ToastrService) {
private router: Router, private opComService: OpCommercialService,
private toastrService: ToastrService) {
this.dateFinVal = false;
this.dateDebutVal = false;
this.opComm = new OperationCommerciale();
this.devise = 'euro';
this.devise2 = 'euro';
this.fileOpCom = true;
console.log(this.fileOpCom);
this.user = afAuth.authState;
this.minDateTimeTest = new Date('1917-01-01');
this.maxDateTimeTest = new Date('2117-01-01');
@ -68,11 +59,10 @@ export class CreationOpComComponent implements OnInit, OnDestroy {
this.todayDateTimeTest = new Date(Date.now());
}
fileOKOpCom(){
fileOKOpCom() {
this.fileOpCom = false;
}
creerOpComm() {
this.user.subscribe(
(auth) => {
if (auth) {
@ -85,17 +75,12 @@ export class CreationOpComComponent implements OnInit, OnDestroy {
);
this.opCommData.forEach(utilisateur => {
utilisateur.forEach(element => {
console.log('element.uid: ' + element.raisonSociale);
this.opComm.commercantOpCom = element;
this.opComm.status = 'Inactive';
// let file = this.selectedFiles.item(0);
// this.opComm.carteTemplate = file;
// this.upload();
this.opComm.nbScan = '';
this.opComm.nbEnvoie = '';
this.opComm.nbDebiter = '';
this.opComm.validationXJC = 'En Cours';
console.log('element.uid: ' + element.uid);
this.opComService.saveOpComm(element, this.opComm);
this.goToOpComm();
});
@ -110,7 +95,6 @@ export class CreationOpComComponent implements OnInit, OnDestroy {
this.debutDateTimeTest = new Date(this.opComm.dateDebut);
this.finDateTimeTest = new Date(this.opComm.dateFin);
this.todayDateTimeTest = new Date(Date.now());
//console.log(this.dateDebutVal);
this.todayDateTimeTest = new Date(this.todayDateTimeTest.getTime() - 100000000);
if (this.debutDateTimeTest.getTime() <= (this.todayDateTimeTest.getTime())
|| this.debutDateTimeTest.getTime() >= this.maxDateTimeTest.getTime()) {
@ -128,7 +112,6 @@ export class CreationOpComComponent implements OnInit, OnDestroy {
this.debutDateTimeTest = new Date(this.opComm.dateDebut);
this.finDateTimeTest = new Date(this.opComm.dateFin);
this.todayDateTimeTest = new Date(Date.now());
//console.log(this.dateFinVal);
if (this.finDateTimeTest.getTime() < this.debutDateTimeTest.getTime()
|| this.finDateTimeTest.getTime() >= this.maxDateTimeTest.getTime()) {
this.dateFinVal = true;
@ -168,32 +151,6 @@ export class CreationOpComComponent implements OnInit, OnDestroy {
goToOpComm() {
this.router.navigate(['/opCommercial']);
}
/*
ngOnChanges() {
console.log('new values for folder');
let storage = firebase.storage();
this.fileList = this.afDb.list(`/${this.folder}/images`);
console.log('Rendering all images in ', `/${this.folder}/images`)
this.imageList = this.fileList.map( itemList =>
itemList.map( item => {
var pathReference = storage.ref(item.path);
let result = {$key: item.$key, downloadURL: pathReference.getDownloadURL(), path: item.path, filename: item.filename};
console.log(result);
return result;
})
);
}
*/
/*
upload() {
this.opComService.upload();
}
*/
delete(image: FireImg){
this.opComService.delete(image);
}
ngOnDestroy() {
this.opComm = {

43
src/app/components/opCommercial/debiter-carte/debiter-carte.component.ts
Unescape Escape View File

@ -2,10 +2,9 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { FormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
import { User } from '../../../../models/User';
import { Parrain } from '../../../../models/Parrain';
@ -17,8 +16,6 @@ import { CarteParrainage } from '../../../../models/CarteParrainage';
import { OpCommercialService } from '../../../services/opCommercial/op-commercial.service';
import { Subscription } from 'rxjs/Subscription';
import { AuthService } from '../../../services/auth/auth.service';
import { Filleul } from '../../../../models/Filleul';
import { Scan } from '../../../../models/Scan';
import { ToastrService } from '../../../typescripts/angular-bootstrap-md/pro';
@ -39,18 +36,12 @@ export class DebiterCarteComponent implements OnInit, OnDestroy {
cartePar: CarteParrainage;
devise: string;
commList: FirebaseListObservable<any[]>;
opCommList: FirebaseListObservable<any[]>;
parrainExistList: FirebaseListObservable<any[]>;
parrainAffList: FirebaseListObservable<any[]>;
carteParList: FirebaseListObservable<any[]>;
filleulExistList: FirebaseListObservable<any[]>;
parSelect: string;
selectPar: boolean;
parrainAffListTemp = [];
databaseRef: any;
/////
parrainsTest: Parrain[];
filteredParrainsTest: any[];
subscription: Subscription;
@ -61,12 +52,10 @@ export class DebiterCarteComponent implements OnInit, OnDestroy {
valeurRecup: string;
filteredCartesTest: any[];
subscriptionCarte: Subscription;
//startAt = new Subject();
//endAt = new Subject();
/////
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService,
private opComService: OpCommercialService, private route: ActivatedRoute, private toastrService: ToastrService) {
private router: Router, private opComService: OpCommercialService,
private route: ActivatedRoute, private toastrService: ToastrService) {
this.radioParrain = '';
this.ParrainCarteSelect = '';
this.localUser = new User();
@ -122,20 +111,14 @@ export class DebiterCarteComponent implements OnInit, OnDestroy {
+ elementparC.firstname;
this.parrain = elementparC;
for(let i = 0; i < this.filteredCartesTest.length; i++){
console.log('this.filteredCartesTest[i].parrainCarte.uid'+this.filteredCartesTest[i].parrainCarte.uid);
console.log('this.parrain.uid'+this.parrain.uid);
if (this.filteredCartesTest[i].parrainCarte.uid === this.parrain.uid) {
// this.carteParSelected = this.filteredCartesTest[i];
console.log('succes id carte est: ' + this.filteredCartesTest[i].uid);
console.log('code: ' + this.filteredCartesTest[i].parrainCarte.secretCode);
console.log('succes le parrain de la carte est: ' + this.filteredCartesTest[i].parrainCarte.firstname);
this.cartePar = this.filteredCartesTest[i];
if (this.cartePar.historique === undefined) {
this.cartePar.historique = new Array();
}
this.parrain = this.filteredCartesTest[i].parrainCarte;
}else {
console.log('echec de la carte ! ');
console.log('Error');
}
}
}
@ -144,23 +127,16 @@ export class DebiterCarteComponent implements OnInit, OnDestroy {
}
debiterCarte() {
console.log('+this.cartePar.avantageCumule : ' + (+this.cartePar.avantageCumule));
console.log('+this.cartePar.avantageRecuperer : ' + (+this.cartePar.avantageRecuperer));
this.cartePar.avantageCumule = ((+this.cartePar.avantageCumule) - (+this.valeurRecup)).toString();
this.cartePar.avantageRecuperer = ((+this.cartePar.avantageRecuperer) + (+this.valeurRecup)).toString();
console.log('+this.cartePar.avantageCumule : ' + this.cartePar.avantageCumule);
console.log('+this.cartePar.avantageRecuperer : ' + this.cartePar.avantageRecuperer);
console.log('carte iiiiid: ' + this.cartePar.uid);
const carteCumuRef = this.databaseRef.child('CarteParrainage').child(this.cartePar.uid.toString()).child('avantageCumule');
carteCumuRef.set(this.cartePar.avantageCumule);
const carteRecuRef = this.databaseRef.child('CarteParrainage').child(this.cartePar.uid.toString()).child('avantageRecuperer');
carteRecuRef.set(this.cartePar.avantageRecuperer);
console.log(this.opComm.nbDebiter);
this.opComm.nbDebiter = ((+this.opComm.nbDebiter) + 1).toString();
console.log(this.opComm.nbDebiter);
const opEnvRef = this.databaseRef.child('OperationCommercial').child(this.opComm.uid.toString()).child('nbDebiter');
opEnvRef.set(this.opComm.nbDebiter);
@ -176,7 +152,8 @@ export class DebiterCarteComponent implements OnInit, OnDestroy {
const crtHistoriqueRef = this.databaseRef.child('CarteParrainage').child(this.cartePar.uid.toString()).child('historique');
crtHistoriqueRef.set(this.cartePar.historique);
this.goToOpComm();
this.toastrService.success('Débit de la carte de : ' + this.cartePar.parrainCarte.familyname + ' ' + this.cartePar.parrainCarte.firstname);
this.toastrService.success('Débit de la carte de : ' + this.cartePar.parrainCarte.familyname + ' '
+ this.cartePar.parrainCarte.firstname);
}
filter(query: string) {
@ -203,13 +180,13 @@ export class DebiterCarteComponent implements OnInit, OnDestroy {
if (auth) {
console.log(auth.uid);
} else {
//this.router.navigate(['/']);
// this.router.navigate(['/']);
}
});
} catch (e) {
// No content response..
console.log(e);
//this.router.navigate(['/']);
// this.router.navigate(['/']);
}
}
//////

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

@ -2,11 +2,9 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import * as html2canvas from 'html2canvas';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { FormsModule } from '@angular/forms';
import { ProfilService } from '../../../services/profil/profil.service';
import { ActivatedRoute } from '@angular/router';
import { User } from '../../../../models/User';
import { Parrain } from '../../../../models/Parrain';
@ -15,12 +13,9 @@ import { FireImg } from '../../../../models/FireImg';
import { OperationCommerciale } from '../../../../models/OperationCommerciale';
import { CarteParrainage } from '../../../../models/CarteParrainage';
import { OpCommercialService } from '../../../services/opCommercial/op-commercial.service';
import { Subject } from 'rxjs/Subject';
import { Subscription } from 'rxjs/Subscription';
import {forEach} from '@angular/router/src/utils/collection';
import { AuthService } from '../../../services/auth/auth.service';
import { ToastrService } from '../../../typescripts/angular-bootstrap-md/pro';
import * as _ from 'lodash';
@Component({
selector: 'app-envoyer-carte',
@ -42,24 +37,18 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
commList: FirebaseListObservable<any[]>;
opCommList: FirebaseListObservable<any[]>;
parrainExistList: FirebaseListObservable<any[]>;
parrainSelected: FirebaseListObservable<any[]>;
parrainAffList: FirebaseListObservable<any[]>;
carteParList: FirebaseListObservable<any[]>;
carteParExistList: FirebaseListObservable<any[]>;
parSelect: string;
selectPar: boolean;
parrainAffListTemp = [];
databaseRef: any;
/////
parrainsTest: Parrain[];
filteredParrainsTest: any[];
subscription: Subscription;
validC: string;
// startAt = new Subject();
// endAt = new Subject();
/////
yearTest: number;
@ -78,7 +67,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
secondaryApp: any;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private route: ActivatedRoute,
private authService: AuthService, private opComService: OpCommercialService, private toastrService: ToastrService) {
private opComService: OpCommercialService, private toastrService: ToastrService) {
this.user = afAuth.authState;
this.carteExitDeja = false;
this.carteEnvoieOK = false;
@ -143,14 +132,6 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
this.cartePar.dateDebut = this.opComm.dateDebut;
this.cartePar.dateFin = this.opComm.dateFin;
console.log('bla' + this.minDateTimeTest);
console.log('bla' + this.maxDateTimeTest);
console.log('bla' + this.minDateTimeTest.getTime());
console.log('bla' + this.maxDateTimeTest.getTime());
console.log('bla' + this.parrainDateTimeTest);
console.log('bla' + this.parrainDateTimeTest.getTime());
const todayTemp = new Date(Date.now());
const debutTemp = new Date(this.opComm.dateDebut);
const finTemp = new Date(this.opComm.dateFin);
@ -160,11 +141,6 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
} else {
this.cartePar.status = 'Inactive';
}
/*
var dateTest = this.opComm.dateFin.toString().split(/[- :]/);
this.cartePar.dateFin = new Date(Number(dateTest[0]), Number(dateTest[1]) - 1,
Number(dateTest[2]), Number(dateTest[3]), Number(dateTest[4]), Number(dateTest[5]));
*/
this.cartePar.carteTemplate = this.opComm.carteTemplate;
});
});
@ -179,7 +155,6 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
);
this.carteParList.forEach(carte => {
carte.forEach(elementCarte => {
console.log('elementCarte..parrainCarte.uid : ' + elementCarte.parrainCarte.uid);
this.parrainAffList = this.afDb.list('/Parrain/', {
query: {
orderByChild: 'uid',
@ -195,7 +170,6 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
firstname : elementparAf.firstname,
familyname: elementparAf.familyname
});
console.log('elementparAf.firstname' + elementparAf.firstname);
});
});
});
@ -236,23 +210,12 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
regiPar(){
/*const config = {apiKey: 'AIzaSyD2O5MxwZ4BRWvVc77FZliBvtj0pmcdzos',
authDomain: 'webappparrain.firebaseapp.com',
databaseURL: 'https://webappparrain.firebaseio.com'};
let secondaryApp = null;
secondaryApp = firebase.initializeApp(config, 'Secondary');*/
let parrainTemp = new Parrain();
this.carteEnvoieOK = false;
this.parrain.status = 'Parrain';
// this.parrain.birthday = this.parrainDateTimeTest;
this.parrain.secretCode = this.getRandomArbitrary(1111, 9999).toString();
this.parrain.password = this.getRandomArbitrary(111111, 999999).toString();
// this.authService.signUp(this.parrain);
parrainTemp = this.parrain;
var ilExist = false;
var parrainExistListTemp = this.afDb.list('/Parrain/', {
query: {
@ -262,14 +225,11 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
}
).subscribe(tab => {
if (tab.length === 0) {
console.log('iiii');
this.secondaryApp.auth().createUserWithEmailAndPassword(parrainTemp.email, parrainTemp.password)
.catch(e => {
console.log('lololo ' + e);
this.carteEnvoieOK = false;
})
.then(function(userCreate) {
console.log('User ' + userCreate.uid + ' created successfully!');
// I don't know if the next statement is necessary
const imagePath = 'profilImage/' + userCreate.uid + '/userPic.jpg';
const dbRef = firebase.database().ref();
@ -283,27 +243,19 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
parrainTemp.uid = userCreate.uid;
parrainTemp.emailVerified = userCreate.emailVerified;
userRef.set(parrainTemp);
console.log('crer par: ' + parrainTemp.firstname);
// this.cartePar.parrainCarte = parrainTemp;
this.secondaryApp.auth().sendPasswordResetEmail(userCreate.email);
userCreate.sendEmailVerification();
console.log('avant logout firebase.auth().currentUser.uid: ');
this.secondaryApp.auth().signOut();
console.log('avant logout firebase.auth().currentUser.uid: ');
} catch (e) {
// No content response..
console.log('error dans envoyer carte !');
console.log(e);
// this.goToOpComm();
// this.router.navigate(['/']);
}
//fin
// this.secondaryApp.auth().signOut();
// fin
});
@ -336,67 +288,10 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
});
} else {
this.echecRegisterPar = true;
console.log('il est la');
}
});
}
registerNewParrain() {
this.carteEnvoieOK = false;
this.parrain.status = 'Parrain';
// this.parrain.birthday = this.parrainDateTimeTest;
this.parrain.secretCode = this.getRandomArbitrary(1111, 9999).toString();
this.parrain.password = this.getRandomArbitrary(111111, 999999).toString();
// this.authService.signUp(this.parrain);
firebase.auth().createUserWithEmailAndPassword(this.parrain.email, this.parrain.password).then(userCreate => {
const imagePath = 'profilImage/' + userCreate.uid + '/userPic.jpg';
const userRef = this.databaseRef.child('Parrain').child(userCreate.uid);
userCreate.updateProfile({
displayName: this.parrain.status,
photoURL: imagePath,
emailVerified: true
});
try {
this.parrain.uid = userCreate.uid;
this.parrain.emailVerified = userCreate.emailVerified;
userRef.set(this.parrain);
console.log('crer par: ' + this.parrain.firstname);
// this.cartePar.parrainCarte = this.parrain;
this.getIdParrain(userCreate.uid);
console.log('creer par userCreate.uid: ' + userCreate.uid);
this.creerCartePar();
console.log('creer par creerCartePar: ' + this.cartePar.uid);
firebase.auth().sendPasswordResetEmail(this.parrain.email);
userCreate.sendEmailVerification();
console.log('avant logout firebase.auth().currentUser.uid: ' + firebase.auth().currentUser.uid);
firebase.auth().signOut();
firebase.auth().signInWithEmailAndPassword(this.commercant.email, this.commercant.password);
console.log('avant logout firebase.auth().currentUser.uid: ' + firebase.auth().currentUser.uid);
this.carteEnvoieOK = true;
} catch (e) {
// No content response..
console.log('error dans envoyer carte !');
console.log(e);
// this.goToOpComm();
// this.router.navigate(['/']);
}
});
}
getRandomArbitrary(min, max) {
return Math.trunc(Math.random() * (max - min) + min);
}
@ -410,8 +305,6 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
getIdParrain(parUid) {
this.carteEnvoieOK = false;
this.carteExitDeja = false;
console.log('parUid getidpar: ' + parUid);
const parlistTemp = this.afDb.list('/Parrain/', {
query: {
orderByChild: 'uid',
@ -424,12 +317,10 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
par.forEach(elementParTemp => {
this.parrain = elementParTemp;
this.cartePar.parrainCarte = elementParTemp;
console.log('ttthis.cartePar.parrainCarte.uid: ' + this.cartePar.parrainCarte.uid + this.cartePar.parrainCarte.firstname);
});
});
this.selectPar = true;
console.log('this.cartePar.parrainCarte.uid: ' + this.cartePar.parrainCarte.uid + this.cartePar.parrainCarte.firstname);
if (this.radioParrain === 'Newparrain') {
this.parSelect = ' à : '
@ -447,25 +338,6 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
});
}
// console.log('this.birthday parrain : ' + this.parrain.birthday);
console.log('this.cartePar.commercantCarte.uid : ' + this.cartePar.commercantCarte.uid);
console.log('this.cartePar..parrainCarte.uid : ' + this.cartePar.parrainCarte.uid);
console.log('this.cartePar.operationCommercial.uid : ' + this.cartePar.operationCommercialCarte.uid);
console.log('this.cartePar.dateDebut : ' + this.cartePar.dateDebut);
console.log('this.cartePar.dateFin : ' + this.cartePar.dateFin);
}
applyFilters(listFiltrer: any, listAFiltrer: any) {
this.filteredCartePars = _.filter(this.cartePars, _.conforms(this.filters));
}
filterEgual(property: string, query: string) {
this.filters[property] = val => val === query;
}
filterDifferentDe(property: string, query: string) {
this.filters[property] = val => val !== query;
}
carteExist(parUid) {
@ -482,7 +354,6 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
}
}
if (this.carteExitDeja === false) {
console.log('cestBon !!');
this.creerCartePar();
this.carteEnvoieEncours = true;
this.carteEnvoieOK = true;
@ -494,78 +365,21 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
},
3000);
} else {
console.log('cest pas bon ');
console.log('Error');
// this.carteEnvoieOK = false;
}
/*
this.applyFilters(this.filteredCartePars, this.cartePars);
this.filterEgual('operationCommercialCarte/uid', this.opComm.uid);
this.applyFilters(this.filteredCartePars, this.cartePars);
console.log(this.filteredCartePars);
this.filterEgual('parrainCarte/uid', parUid);
this.applyFilters(this.filteredCartePars, this.cartePars);
console.log(this.filteredCartePars);
*/
//console.log(parUid);
//console.log(this.opComm.uid);
console.log(cartes);
// console.log(this.cartePars);
//console.log(this.filteredCartePars);
/*if(this.filteredCartePars.length > 0){
this.carteExitDeja = true;
console.log(this.carteExitDeja);
}else {
this.carteExitDeja = false;
console.log(this.carteExitDeja);
}*/
});
/* this.carteParExistList = this.afDb.list('/CarteParrainage/', {
query: {
orderByChild: 'operationCommercialCarte/uid',
equalTo: this.opComm.uid
}
}
);*/
// console.log('this.filteredCartePars.length: ' + this.filteredCartePars.length);
/*
this.carteParList.forEach(carte => {
carte.forEach(elementCarte => {
if (elementCarte.parrainCarte.uid === parUid) {
this.carteExitDeja = true;
// console.log('eeeeeeeeeeeeeeeeeeeeee');
return true;
} else {
this.carteExitDeja = false;
}
});
});
if (this.carteExitDeja === false) {
return false;
} else if (this.carteExitDeja === true) {
return true;
}*/
}
}
envoyerCartePar(){
this.carteExist(this.cartePar.parrainCarte.uid);
// this.goToOpComm();
}
creerCartePar() {
// this.opComService.creerCartePar(this.cartePar); inutile
this.sectionToImage(this.cartePar);
console.log('this.opComm.nbEnvoie: ' + this.opComm.nbEnvoie);
this.opComm.nbEnvoie = ((+this.opComm.nbEnvoie) + 1).toString();
console.log('this.opComm.nbEnvoie: ' + this.opComm.nbEnvoie);
const opEnvRef = this.databaseRef.child('OperationCommercial').child(this.opComm.uid.toString()).child('nbEnvoie');
opEnvRef.set(this.opComm.nbEnvoie);
@ -585,8 +399,6 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
const offsets = document.getElementById('subCard1').getBoundingClientRect();
const imgTop = offsets.top;
const imgLeft = offsets.left;
//canvas.width = document.getElementById('subCard1').offsetWidth;
//canvas.height = document.getElementById('subCard1').offsetHeight;
img.onload = function () {
context.drawImage(img, imgLeft, imgTop, 1920, 1200);
};
@ -594,100 +406,26 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
canvas.crossOrigin = 'Anonymous';
canvas.id = 'canvas';
// document.body.appendChild(canvas);
console.log('avant blob');
canvas.toBlob(blob => {
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.jpg').put(blob).then((snapshot) => {
const updates = {};
maCarteP.carteTemplate.path = 'CarteParrainage/' + maCarteP.uid + '/carteTemplate.jpg';
maCarteP.carteTemplate.filename = maCarteP.name;
maCarteP.carteTemplate.downloadURL = snapshot.downloadURL;
console.log('maCarteP.carteTemplate.filename : ' + maCarteP.carteTemplate.filename);
console.log('maCarteP.uid: ' + maCarteP.uid);
updates['CarteParrainage/' + maCarteP.uid] = maCarteP;
console.log('updates[\'CarteParrainage/\' + maCarteP.uid].name ' + updates['CarteParrainage/' + maCarteP.uid].name);
firebase.database().ref().update(updates);
console.log('fin du blob');
});
}, 'image/jpeg', 20);
}
});
}
sectionToImage2(maCarteP: CarteParrainage) {
html2canvas(document.getElementById('subCard1'), {
// allowTaint: true,
useCORS: true,
logging: true,
width: 750,
height: 1050,
onrendered: function (canvas) {
const context = canvas.getContext('2d');
context.scale(2, 2);
const img = new Image();
const offsets = document.getElementById('subCard1').getBoundingClientRect();
const imgTop = offsets.top;
const imgLeft = offsets.left;
const w = offsets.width;
const h = offsets.height;
// var w = 1000;
// var h = 1000;
//canvas.width = w * 2;
//canvas.height = h * 2;
// canvas.style.width = offsets.width + 'px';
// canvas.style.height = offsets.height + 'px';
img.onload = function () {
context.drawImage(img, imgLeft, imgTop);
};
img.crossOrigin = 'Anonymous';
canvas.crossOrigin = 'Anonymous';
canvas.id = 'canvas';
var imgg = canvas.toDataURLHD('image/png', 1);
window.open(imgg);
document.body.appendChild(canvas);
console.log('avant blob');
/*canvas.toBlob(blob => {
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.jpg').put(blob).then((snapshot) => {
const updates = {};
maCarteP.carteTemplate.path = 'CarteParrainage/' + maCarteP.uid + '/carteTemplate.jpg';
maCarteP.carteTemplate.filename = maCarteP.name;
maCarteP.carteTemplate.downloadURL = snapshot.downloadURL;
console.log('maCarteP.carteTemplate.filename : ' + maCarteP.carteTemplate.filename);
console.log('maCarteP.uid: ' + maCarteP.uid);
updates['CarteParrainage/' + maCarteP.uid] = maCarteP;
console.log('updates[\'CarteParrainage/\' + maCarteP.uid].name ' + updates['CarteParrainage/' + maCarteP.uid].name);
firebase.database().ref().update(updates);
console.log('fin du blob');
});
}, 'image/jpeg', 20);*/
}
});
}
goToOpComm() {
this.router.navigate(['/opCommercial']);
}

15
src/app/components/opCommercial/op-commercial/op-commercial.component.ts
Unescape Escape View File

@ -4,14 +4,13 @@ import { Router } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { OperationCommerciale } from '../../../../models/OperationCommerciale';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } 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 {CarteParrainage} from "../../../../models/CarteParrainage";
@Component({
@ -25,11 +24,10 @@ export class OpCommercialComponent implements OnInit, OnDestroy {
user: Observable<firebase.User>;
opCommData: FirebaseListObservable<any[]>;
profileData: FirebaseListObservable<any[]>;
// Cas2Image: Observable<Canvas2Image>;
commercant: Commercant;
statutAffiche: string;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService, private opComService: OpCommercialService) {
private router: Router) {
this.statutAffiche = 'Toutes';
this.opComm = new OperationCommerciale();
@ -37,7 +35,6 @@ export class OpCommercialComponent implements OnInit, OnDestroy {
this.commercant = new Commercant();
this.user.subscribe(
(auth) => {
// console.log("afAuth.authState : " + auth.toJSON());
if (auth) {
this.opCommData = this.afDb.list('/OperationCommercial/', {
@ -72,9 +69,7 @@ export class OpCommercialComponent implements OnInit, OnDestroy {
goToCreaOpCom() {
this.router.navigate(['/creationOpCommercial']);
}
goToProfil() {
this.router.navigate(['/profil']);
}
goToEnCart(idOp) {
this.router.navigate(['/EnvoyerCarte', idOp]);
}
@ -84,9 +79,7 @@ export class OpCommercialComponent implements OnInit, OnDestroy {
goToDebiterCart(idOp) {
this.router.navigate(['/debiterCarte', idOp]);
}
goToCarteEnvoyer() {
this.router.navigate(['/historiqueCarte']);
}
ngOnInit() {
try {
this.user.subscribe(

59
src/app/components/opCommercial/scanner-carte/scanner-carte.component.ts
Unescape Escape View File

@ -2,12 +2,10 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { FormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
import { User } from '../../../../models/User';
import { Parrain } from '../../../../models/Parrain';
import { Commercant } from '../../../../models/Commercant';
import { FireImg } from '../../../../models/FireImg';
@ -43,8 +41,6 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
opComm: OperationCommerciale;
cartePar: CarteParrainage;
carteIDTemp: string;
avAdmin: string;
commList: FirebaseListObservable<any[]>;
@ -55,7 +51,6 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
databaseRef: any;
/////
filleulTest: Filleul[];
carteTest: CarteParrainage[];
filteredFilleulsTest: any[];
@ -64,10 +59,10 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
subscription: Subscription;
subscriptionCarte: Subscription;
isFilleulAnonyme: boolean;
/////
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService,
private opComService: OpCommercialService, private route: ActivatedRoute, private toastrService: ToastrService) {
private router: Router, private opComService: OpCommercialService,
private route: ActivatedRoute, private toastrService: ToastrService) {
this.isFilleulAnonyme = false;
this.radioFilleul = '';
this.filleulSelect = '';
@ -99,7 +94,6 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
});
// initialisation carte
this.route.params.subscribe(params => {
// this.test = params['idOp'];
this.opCommList = this.afDb.list('/OperationCommercial/', {
query: {
orderByChild: 'uid',
@ -150,7 +144,8 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
}
filterCarte(query: string) {
this.filteredCartesTest = (query) ?
this.carteTest.filter(c => (c.parrainCarte.firstname.toLowerCase() + c.parrainCarte.familyname.toLowerCase()).includes(query.toLowerCase())) :
this.carteTest.filter(c => (c.parrainCarte.firstname.toLowerCase()
+ c.parrainCarte.familyname.toLowerCase()).includes(query.toLowerCase())) :
[];
}
filter(queryF: string) {
@ -158,17 +153,7 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
this.filleulTest.filter(f => (f.firstname.toLowerCase() + f.familyname.toLowerCase()).includes(queryF.toLowerCase())) :
[];
}
registerNewFilleul(){
console.log(this.filleul.familyname);
console.log(this.filleul.firstname);
console.log(this.filleul.familyname);
this.filleul.status = 'Filleul';
this.filleul.uid = firebase.database().ref().child('Parrain').push().key;
const userRef = this.databaseRef.child('Parrain').child(this.filleul.uid);
userRef.set(this.filleul);
this.scanCarteFil();
}
scanCarteFil() {
this.scan.uid = firebase.database().ref().child('Scan').push().key;
@ -176,14 +161,8 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
this.scan.carteParrainID = this.cartePar.parrainCarte.uid;
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;
console.log(this.scan.uid);
console.log(this.scan.carteParrainID);
console.log(this.scan.carteFilleulID);
console.log(this.scan.valeurParrain);
console.log(this.scan.valeurFilleul);
const userRef = this.databaseRef.child('Scan').child(this.scan.uid);
userRef.set(this.scan);
@ -199,18 +178,14 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
}
updateCarte() {
console.log(+this.cartePar.avantageCumule);
this.cartePar.avantageCumule = ((+this.cartePar.avantageCumule) + (+this.opComm.avantageParrain)).toString();
console.log(this.cartePar.avantageCumule);
console.log('carte iiiiid: ' + this.cartePar.uid);
const carteRef = this.databaseRef.child('CarteParrainage').child(this.cartePar.uid.toString()).child('avantageCumule');
carteRef.set(this.cartePar.avantageCumule);
this.opComm.nbScan = ((+this.opComm.nbScan) + 1).toString();
console.log(this.opComm.nbScan);
const opEnvRef = this.databaseRef.child('OperationCommercial').child(this.opComm.uid.toString()).child('nbScan');
opEnvRef.set(this.opComm.nbScan);
@ -224,19 +199,14 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
);
this.adminAvantage.forEach(avantage => {
avantage.forEach(elementavantage => {
console.log('elementavantage: ' + elementavantage);
this.avAdmin = elementavantage;
console.log('this.avAdmin : ' + this.avAdmin);
});
});
console.log('this.avAdmin : ' + this.avAdmin);
console.log('this.opComm.avantageParrain : ' + this.opComm.avantageParrain);
this.avAdmin = ((+this.avAdmin) + (+this.opComm.avantageParrain)).toString();
const adminAvantageRef = this.databaseRef.child('Admin').child('avantageCumule');
adminAvantageRef.set(this.avAdmin);
console.log('this.avAdmin : ' + this.avAdmin);
//Fin Admin
//Historique carte
@ -248,13 +218,11 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
+ ' ' + (this.filleul.firstname === '' ? 'anonyme' : this.filleul.firstname.toUpperCase())
+ ' a credité cette carte de ' + this.opComm.avantageParrain
+ '€ supplémentaires, à valoir lors d un prochain achat.';
console.log(elementCarteHist);
// this.cartePar.historique = [];
this.cartePar.historique.push(elementCarteHist);
const crtHistoriqueRef = this.databaseRef.child('CarteParrainage').child(this.cartePar.uid.toString()).child('historique');
crtHistoriqueRef.set(this.cartePar.historique);
console.log(this.cartePar.historique[0]);
}
getIdFilleul(filUid) {
@ -277,30 +245,21 @@ export class ScannerCarteComponent implements OnInit, OnDestroy {
+ elementparC.firstname;
this.parrain = elementparC;
for(let i = 0; i < this.filteredCartesTest.length; i++){
console.log(this.filteredCartesTest);
console.log('this.filteredCartesTest[i].parrainCarte.uid'+this.filteredCartesTest[i].parrainCarte.uid);
console.log('elementparC.uid'+ elementparC.uid);
//console.log(query);
if (this.filteredCartesTest[i].parrainCarte.uid === elementparC.uid) {
// this.carteParSelected = this.filteredCartesTest[i];
console.log('succes id carte est: ' + this.filteredCartesTest[i].uid);
console.log('succes le parrain de la carte est: ' + this.filteredCartesTest[i].parrainCarte.firstname);
this.cartePar = this.filteredCartesTest[i];
if (this.cartePar.historique === undefined){
this.cartePar.historique = new Array();
}
this.parrain = this.filteredCartesTest[i].parrainCarte;
}else{
console.log('echec de la carte ! ');
console.log('Error');
}
}
}
});
});
}
initFilSelect(){
this.filleulSelect = '';
}
ngOnInit() {
try {

7
src/app/components/profil/edit-profil/edit-profil.component.ts
Unescape Escape View File

@ -1,8 +1,8 @@
import { Component, OnInit, OnDestroy, EventEmitter } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { AuthService } from '../../../services/auth/auth.service';
@ -11,7 +11,6 @@ import { User } from '../../../../models/User';
import { Parrain } from '../../../../models/Parrain';
import { Commercant } from '../../../../models/Commercant';
@Component({
selector: 'app-edit-profil',
templateUrl: './edit-profil.component.html',
@ -49,7 +48,6 @@ export class EditProfilComponent implements OnInit, OnDestroy {
this.parrainDateTimeTest = new Date(this.parrain.birthday);
this.user.subscribe(
(auth) => {
// console.log(auth.displayName);
if (auth) {
this.profileData = this.afDb.list('/' + auth.displayName + '/', {
query: {
@ -60,7 +58,6 @@ export class EditProfilComponent implements OnInit, OnDestroy {
);
this.profileData.forEach(utilisateur => {
utilisateur.forEach(element => {
console.log('blabla : ' + auth.displayName);
if (auth.displayName === 'Parrain') {
this.localUser = new Parrain();

25
src/app/components/profil/profil.component.ts
Unescape Escape View File

@ -2,18 +2,15 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { FormsModule } from '@angular/forms';
import { ProfilService } from '../../services/profil/profil.service';
import { User } from '../../../models/User';
import { Parrain } from '../../../models/Parrain';
import { Commercant } from '../../../models/Commercant';
import { FireImg } from '../../../models/FireImg';
import {forEach} from "@angular/router/src/utils/collection";
import { AuthService } from '../../services/auth/auth.service';
@Component({
@ -37,11 +34,9 @@ export class ProfilComponent implements OnInit, OnDestroy {
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService) {
this.user = afAuth.authState;
this.localUser = new User();
this.parrain = new Parrain();
this.commercant = new Commercant();
this.imageProfil = 'https://ssl.prcdn.com/uk/people/default-profile.png?1406639312';
this.user.subscribe(
@ -107,27 +102,11 @@ export class ProfilComponent implements OnInit, OnDestroy {
} catch (e) {
// No content response..
console.log(e);
//this.router.navigate(['/']);
// this.router.navigate(['/']);
}
}
ngOnDestroy() {
//firebase.auth().signOut();
/*
this.localUser = {
uid: '',
email: '',
emailVerified: false,
password: '',
familyname: '',
firstname: '',
sex: '',
birthday: new Date(),
telephone: '',
idCard: '',
secretCode: '',
status: ''
};*/
this.localUser = {
uid: '',
image: new FireImg(),

45
src/app/components/register/register.component.ts
Unescape Escape View File

@ -2,7 +2,6 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { AuthService } from '../../services/auth/auth.service';
import * as firebase from 'firebase/app';
import { User } from '../../../models/User';
import { Parrain } from '../../../models/Parrain';
import { Commercant } from '../../../models/Commercant';
@ -29,7 +28,6 @@ export class RegisterComponent implements OnInit, OnDestroy {
echecRegisterPar: boolean;
echecRegisterCom: boolean;
constructor(private router: Router, private authService: AuthService) {
// this.fileTest = new File();
this.fileCom = true;
this.filePar = true;
this.echecRegisterPar = false;
@ -44,19 +42,16 @@ export class RegisterComponent implements OnInit, OnDestroy {
}
fileOKCom(){
fileOKCom() {
this.fileCom = false;
}
fileOKPar(){
fileOKPar() {
this.filePar = false;
}
keyDownFunctionParrain(event) {
console.log('you just clicked parrain');
console.log((<HTMLInputElement>document.getElementById('orangeForm-File')).value === '');
if(event.keyCode === 13) {
console.log('you just clicked enter');
if (event.keyCode === 13) {
// rest of your code
if (this.parrain.email !== '' && this.parrain.password !== ''
&& (this.parrain.password === this.ConfirmPasswordParrain)
@ -69,9 +64,7 @@ export class RegisterComponent implements OnInit, OnDestroy {
}
keyDownFunctionCommercant(event) {
console.log('you just clicked commercant');
if(event.keyCode === 13) {
console.log('you just clicked enter');
if (event.keyCode === 13) {
// rest of your code
if (this.commercant.email !== '' && this.commercant.password !== ''
&& (this.commercant.password === this.ConfirmPasswordCommercant)
@ -90,9 +83,6 @@ export class RegisterComponent implements OnInit, OnDestroy {
this.echecRegisterPar = true;
this.test = false;
});
/*if ((<HTMLInputElement>document.getElementById('orangeForm-File')).value !== '') {
this.clean();
}*/
this.echecRegisterPar = false;
this.test = true;
}else if (this.currentUser.status === 'Commercant') {
@ -103,9 +93,6 @@ export class RegisterComponent implements OnInit, OnDestroy {
this.echecRegisterCom = true;
this.test = false;
});
/*if ((<HTMLInputElement>document.getElementById('orangeForm-File')).value !== '') {
this.clean();
}*/
this.echecRegisterCom = false;
this.test = true;
}
@ -118,7 +105,7 @@ export class RegisterComponent implements OnInit, OnDestroy {
}
// On renvoie un nombre aléatoire entre une valeur min (incluse)
// et une valeur max (exclue)
// et une valeur max (exclue)
getRandomArbitrary(min, max) {
return Math.trunc(Math.random() * (max - min) + min);
}
@ -133,28 +120,6 @@ export class RegisterComponent implements OnInit, OnDestroy {
}
}
loadHomeComponent() {
this.router.navigate(['/']);
}
clicktest(){
}
/*
luhn(str) {
return str.split('').reduceRight(function(prev, curr, idx){
prev = parseInt(prev, 10);
if ((idx + 1) % 2 !== 0) {
curr = (curr * 2).toString().split('').reduce(function(p, c){ return parseInt(p, 10) + parseInt(c, 10)});
}
return prev + parseInt(curr, 10);
}) % 10 === 0;
}
*/
loadLoginComponent() {
this.router.navigate(['/login']);
}
ngOnInit() {
var inputs = document.querySelectorAll( '.inputfile' );
Array.prototype.forEach.call( inputs, function( input )

136
src/app/services/auth/auth.service.ts
Unescape Escape View File

@ -1,52 +1,32 @@
import { Injectable, Input } from '@angular/core';
import { Router } from '@angular/router';
import { FormsModule } from '@angular/forms';
import { HttpModule, Headers } from '@angular/http';
import { Observable } from 'rxjs/Observable';
import * as firebase from 'firebase/app';
// import * as functions from 'firebase-functions';
// import * as functions from 'firebase/functions';
import { AngularFireAuth } from 'angularfire2/auth';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import { User } from '../../../models/User';
import { Parrain } from '../../../models/Parrain';
import { FireImg } from '../../../models/FireImg';
import { Commercant } from '../../../models/Commercant';
// import * as Canvas2image from 'canvas2image';
// import * as NodeMailer from 'nodemailer/lib/nodemailer';
@Injectable()
export class AuthService {
//nodemailer: NodeMailer;
databaseRef: any;
storageRef: any;
changeRequest: any;
userModel: User;
parrain: Parrain;
commercant: Commercant;
utilisateur: any;
test: string;
uti: firebase.User;
profileData: FirebaseListObservable<any[]>;
profileDataParrain: FirebaseListObservable<any[]>;
profileDataCommercant: FirebaseListObservable<any[]>;
profileDataParrainEmail: FirebaseListObservable<any[]>;
profileDataCommercantEmail: FirebaseListObservable<any[]>;
boolUpdate: boolean;
boolSetData: boolean;
authState: firebase.User;
@Input() folder: string;
//fileList: FirebaseListObservable<Image[]>;
constructor(private http: HttpModule, private afAuth: AngularFireAuth, private afDb: AngularFireDatabase, private router: Router) {
constructor(private afAuth: AngularFireAuth, private afDb: AngularFireDatabase, private router: Router) {
this.parrain = new Parrain();
this.commercant = new Commercant();
@ -55,7 +35,6 @@ export class AuthService {
this.authState = auth;
});
this.databaseRef = firebase.database().ref();
//var nodemailer = require('nodemailer');
}
get authenticated(): boolean {
@ -64,11 +43,8 @@ export class AuthService {
saveInfo(user: firebase.User, infoUser: any): boolean {
if (infoUser.status === 'Parrain') {
const userRef = this.databaseRef.child('Parrain').child(infoUser.uid);
// var parrainInfo = infoUser;
// infoUser.uid = user.uid;
userRef.set(infoUser);
return true;
// this.router.navigate(['/carteParrainageComponent']);
}else if (infoUser.status === 'Commercant') {
var dateTemp = new Date(Date.now());
infoUser.dateInscription = dateTemp;
@ -77,35 +53,15 @@ export class AuthService {
const dateInsReff = this.databaseRef.child('Commercant').child(infoUser.uid).child('dateInscription');
dateInsReff.set(dateTemp.toString());
return true;
// this.router.navigate(['/opCommercial']);
}else {
return false;
}
}
// oublie pas de MAJ emailVerified dans database
signInEnvoyerCarte(email: string, password: string) {
firebase.auth().signInWithEmailAndPassword(email, password).then(user => {
if (user) {
if (/*user.emailVerified*/true){
console.log('salut le ' + user.displayName + ' ' + user.email + ' has signed!');
}/*else{
console.log('email non verifié!!');
}*/
}else {
console.log('error!!');
}
});
}
// oublie pas de MAJ emailVerified dans database
signIn(email: string, password: string) {
return firebase.auth().signInWithEmailAndPassword(email, password)
.catch(e => {
console.log('lololo ' + e);
return e;
})
.then(user => {
@ -125,8 +81,6 @@ export class AuthService {
this.parrain = elementParrain;
this.utilisateur = elementParrain;
if (/*user.emailVerified*/true){
console.log('salut le ' + this.utilisateur.email + ' ' + this.utilisateur.status + ' has signed!');
firebase.auth().onAuthStateChanged(function (userUpdate) {
if(userUpdate !== null){
userUpdate.updateProfile({
@ -161,7 +115,6 @@ export class AuthService {
this.commercant = elementCommercant;
this.utilisateur = elementCommercant;
if (/*user.emailVerified*/true){
console.log('salut le ' + this.utilisateur.email + ' ' + this.utilisateur.status + ' has signed!');
firebase.auth().onAuthStateChanged(function (userUpdate) {
if (userUpdate !== null){
userUpdate.updateProfile({
@ -186,62 +139,29 @@ export class AuthService {
if (user.email === 'xjc@gmail.com') {
this.router.navigate(['/demandeOpCommercialAdmin']);
}
/*
let userTest: any;
this.profileData = this.afDb.list('/' + this.utilisateur + '/', {
query: {
orderByChild: 'uid',
equalTo: user.uid.toString()
}
}
);
*/
}else {
console.log('error!!');
console.log('Error');
}
});
}
/*
setUserInfo(user: firebase.User, infoUser: any): boolean {
const imagePath = 'profilImage/' + user.uid + '/userPic.jpg';
firebase.auth().onAuthStateChanged(function (userUpdate) {
userUpdate.updateProfile({
displayName: infoUser.status,
photoURL: imagePath
});
if (userUpdate) {
console.log('userUpdateee: ' + userUpdate);
} else {
console.log('pas user');
}
});
return true;
}
*/
signUp(infoUser: any) {
return firebase.auth().createUserWithEmailAndPassword(infoUser.email, infoUser.password)
.catch(e => {
console.log('lololo ' + e);
return e;
})
.then(userCreate => {
userCreate.sendEmailVerification().then(res => {
console.log('res : ');
});
userCreate.sendEmailVerification();
infoUser.uid = userCreate.uid;
// this.setUserInfo(userCreate, infoUser);
if (this.saveInfo(userCreate, infoUser)) {
if (this.upload(infoUser)) {
console.log('youhoo!!!!');
console.log('');
}else {
console.log('upload failed !!! ');
console.log('Error');
}
}else {
console.log('save info failed !!! ');
console.log('Error');
}
});
@ -255,11 +175,9 @@ export class AuthService {
upload(info: any): boolean {
const storageRef = firebase.storage().ref();
let success = false;
this.folder = '/' + info.status + '/' + info.uid + '/image';
for (const selectedFile of [(<HTMLInputElement>document.getElementById('orangeForm-File')).files[0]]) {
console.log(selectedFile);
const folder = this.folder;
const path = `${this.folder}`;
const iRef = storageRef.child(path);
@ -278,24 +196,17 @@ export class AuthService {
userUpdate.updateProfile({
displayName: info.status,
photoURL: info.image.downloadURL
}).then(al => {
console.log('userUpdate.dispppp : ' + al);
// firebase.auth().signOut();
});
}
});
return true;
}
uploadModify(info: any) {
const storageRef = firebase.storage().ref();
const success = false;
this.folder = '/' + info.status + '/' + info.uid + '/image';
for (const selectedFile of [(<HTMLInputElement>document.getElementById('orangeForm-File')).files[0]]) {
console.log(selectedFile);
const folder = this.folder;
const path = `${this.folder}`;
const iRef = storageRef.child(path);
@ -317,39 +228,17 @@ export class AuthService {
});
}
if (userUpdate) {
console.log('userUpdate: ' + userUpdate);
console.log('');
} else {
console.log('pas user');
console.log('Error');
}
});
}
delete(image: FireImg) {
console.log('delete');
/*
let storagePath = image.path;
let referencePath = `${this.folder}/images/` + image.key;
// Do these as two separate steps so you can still try delete ref if file no longer exists
// Delete from Storage
firebase.storage().ref().child(storagePath).delete()
.then(
() => {},
(error) => console.error('Error deleting stored file', storagePath)
);
// Delete references
this.afDb.object(referencePath).remove();
*/
}
modifyProfile(user: User, infoUser: any) {
if (infoUser.status === 'Parrain') {
const userRef = this.databaseRef.child('Parrain').child(user.uid);
// var parrainInfo = infoUser;
infoUser.uid = user.uid;
userRef.update(infoUser);
this.uploadModify(infoUser);
@ -357,15 +246,14 @@ export class AuthService {
userUpdate.updateEmail(infoUser.email);
userUpdate.updatePassword(infoUser.password);
if (userUpdate) {
console.log('userUpdate: ' + userUpdate);
console.log('' );
} else {
console.log('pas user');
console.log('Error');
}
});
}else if (infoUser.status === 'Commercant') {
const userReff = this.databaseRef.child('Commercant').child(user.uid);
// var commercantInfo = infoUser;
infoUser.uid = user.uid;
userReff.update(infoUser);
this.uploadModify(infoUser);
@ -373,9 +261,9 @@ export class AuthService {
userUpdate.updateEmail(infoUser.email);
userUpdate.updatePassword(infoUser.password);
if (userUpdate) {
console.log('userUpdate: ' + userUpdate);
console.log('');
} else {
console.log('pas user');
console.log('Error');
}
});

115
src/app/services/opCommercial/op-commercial.service.ts
Unescape Escape View File

@ -1,21 +1,13 @@
import { Injectable, Input } from '@angular/core';
import { Router } from '@angular/router';
import { FormsModule } from '@angular/forms';
import { HttpModule, Headers } from '@angular/http';
import * as html2canvas from 'html2canvas';
// import { Component, OnInit, OnDestroy, Input } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import * as firebase from 'firebase/app';
import 'firebase/storage';
import { AngularFireAuth } from 'angularfire2/auth';
import { AngularFireDatabase, FirebaseListObservable } from 'angularfire2/database';
import { User } from '../../../models/User';
import { Parrain } from '../../../models/Parrain';
import { Commercant } from '../../../models/Commercant';
import { FireImg } from '../../../models/FireImg';
import { OperationCommerciale } from '../../../models/OperationCommerciale';
import { CarteParrainage } from '../../../models/CarteParrainage';
@ -23,17 +15,13 @@ import { CarteParrainage } from '../../../models/CarteParrainage';
export class OpCommercialService {
databaseRef: any;
storageRef: any;
changeRequest: any;
userModel: User;
parrain: Parrain;
commercant: Commercant;
imageOp: FireImg;
test: string;
@Input() folder: string;
//fileList: FirebaseListObservable<Image[]>;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase, private http: HttpModule, public router: Router) {
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase, public router: Router) {
this.databaseRef = firebase.database().ref();
this.storageRef = firebase.storage().ref();
}
@ -48,7 +36,6 @@ export class OpCommercialService {
}
getOpComs(): FirebaseListObservable<any> {
console.log('oooooooooooo');
return this.afDb.list('/OperationCommercial/', {
query: {
orderByChild: 'uid'
@ -83,19 +70,8 @@ export class OpCommercialService {
);
}
creerCartePar(infoCartePar: CarteParrainage) {
console.log('ba');
// infoCartePar.uid = firebase.database().ref().child('CarteParrainage').push().key;
let updates = {};
updates['/CarteParrainage/' + infoCartePar.uid] = infoCartePar;
firebase.database().ref().update(updates);
// this.saveImg(infoCartePar);
}
updateOpCommStatus(){
updateOpCommStatus() {
const opComAll = this.getOpComs();
opComAll.forEach(utilisateur => {
utilisateur.forEach(monOpCom => {
var todayTemp = new Date(Date.now());
@ -138,64 +114,7 @@ export class OpCommercialService {
});
});
}
/*
saveImg(infoCartePar: CarteParrainage) {
var monImg: File;
html2canvas(document.getElementById('subCard1'), {
allowTaint: true,
useCORS: true,
logging: true,
onrendered: function (canvas) {
var context = canvas.getContext('2d');
var img = new Image();
var offsets = document.getElementById('subCard1').getBoundingClientRect();
var imgTop = offsets.top;
var imgLeft = offsets.left;
img.onload = function () {
context.drawImage(img, imgLeft, imgTop);
};
img.name = 'monImageCarte';
firebase.database().ref('specifyfolder/').set({ // folder you want send it to
thumbnail: canvas.toDataURL('image/png')
});
document.body.appendChild(canvas);
window.open(canvas.toDataURL('image/png'));
monImg = canvas;
}
});
}*/
/*
uploadCarte(infoCartePar: CarteParrainage, img: File) {
// Create a root reference
let storageRef = firebase.storage().ref();
let success = false;
this.folder = '/CarteParrainage/' + infoCartePar.uid + '/carteTemplate';
let theNameOfFile = 'carteTemplate';
// This currently only grabs item 0, TODO refactor it to grab them all
console.log(img);
// Make local copies of services because "this" will be clobbered
let router = this.router;
let folder = this.folder;
let path = `${this.folder}`;
let iRef = storageRef.child(path);
iRef.put(img).then((snapshot) => {
let updates = {};
infoCartePar.carteTemplate.path = path;
infoCartePar.carteTemplate.filename = infoCartePar.name;
infoCartePar.carteTemplate.downloadURL = snapshot.downloadURL;
updates[folder] = infoCartePar.carteTemplate;
firebase.database().ref().update(updates);
});
}
*/
saveOpComm(user: firebase.User, infoOpCom: OperationCommerciale) {
infoOpCom.uid = firebase.database().ref().child('OperationCommercial').push().key;
@ -209,16 +128,10 @@ export class OpCommercialService {
upload(info: any) {
// Create a root reference
let storageRef = firebase.storage().ref();
let success = false;
this.folder = '/OperationCommercial/' + info.uid + '/carteTemplate';
let theNameOfFile = 'carteTemplate';
// This currently only grabs item 0, TODO refactor it to grab them all
if ((<HTMLInputElement>document.getElementById('orangeForm-File')) !== null) {
for (let selectedFile of [(<HTMLInputElement>document.getElementById('orangeForm-File')).files[0]]) {
console.log(selectedFile);
// Make local copies of services because "this" will be clobbered
let router = this.router;
@ -229,8 +142,6 @@ export class OpCommercialService {
let iRef = storageRef.child(path);
iRef.put(selectedFile).then((snapshot) => {
// console.log('Uploaded a blob or file! Now storing the reference at', `/${this.folder}/images/`);
// this.afDb.list(`/${folder}/`).push({ path: path, filename: selectedFile.name });
let updates = {};
info.carteTemplate.path = path;
info.carteTemplate.filename = info.name;
@ -241,26 +152,4 @@ export class OpCommercialService {
}
}
}
delete(image: FireImg) {
console.log('delete');
/*
let storagePath = image.path;
let referencePath = `${this.folder}/images/` + image.key;
// Do these as two separate steps so you can still try delete ref if file no longer exists
// Delete from Storage
firebase.storage().ref().child(storagePath).delete()
.then(
() => {},
(error) => console.error('Error deleting stored file', storagePath)
);
// Delete references
this.afDb.object(referencePath).remove();
*/
}
}

Write Preview
Loading…
Cancel
Save