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

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

Browse Source
thierry
Viiciouss 7 years ago
parent 654a2c9f4b fbc8b99cc0
commit e0bf19bb1e
4 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
src/app/components/home/home.component.html
Unescape Escape View File

@ -66,7 +66,7 @@
<!--Grid column-->
<div class="col-md-4 mb-r wow fadeInRight">
<i class="fa fa-line-chart blue-text"></i>
<h5 class="feature-title">Relax</h5>
<h5 class="feature-title">Avantages</h5>
<p class="grey-text">Les Parrains cumulent des récompenses toute l'année.<br> Les Commerçants voient leurs fréquentation augmenter.</p>
</div>
<!--Grid column-->

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

@ -27,31 +27,11 @@
<input type="file" id="orangeForm-File" accept="image/jpeg, image/png" (click)="fileOKOpCom()" name="file" style="padding-top: 1%;">
</div>
<div class="md-form">
<div class="nav-item dropdown" dropdown>
<a dropdownToggle mdbRippleRadius type="button" class="waves-light" mdbRippleRadius>
<i *ngIf="devise === 'euro'" class="fa fa-euro prefix grey-text dropdown-toggle"></i>
<i *ngIf="devise === 'pourcent'"class="fa fa-percent prefix grey-text dropdown-toggle"></i>
</a>
<div *dropdownMenu class="dropdown-menu dropdown dropdown-primary" role="menu">
<a class="dropdown-item waves-light text-center" (click)="initdevise('euro')"><i class="fa fa-euro" aria-hidden="true"></i></a>
<div class="divider dropdown-divider"></div>
<a class="dropdown-item waves-light text-center" (click)="initdevise('pourcent')"><i class="fa fa-percent" aria-hidden="true"></i></a>
</div>
</div>
<i class="fa fa-euro prefix grey-text"></i>
<input type="number" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageParrain" placeholder="Avantage parrain" step="any" style="margin-left: 5%;">
</div>
<div class="md-form">
<div class="nav-item dropdown" dropdown>
<a dropdownToggle mdbRippleRadius type="button" class="waves-light" mdbRippleRadius>
<i *ngIf="devise2 === 'euro'" class="fa fa-euro prefix grey-text dropdown-toggle"></i>
<i *ngIf="devise2 === 'pourcent'"class="fa fa-percent prefix grey-text dropdown-toggle"></i>
</a>
<div *dropdownMenu class="dropdown-menu dropdown dropdown-primary" role="menu">
<a class="dropdown-item waves-light text-center" (click)="initdevise2('euro')"><i class="fa fa-euro" aria-hidden="true"></i></a>
<div class="divider dropdown-divider"></div>
<a class="dropdown-item waves-light text-center" (click)="initdevise2('pourcent')"><i class="fa fa-percent" aria-hidden="true"></i></a>
</div>
</div>
<i class="fa fa-euro prefix grey-text"></i>
<input type="number" id="orangeForm-Avantage" [(ngModel)]="opComm.avantageFilleul" placeholder="Avantage filleul" step="any" style="margin-left: 5%;">
</div>
</div>

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

@ -32,17 +32,7 @@
</div>
<div class="md-form">
<div class="nav-item dropdown" dropdown>
<a dropdownToggle mdbRippleRadius type="button" class="waves-light" mdbRippleRadius>
<i *ngIf="devise === 'euro'" class="fa fa-euro prefix grey-text dropdown-toggle"></i>
<i *ngIf="devise === 'pourcent'"class="fa fa-percent prefix grey-text dropdown-toggle"></i>
</a>
<div *dropdownMenu class="dropdown-menu dropdown dropdown-primary" role="menu">
<a class="dropdown-item waves-light text-center" (click)="initdevise('euro')"><i class="fa fa-euro" aria-hidden="true"></i></a>
<div class="divider dropdown-divider"></div>
<a class="dropdown-item waves-light text-center" (click)="initdevise('pourcent')"><i class="fa fa-percent" aria-hidden="true"></i></a>
</div>
</div>
<i class="fa fa-euro prefix grey-text"></i>
<input type="text" id="orangeForm-Familyname" [(ngModel)]="valeurRecup" placeholder="Combien le parrain souhaite utiliser ?" style="margin-left: 5%" ><!--[(ngModel)]="filleul.idCard"-->
</div>
<!--

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

@ -83,8 +83,8 @@
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{cartePar.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{cartePar.parrainCarte.familyname}} {{cartePar.parrainCarte.firstname}}</p></div>
<div class="operation-data flex-center"><p class="white-text info-text font-bold">Avantage: {{cartePar.operationCommercialCarte.avantageFilleul}} €</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{parrain.familyname}} {{parrain.firstname}}</p></div>
</div>
<div class="text-center" id="dateFin">
<label class="white-text info-text font-bold">Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>
@ -177,7 +177,7 @@
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{cartePar.name}}</p></div>
<div class="operation-data flex-center"><p class="white-text info-text font-bold">Avantage: {{cartePar.operationCommercialCarte.avantageFilleul}} €</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{cartePar.parrainCarte.familyname}} {{cartePar.parrainCarte.firstname}}</p></div>
</div>
<div class="text-center" id="dateFin">

Write Preview
Loading…
Cancel
Save