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

finition v1

Browse Source
thierry
Viiciouss 7 years ago
parent 03ed7952c9
commit d46b013be5
14 changed files with 112 additions and 79 deletions
Show Stats Download Patch File Download Diff File

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

@ -4,7 +4,7 @@
<div class="col-md-12" id="demandes">
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Nouvelles demandes d'opérations</h4>
<div class="list-group">
<div class="list-group wow fadeInLeftBig">
<div class="card mainCard" *ngFor="let op of opCommDataEnCours | async">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
@ -62,7 +62,7 @@
<div class="col-md-12" id="historique">
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Historique des cartes rejeter</h4>
<div class="list-group">
<div class="list-group wow fadeInLeftBig">
<div class="card mainCard" *ngFor="let op of opCommDataRejeter | async">
<div class="row no-margin" id="testt">

4
src/app/components/admin/list-carte-envoyer/list-carte-envoyer.component.html
Unescape Escape View File

@ -3,7 +3,7 @@
<div class="col-md-12">
<h4 class="font-up mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Apercu de votre opération commerciale</h4>
<div class="card mainCard">
<div class="card mainCard wow fadeInLeft">
<div class="row no-margin" 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">
@ -53,7 +53,7 @@
<div class="col-md-12">
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" 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="list-group wow fadeInLeftBig">
<div class="card mainCard" *ngFor="let crt of carteParList | async">
<div class="row no-margin">
<img class="col-md-6 card-image mb-1 subCard1" src={{crt.carteTemplate.downloadURL}}>

2
src/app/components/admin/list-scan-effecter/list-scan-effecter.component.html
Unescape Escape View File

@ -11,7 +11,7 @@
<button (click)="goToProfil()">Back</button>
-->
<app-nav-admin></app-nav-admin>
<div class="card col-md-12" id="scanPart2">
<div class="card col-md-12 wow fadeInLeft" id="scanPart2">
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 2%;">Liste des scans effectués</h4>
<div class="row">
<!--Grid column-->

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

@ -17,7 +17,7 @@
<!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarteEnvoyer()">Historique carte envoyer</button>-->
<!--<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Profil</button>-->
</div>
<div class="list-group">
<div class="list-group wow fadeInLeftBigBig">
<div class="card mainCard" *ngFor="let op of filteredOpCommercials">
@ -86,7 +86,7 @@
<!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarteEnvoyer()">Historique carte envoyer</button>-->
<!--<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Profil</button>-->
</div>
<div class="list-group">
<div class="list-group wow fadeInLeftBigBig">
<div class="card mainCard" *ngFor="let op of opCommDataBloquer | async">
<div class="row no-margin" id="testt">

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

@ -2,7 +2,7 @@
<div class="container">
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Historique des cartes envoyées</h4>
<!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToOpCom()">Retour aux Opérations commerciales</button>-->
<div class="list-group">
<div class="list-group wow fadeInUpBig">
<div *ngFor="let crt of (carteParData | async); let i = index;">
<div class="card mainCard">
<div class="row no-margin" id="testt">
@ -40,9 +40,9 @@
</div>
<!-- Card footer -->
</div>
<div class="card" [hidden]="!hideme[i]" style="width: 101%; height:20rem; overflow-y: auto;">
<div class="card" [hidden]="!hideme[i]" style="height:20rem; overflow-y: auto;">
<div class="card-body">
<ul class="list-group">
<ul class="list-group wow fadeInDown">
<li class="list-group-item justify-content-between align-items-center" *ngFor="let hst of crt.historique">
<p class="font-weight-normal" style="padding-top: 2%">{{hst}}</p>
</li>

5
src/app/components/carteParrainage/carte-envoyer/carte-envoyer.component.scss
Unescape Escape View File

@ -6,11 +6,6 @@
width: 100%;
}
.view {
height:102%;
width: 103%;
}
.container {
padding-top:5%;
}

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

@ -2,7 +2,7 @@
<div class="container" style="padding-top:5%">
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Liste de vos cartes de parrainage</h4>
<div class="list-group">
<div class="list-group wow fadeInUpBig">
<div class="card mainCard" *ngFor="let crt of carteParrData | async">
<div class="row no-margin">
<img class="col-md-6 card-image mb-1 subCard1" src={{crt.carteTemplate.downloadURL}}>

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

@ -1,6 +1,6 @@
<app-nav-commercant></app-nav-commercant>
<div class="container" style="padding-top: 10%">
<div class="card" style="padding: 5%;">
<div class="card wow fadeInLeft" style="padding: 5%;">
<div class="card-block">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Nouvelle operation commerciale</h5>
<div class="md-form">

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

@ -9,7 +9,7 @@
<div class="container" style="padding-top:10%">
<div class="card">
<div class="card wow fadeInLeft">
<div class="card-block">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Débiter Carte</h5>
<!-- Si cest un filleul existant -->

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

@ -18,7 +18,7 @@
<!--<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarteEnvoyer()">Historique carte envoyer</button>-->
<!--<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Profil</button>-->
</div>
<div class="list-group">
<div class="list-group wow fadeInUpBig">
<div class="card mainCard" *ngFor="let op of opCommData | async">
<div class="row no-margin" id="testt">

4
src/app/components/opCommercial/scanner-carte/scanner-carte.component.html
Unescape Escape View File

@ -8,7 +8,7 @@
<app-nav-commercant></app-nav-commercant>
<div class="container">
<div class="col-md-12" id="scanPart1">
<div class="col-md-12 wow fadeInLeft" id="scanPart1">
<div class="card">
<div class="card-block">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Scanner Carte</h5>
@ -116,7 +116,7 @@
<hr>
<div class="card col-md-12" id="scanPart2">
<div class="card col-md-12 wow fadeInLeft" id="scanPart2">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Liste de vos scans</h5>
<div class="row">
<!--Grid column-->

78
src/app/components/profil/edit-profil/edit-profil.component.html
Unescape Escape View File

@ -1,5 +1,6 @@
<div class="container">
<div *ngIf="(user | async)?.displayName === 'Parrain'" >
<app-nav-parrain></app-nav-parrain>
<!--Grid column-->
<div class="col-md-12" style="padding-right: 2%; padding-left: 2%;">
@ -22,13 +23,14 @@
</div>
<input type="file" name="file-1[]" id="orangeForm-File" class="inputfile inputfile-1" data-multiple-caption="{count} files selected" multiple />
<label class="waves-effect" for="orangeForm-File"><svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" viewBox="0 0 20 17"><path d="M10 0l-5.2 4.9h3.3v5.1h3.8v-5.1h3.3l-5.2-4.9zm9.3 11.5l-3.2-2.1h-2l3.4 2.6h-3.5c-.1 0-.2.1-.2.1l-.8 2.3h-6l-.8-2.2c-.1-.1-.1-.2-.2-.2h-3.6l3.4-2.6h-2l-3.2 2.1c-.4.3-.7 1-.6 1.5l.6 3.1c.1.5.7.9 1.2.9h16.3c.6 0 1.1-.4 1.3-.9l.6-3.1c.1-.5-.2-1.2-.7-1.5z"/></svg> <span>Choisir image</span></label>
<div class="btn-block">
<input type="file" name="file-1[]" id="orangeForm-File" class="inputfile inputfile-1" data-multiple-caption="{count} files selected" multiple />
<label class="waves-effect" for="orangeForm-File"><svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" viewBox="0 0 20 17"><path d="M10 0l-5.2 4.9h3.3v5.1h3.8v-5.1h3.3l-5.2-4.9zm9.3 11.5l-3.2-2.1h-2l3.4 2.6h-3.5c-.1 0-.2.1-.2.1l-.8 2.3h-6l-.8-2.2c-.1-.1-.1-.2-.2-.2h-3.6l3.4-2.6h-2l-3.2 2.1c-.4.3-.7 1-.6 1.5l.6 3.1c.1.5.7.9 1.2.9h16.3c.6 0 1.1-.4 1.3-.9l.6-3.1c.1-.5-.2-1.2-.7-1.5z"/></svg> <span>Choisir image</span></label>
<button class="btn btn-deep-orange" style="margin-top: 2%;" (click)="modifyPasswordSection()">Modifier Email/Mot de passe</button>
</div>
<div *ngIf="(user | async)?.displayName === 'Parrain'" >
<button class="btn btn-deep-orange" (click)="modifyPasswordSection()">Modifier Email/Mot de passe</button>
<div class="card" *ngIf="modifiermdp">
<div class="card" style="margin-bottom: 5%" *ngIf="modifiermdp">
<div class="md-form">
<i class="fa fa-lock prefix grey-text"></i>
<input id="orangeForm-passC" type="password" [(ngModel)]="confirmOldPassword" placeholder="Tapez votre ancien mot de passe" name="confirmOldPasswordPar" #confirmOldPasswordPar="ngModel">
@ -97,13 +99,56 @@
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Familyname" [(ngModel)]="parrain.telephone" placeholder="{{parrain.telephone}}">
</div>
<button class="btn btn-green btn-rounded waves-light" [disabled]="(newPassword != '') && (newPassword != ConfirmPassword)" (click)="modifyProfile()">Modifier Profil</button>
<div class="btn-block">
<button class="btn btn-green btn-rounded waves-light" [disabled]="(newPassword != '') && (newPassword != ConfirmPassword)" (click)="modifyProfile()">Modifier Profil</button>
<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Retour</button>
</div>
</div>
</div>
</div>
<!--/.Card-->
</div>
<div *ngIf="(user | async)?.displayName === 'Commercant'" >
<app-nav-commercant></app-nav-commercant>
<!--Grid column-->
<div class="col-md-12" style="padding-right: 2%; padding-left: 2%;">
<!--Card-->
<div class="card testimonial-card">
<!--Bacground color-->
<div class="card-up aqua-gradient">
</div>
<!--Avatar-->
<div class="avatar"><img src="{{imageProfil}}" class="rounded-circle img-responsive">
</div>
<div class="card-body" style="padding-left: 20%; padding-right: 20%;">
<!--Name-->
<div class="flex-center">
<!--<i class="fa fa-file-picture-o prefix grey-text"></i>-->
<!--<input type="file" id="orangeForm-File" name="file" class="inputfile" accept=".jpg, .jpeg, .png">
<label for="orangeForm-File">Choose a file</label>-->
<div *ngIf="(user | async)?.displayName === 'Commercant'" >
</div>
<button class="btn btn-deep-orange" (click)="modifyPasswordSection()">Modifier Email/Mot de passe</button>
<div class="card" *ngIf="modifiermdp">
<div class="flex-column flex-center">
<input type="file" name="file-1[]" id="orangeForm-File" class="inputfile inputfile-1" data-multiple-caption="{count} files selected" multiple />
<label class="waves-effect" for="orangeForm-File"><svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" viewBox="0 0 20 17"><path d="M10 0l-5.2 4.9h3.3v5.1h3.8v-5.1h3.3l-5.2-4.9zm9.3 11.5l-3.2-2.1h-2l3.4 2.6h-3.5c-.1 0-.2.1-.2.1l-.8 2.3h-6l-.8-2.2c-.1-.1-.1-.2-.2-.2h-3.6l3.4-2.6h-2l-3.2 2.1c-.4.3-.7 1-.6 1.5l.6 3.1c.1.5.7.9 1.2.9h16.3c.6 0 1.1-.4 1.3-.9l.6-3.1c.1-.5-.2-1.2-.7-1.5z"/></svg> <span>Choisir image</span></label>
<button class="btn btn-deep-orange" style="margin-top: 2%;" (click)="modifyPasswordSection()">Modifier Email/Mot de passe</button>
</div>
<div class="card" style="margin-bottom: 5%" *ngIf="modifiermdp">
<div class="md-form">
<i class="fa fa-lock prefix grey-text"></i>
<input id="orangeForm-passC" type="password" [(ngModel)]="confirmOldPassword" placeholder="Tapez votre ancien mot de passe" name="confirmOldPasswordPar" #confirmOldPasswordCommer="ngModel">
@ -135,6 +180,7 @@
</div>
</div>
</div>
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
<input type="text" id="orangeForm-Firstname" [(ngModel)]="commercant.commercialName" placeholder="{{commercant.commercialName}}">
@ -147,10 +193,12 @@
<i class="fa fa-info prefix grey-text"></i>
<input type="text" id="orangeForm-Familyname" [(ngModel)]="commercant.siret" placeholder="{{commercant.siret}}">
</div>
<button class="btn btn-green btn-rounded waves-light" [disabled]="(newPassword != '') && (newPassword != ConfirmPassword)" (click)="modifyProfile()">Modifier Profil</button>
<div class="btn-block">
<button class="btn btn-green btn-rounded waves-light" [disabled]="(newPassword != '') && (newPassword != ConfirmPassword)" (click)="modifyProfile()">Modifier Profil</button>
<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Retour</button>
</div>
</div>
<button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Retour</button>
</div>
@ -158,8 +206,8 @@
<!--/.Card-->
</div>
<!--Grid column-->
</div>
<!--Grid row-->
</div>

73
src/app/components/profil/profil.component.html
Unescape Escape View File

@ -34,18 +34,19 @@
<h4 class="card-title"><p>Salut {{localUser.firstname}} {{localUser.familyname}} {{localUser.uid}} </p></h4>
<hr>
<ul>
<p class="text-left"><label class="text-uppercase">status </label>: {{localUser.status}}</p>
<p class="text-left"><label class="text-uppercase">email </label>: {{localUser.email}}</p>
<p class="text-left"><label class="text-uppercase">emailVerified </label>: {{localUser.emailVerified}}</p>
<p class="text-left"><label class="text-uppercase">familyname </label>: {{localUser.familyname}}</p>
<p class="text-left"><label class="text-uppercase">firstname : </label> {{localUser.firstname}}</p>
<p class="text-left"><label class="text-uppercase">sex </label> : {{localUser.sex}}</p>
<p class="text-left"><label class="text-uppercase">birthday </label> : {{localUser.birthday | date:'dd/MM/yyyy'}}</p>
<p class="text-left"><label class="text-uppercase"> telephone :</label> {{localUser.telephone}}</p>
<p class="text-left"><label class="text-uppercase"> idCard </label>: {{localUser.idCard}}</p>
<p class="text-left"><label class="text-uppase">secretCode </label> : {{localUser.secretCode}}</p>
</ul>
<ul class="list-group">
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">status :</label> {{localUser.status}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">email :</label> {{localUser.email}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">emailVerified :</label> {{localUser.emailVerified}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">familyname :</label> {{localUser.familyname}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">firstname :</label> {{localUser.firstname}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">sex :</label> {{localUser.sex}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">birthday :</label> {{localUser.birthday | date:'dd/MM/yyyy'}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold"> telephone :</label> {{localUser.telephone}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold"> idCard :</label> {{localUser.idCard}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">secretCode :</label> {{localUser.secretCode}}</li>
</ul>
<!--<div *ngFor="let user of opCommData | async">
@ -54,28 +55,10 @@
<button class="btn btn-primary btn-rounded waves-light" (click)="goToCarte()">Cartes</button>
<div *ngIf="(user | async)?.displayName === 'Commercant'" >
<div>
<h4 class="card-title"><p>Salut {{localUser.commercialName}} {{localUser.uid}} </p></h4>
<hr>
<ul>
<p class="text-left"><label class="text-uppercase"> raisonSociale</label> : {{localUser.raisonSociale}}</p>
<p class="text-left"><label class="text-uppercase"> siret </label>: {{localUser.siret}}</p>
<p class="text-left"><label class="text-uppercase">email </label> : {{localUser.email}}</p>
<p class="text-left"><label class="text-uppercase"> emailVerified </label> : {{localUser.emailVerified}}</p>
<p class="text-left"><label class="text-uppercase">dateInscription </label>: {{localUser.dateInscription}}</p>
<p class="text-left"><label class="text-uppercase">status </label>: {{localUser.status}}</p>
</ul>
</div>
<!--<div *ngFor="let user of profileData | async">
User is {{user.commercialName}}
</div>-->
<!--Quotation-->
<!--<p><i class="fa fa-quote-left"></i> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eos, adipisci</p>-->
<div class="btn-block">
<button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()">Editer profile</button>
<button class="btn btn-default btn-rounded waves-light" (click)="goToCarte()">Retour</button>
</div>
<button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()">Editer profile</button>
</div>
@ -124,14 +107,16 @@
<!--Name-->
<h4 class="card-title"><p>Salut {{localUser.commercialName}} {{localUser.uid}} </p></h4>
<hr>
<ul>
<p class="text-left"><label class="text-uppercase"> raisonSociale</label> : {{localUser.raisonSociale}}</p>
<p class="text-left"><label class="text-uppercase"> siret </label>: {{localUser.siret}}</p>
<p class="text-left"><label class="text-uppercase">email </label> : {{localUser.email}}</p>
<p class="text-left"><label class="text-uppercase"> emailVerified </label> : {{localUser.emailVerified}}</p>
<p class="text-left"><label class="text-uppercase">dateInscription </label>: {{localUser.dateInscription}}</p>
<p class="text-left"><label class="text-uppercase">status </label>: {{localUser.status}}</p>
</ul>
<ul class="list-group wow fadeInLeft">
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold"> Raison sociale :</label> {{localUser.raisonSociale}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Numéro de siret :</label> {{localUser.siret}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Email :</label> {{localUser.email}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold"> emailVerified :</label> {{localUser.emailVerified}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Date d'inscription :</label> {{localUser.dateInscription}}</li>
<li class="list-group-item text-left"><label class="h5-responsive mt-1 font-bold">Status :</label> {{localUser.status}}</li>
</ul>
<!--<div *ngFor="let user of profileData | async">
User is {{user.commercialName}}
@ -139,8 +124,10 @@
<!--Quotation-->
<!--<p><i class="fa fa-quote-left"></i> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eos, adipisci</p>-->
<button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()">Editer profile</button>
<div class="btn-block">
<button class="btn btn-orange btn-rounded waves-light" (click)="goToEditProfile()">Editer profile</button>
<button class="btn btn-default btn-rounded waves-light" (click)="goToOpCom()">Retour</button>
</div>
</div>

3
src/app/components/profil/profil.component.scss
Unescape Escape View File

@ -0,0 +1,3 @@
.list-group > .list-group-item {
padding-left: 5%;
}
Write Preview
Loading…
Cancel
Save