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

Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry

Browse Source
thierry
Tmadkaud 7 years ago
parent 0f8be66f69 f56b854fa9
commit aeb31161f3
13 changed files with 167 additions and 73 deletions
Show Stats Download Patch File Download Diff File

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

@ -6,7 +6,7 @@
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Nouvelles demandes d'opérations</h4>
<div class="list-group">
<div class="card mainCard" *ngFor="let op of opCommDataEnCours | async">
<div class="row" id="testt">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
@ -16,18 +16,16 @@
</div>
</div>
<div class="row secondRow">
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row">
<div class="card-block row no-margin">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{op.validationXJC}}</label>
<label>Status: {{op.status}}</label>
<label>Operation Commerciale: {{op.name}}</label>
<label>Commercant: {{op.commercantOpCom.commercialName}}</label>
</div>
@ -46,11 +44,17 @@
<button type="button" class="btn btn-danger btn-rounded waves-light" mdbRippleRadius (click)="rejeter(op.uid)">Rejeter</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
<h100 class="float-right">Du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</h100>
</div>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-check-square-o" aria-hidden="true"></i>Validation: {{op.validationXJC}}</li>
<li class="float-right" style="padding-right: 2%"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut: {{op.status}}</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
</div>
</div>
@ -62,7 +66,7 @@
<div class="list-group">
<div class="card mainCard" *ngFor="let op of opCommDataRejeter | async">
<div class="row" id="testt">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
@ -72,18 +76,16 @@
</div>
</div>
<div class="row secondRow">
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row">
<div class="card-block row no-margin">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{op.validationXJC}}</label>
<label>Status: {{op.status}}</label>
<label>Operation Commerciale: {{op.name}}</label>
</div>
<div id="opAvantages">
@ -100,11 +102,17 @@
<button class="btn btn-outline-primary btn-rounded" (click)="valider(op.uid)">Valider</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
<h100 class="float-right">Du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</h100>
</div>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-check-square-o" aria-hidden="true"></i>Validation: {{op.validationXJC}}</li>
<li class="float-right" style="padding-right: 2%"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut: {{op.status}}</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
</div>
</div>

5
src/app/components/admin/demande-op-commercial/demande-op-commercial.component.scss
Unescape Escape View File

@ -90,6 +90,11 @@
padding-top: 5%;
}
.no-margin {
margin-right: 0;
margin-left: 0;
}

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

@ -4,27 +4,26 @@
<div class="col-md-12">
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Apercu de votre opération commerciale</h4>
<div class="card mainCard">
<div class="row" id="testt">
<div class="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">
<div class="view">
<div class="row firstRow">
<div class="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{opComm?.commercantOpCom.commercialName}}</div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + opComm?.commercantOpCom.image.downloadURL + ')'}">
</div>
</div>
<div class="row secondRow">
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{opComm?.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{opComm?.uid}}</p></div>
</div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row">
<div class="card-block row no-margin">
<div class="col-md-12" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{opComm?.validationXJC}}</label>
<label>Operation Commerciale: {{opComm?.name}}</label>
</div>
<div id="opAvantages">
@ -38,11 +37,17 @@
</div>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
<h100 class="float-right">Du {{opComm?.dateDebut | date:'dd/MM/yyyy'}} au {{opComm?.dateFin | date:'dd/MM/yyyy'}}</h100>
</div>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-check-square-o" aria-hidden="true"></i>Validation: {{opComm?.validationXJC}}</li>
<li class="float-right" style="padding-right: 2%"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut: {{opComm?.status}}</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{opComm?.dateDebut | date:'dd/MM/yyyy'}} au {{opComm?.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
</div>
@ -50,7 +55,7 @@
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste des cartes de parrainages issu de l'opération commerciale ci-dessus : {{opComm?.name}}</h4>
<div class="list-group">
<div class="card mainCard" *ngFor="let crt of carteParList | async">
<div class="row">
<div class="row no-margin">
<img class="col-md-6 card-image mb-1 subCard1" src={{crt.carteTemplate.downloadURL}}>
<!--<div class="col-md-6 card-image mb-1 subCard1" [ngStyle]="{ 'background-image': 'url(' + crt.carteTemplate.downloadURL + ')'}">
@ -69,15 +74,20 @@
</div>
</div>
</div>-->
<div class="col-md-6 card subCard2">
<label>Status de la carte: {{crt.status}}</label>
<label>date Debut: {{crt.dateDebut | date:'dd/MM/yyyy'}}</label>
<label>date Fin: {{crt.dateFin | date:'dd/MM/yyyy'}}</label>
<label>avantage Cumule: {{crt.avantageCumule}}</label>
<label>avantage Recuperer: {{crt.avantageRecuperer}}</label>
<div class="col-md-6 card subCard2issu">
<label>ID de la carte: {{crt.uid}}</label>
<label>Avantage Cumule: {{crt.avantageCumule}}</label>
<label>Avantage Recuperer: {{crt.avantageRecuperer}}</label>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut: {{crt.status}}</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{crt.dateDebut | date:'dd/MM/yyyy'}} au {{crt.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
</div>
</div>

18
src/app/components/admin/list-carte-envoyer/list-carte-envoyer.component.scss
Unescape Escape View File

@ -19,6 +19,19 @@
background-size:20% auto;
background-position : center;
}
.subCard2 {
display: flex;
justify-content: center;
}
.subCard2issu {
padding-left: 5%;
display: flex;
justify-content: center;
}
.subCard2issu > label {
padding-bottom: 2%;
}
.firstRow {
height: 50%;
@ -81,3 +94,8 @@
flex-direction: column;
padding-top: 5%;
}
.no-margin {
margin-right: 0;
margin-left: 0;
}

5
src/app/components/admin/list-scan-effecter/list-scan-effecter.component.scss
Unescape Escape View File

@ -82,5 +82,10 @@
padding-top: 5%;
}
.no-margin {
margin-right: 0;
margin-left: 0;
}

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

@ -21,28 +21,26 @@
<div class="card mainCard" *ngFor="let op of filteredOpCommercials">
<div class="row" id="testt">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="row firstRow">
<div class="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
</div>
<div class="row secondRow">
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row">
<div class="card-block row no-margin">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{op.validationXJC}}</label>
<label>Status: {{op.status}}</label>
<label>Operation Commerciale: {{op.name}}</label>
<label>Commercant: {{op.commercantOpCom.commercialName}}</label>
</div>
@ -63,11 +61,17 @@
<button class="btn btn-outline-info btn-rounded" (click)="goToScanEffectuer(op.uid)">Scans</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
<h100 class="float-right">Du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</h100>
</div>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-check-square-o" aria-hidden="true"></i>Validation: {{op.validationXJC}}</li>
<li class="float-right" style="padding-right: 2%"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut: {{op.status}}</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
</div>
</div>
@ -85,28 +89,26 @@
<div class="list-group">
<div class="card mainCard" *ngFor="let op of opCommDataBloquer | async">
<div class="row" id="testt">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="row firstRow">
<div class="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
</div>
<div class="row secondRow">
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row">
<div class="card-block row no-margin">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{op.validationXJC}}</label>
<label>Status: {{op.status}}</label>
<label>Operation Commerciale: {{op.name}}</label>
<label>Commercant: {{op.commercantOpCom.commercialName}}</label>
</div>
@ -124,11 +126,17 @@
<button class="btn btn-outline-primary btn-rounded" (click)="debloquer(op)">Débloquer</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
<h100 class="float-right">Du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</h100>
</div>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-check-square-o" aria-hidden="true"></i>Validation: {{op.validationXJC}}</li>
<li class="float-right" style="padding-right: 2%"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut: {{op.status}}</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
</div>
</div>

5
src/app/components/admin/liste-op-commercial/liste-op-commercial.component.scss
Unescape Escape View File

@ -82,5 +82,10 @@
padding-top: 5%;
}
.no-margin {
margin-right: 0;
margin-left: 0;
}

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

@ -5,17 +5,16 @@
<div class="list-group">
<div *ngFor="let crt of (carteParData | async); let i = index;">
<div class="card mainCard">
<div class="row" id="testt">
<div class="row no-margin" id="testt">
<img class="col-md-6 card-image mb-1 subCard1" id="image1" alt="Responsive image" src={{crt.carteTemplate.downloadURL}}>
<!--<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{crt.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
</div>-->
<div class="col-md-6 card subCard2">
<div class="card-block row">
<div class="card-block row no-margin">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>ID Operation Commerciale: {{crt.operationCommercialID}}</label>
<label>Status de la carte: {{crt.status}}</label>
<label>Nom: {{crt.parrainCarte.familyname}}</label>
<label>Prénom: {{crt.parrainCarte.firstname}}</label>
<label>ID: {{crt.uid}}</label>
@ -30,11 +29,16 @@
<!--<button class="btn btn-outline-info btn-rounded" (click)="sectionToImage(op.carteTemplate.downloadURL, commercant.image.downloadURL)">screenShot</button>-->
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
<h100 class="float-right">Du {{crt.dateDebut | date:'dd/MM/yyyy'}} au {{crt.dateFin | date:'dd/MM/yyyy'}}</h100>
</div>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut: {{crt.status}}</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valabe du {{crt.dateDebut | date:'dd/MM/yyyy'}} au {{crt.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
<div class="card" [hidden]="!hideme[i]" style="width: 101%; height:20rem; overflow-y: auto;">
<div class="card-body">

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

@ -84,3 +84,8 @@
flex-direction: column;
padding-top: 5%;
}
.no-margin {
margin-right: 0;
margin-left: 0;
}

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

@ -4,7 +4,7 @@
<h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste de vos cartes de parrainage</h4>
<div class="list-group">
<div class="card mainCard" *ngFor="let crt of carteParrData | async">
<div class="row">
<div class="row no-margin">
<img class="col-md-6 card-image mb-1 subCard1" src={{crt.carteTemplate.downloadURL}}>
<!--<div class="col-md-6 card-image mb-1 subCard1" [ngStyle]="{ 'background-image': 'url(' + crt.carteTemplate.downloadURL + ')'}">
@ -24,14 +24,19 @@
</div>
</div>-->
<div class="col-md-6 card subCard2">
<label>Status de la carte: {{crt.status}}</label>
<label>date Debut: {{crt.dateDebut | date:'dd/MM/yyyy'}}</label>
<label>date Fin: {{crt.dateFin | date:'dd/MM/yyyy'}}</label>
<label>avantage Cumule: {{crt.avantageCumule}}</label>
<label>avantage Recuperer: {{crt.avantageRecuperer}}</label>
<label>ID de la carte: {{crt.uid}}</label>
<label>Avantage cumule: {{crt.avantageCumule}}</label>
<label>Avantage recuperer: {{crt.avantageRecuperer}}</label>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut: {{crt.status}}</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valabe du {{crt.dateDebut | date:'dd/MM/yyyy'}} au {{crt.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
</div>

15
src/app/components/carteParrainage/carte-parrainage/carte-parrainage.component.scss
Unescape Escape View File

@ -16,6 +16,16 @@
background-position : center;
}
.subCard2 {
display: flex;
justify-content: center;
padding-left: 10%;
}
.subCard2 > label {
padding-bottom: 5%;
}
.firstRow {
height: 50%;
}
@ -44,3 +54,8 @@
.cardPart4 {
//background-color: yellow;
}
.no-margin {
margin-right: 0;
margin-left: 0;
}

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

@ -20,17 +20,17 @@
<div class="list-group">
<div class="card mainCard" *ngFor="let op of opCommData | async">
<div class="row" id="testt">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="row firstRow">
<div class="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
</div>
<div class="row secondRow">
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
@ -40,7 +40,6 @@
<div class="card-block row">
<div class="col-md-8" id="subCard2Part1">
<div id="opTitle">
<label>Validation: {{op.validationXJC}}</label>
<label>Operation Commerciale: {{op.name}}</label>
</div>
<div id="opAvantages">
@ -59,11 +58,17 @@
<button class="btn btn-outline-info btn-rounded" [disabled]="(op.validationXJC === 'En Cours') || (op.validationXJC === 'rejeté') || (op.validationXJC === 'bloqué')" (click)="goToDebiterCart(op.uid)">Débiter</button>
</div>
</div>
<div class="card-block col-md-12" id="subCard2Part3">
<h100 class="float-right">Du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</h100>
</div>
</div>
</div>
<!-- Card footer -->
<div class="card-data" id="footerCard">
<ul>
<li class="float-right"><i class="fa fa-check-square-o" aria-hidden="true"></i>Validation: {{op.validationXJC}}</li>
<li class="float-right" style="padding-right: 2%"><i class="fa fa-info-circle" aria-hidden="true"></i>Statut:</li>
<li class="float-left"><i class="fa fa-clock-o"></i>Valable du {{op.dateDebut | date:'dd/MM/yyyy'}} au {{op.dateFin | date:'dd/MM/yyyy'}}</li>
</ul>
</div>
<!-- Card footer -->
</div>
</div>
</div>

11
src/app/components/opCommercial/op-commercial/op-commercial.component.scss
Unescape Escape View File

@ -59,11 +59,6 @@
padding-top: 5%;
}
#subCard2Part3 {
padding-right: 5%;
padding-top: 0%;
padding-bottom: 1%;
}
#opTitle {
display: flex;
@ -83,4 +78,10 @@
}
.no-margin {
margin-right: 0;
margin-left: 0;
}

Write Preview
Loading…
Cancel
Save