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

7 years ago · 4b61944583
parent 537b5a8491 2ba082ddb7
commit 4b61944583
7 changed files with 63 additions and 57 deletions
--- a/npm-debug.log.56135916
+++ b/npm-debug.log.56135916
--- a/src/app/components/carteParrainage/carte-parrainage/carte-parrainage.component.html
+++ b/src/app/components/carteParrainage/carte-parrainage/carte-parrainage.component.html
@ -1,8 +1,8 @@
 <div class="container" style="padding-top:5%">

-  <h4 class="h5 text-center mb-4">Liste de vos cartes de parrainage</h4>
+  <h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste de vos cartes de parrainage</h4>
  <div class="btn-group">
-    <button (click)="goToProfil()">Profil</button>
+    <button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Profil</button>

  </div>
  <div class="list-group">
--- a/src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.html
+++ b/src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.html
@ -1,4 +1,4 @@
-<p>
+<!--<p>
  envoyer-carte works!
 </p>

@ -6,32 +6,30 @@
  <li *ngFor="let par of parrainExistList | async">
    Parrains: {{par.firstname}} {{par.familyname}}
  </li>
-</ul>
-
+</ul>-->


+<div class="container" style="padding-top:10%">
 <div class="card">
  <div class="well">
    <p class="h5 text-center mb-4">Envoyer Carte</p>
-
-    <label>
-      <form class="form-inline">
-        <div class="md-form">
-          <input name="group2" type="radio" class="with-gap" id="Newparrain" value="Newparrain"  (click)="initParSelect()" [(ngModel)]="radioParrain">
-          <label for="Newparrain">Nouveau Parrain</label>
-        </div>
-        <div class="md-form">
-          <input name="group2" type="radio" class="with-gap" id="ParrainExist" value ="ParrainExist" (click)="initParSelect()" [(ngModel)]="radioParrain">
-          <label for="ParrainExist">Parrain Existant</label>
-        </div>
-        <div class="md-form">
-          <input name="group2" type="radio" class="with-gap" id="ParrainAffi" value ="ParrainAffi" (click)="initParSelect()" [(ngModel)]="radioParrain">
-          <label for="ParrainAffi">Parrain Affilier</label>
-        </div>
-      </form>
-    </label>
+    <p class="text-center mb-4" style="padding-top: 2%;">Choisissez quelle type de parrain à qui envoyer la carte</p>
+    <form class="form-inline flex-center">
+      <div class="md-form" style="padding-left: 2%;">
+        <input name="group2" type="radio" class="with-gap" id="Newparrain" value="Newparrain"  (click)="initParSelect()" [(ngModel)]="radioParrain">
+        <label for="Newparrain">Nouveau Parrain</label>
+      </div>
+      <div class="md-form" style="padding-left: 2%;">
+        <input name="group2" type="radio" class="with-gap" id="ParrainExist" value ="ParrainExist" (click)="initParSelect()" [(ngModel)]="radioParrain">
+        <label for="ParrainExist">Parrain Existant</label>
+      </div>
+      <div class="md-form" style="padding-left: 2%;">
+        <input name="group2" type="radio" class="with-gap" id="ParrainAffi" value ="ParrainAffi" (click)="initParSelect()" [(ngModel)]="radioParrain">
+        <label for="ParrainAffi">Parrain Affilier</label>
+      </div>
+    </form>
    <!-- Si cest un nouveau parrain -->
-    <div *ngIf="radioParrain === 'Newparrain'" class="alert alert-danger">
+    <div *ngIf="radioParrain === 'Newparrain'">

      <div class="md-form">
        <i class="fa fa-user prefix grey-text"></i>
@ -47,7 +45,7 @@
          <input name="group3" type="radio" class="with-gap" id="homme" value="Homme" [(ngModel)]="parrain.sex">
          <label for="homme">Homme</label>
        </div>
-        <div class="md-form">
+        <div class="md-form" style="padding-left: 2%;">
          <input name="group3" type="radio" class="with-gap" id="femme" value="Femme" [(ngModel)]="parrain.sex">
          <label for="femme">Femme</label>
        </div>
@ -69,14 +67,14 @@
        données, y compris notre Utilisation des cookies.
      </label>
      <div class="text-center" style="margin-top:5%">
-        <button class="btn btn-deep-orange" [disabled]="email.errors" (click)="registerNewParrain()">Creer nouveau parrain & envoyer carte</button>
+        <button class="btn btn-light-green waves-light" [disabled]="email.errors" (click)="registerNewParrain()">Creer nouveau parrain & envoyer carte</button>
        <button class="btn btn-cyan" (click)="goToOpComm()">Back</button>
      </div>
    </div>
    <!-- Fin Si cest un nouveau parrain -->

    <!-- Si cest un parrain existant -->
-    <div *ngIf="radioParrain === 'ParrainExist'" class="alert alert-danger">
+    <div *ngIf="radioParrain === 'ParrainExist'">
      <p>{{parSelect}}</p>
      <div class="dropdown" dropdown>
        <button dropdownToggle type="button" class="btn btn-primary dropdown-toggle waves-light" mdbRippleRadius>
@ -89,7 +87,7 @@
        </div>
      </div>

-      <div class="md-form">
+      <div class="md-form" style="padding-top:2%;">
        <i class="fa fa-birthday-cake prefix grey-text"></i>
        <input type="date" id="orangeForm-Birthday" placeholder="Birthday">
      </div>
@ -100,14 +98,14 @@
        données, y compris notre Utilisation des cookies.
      </label>
      <div class="text-center" style="margin-top:5%">
-        <button class="btn btn-deep-orange" [disabled]="parSelect === ''" (click)="creerCartePar()">Envoyer Carte et affilié le parrain</button>
+        <button class="btn btn-light-green waves-light" [disabled]="parSelect === ''" (click)="creerCartePar()">Envoyer Carte et affilié le parrain</button>
        <button class="btn btn-cyan" (click)="goToOpComm()">Back</button>
      </div>
    </div>
    <!-- Fin Si cest un parrain existant -->

    <!-- Si cest un parrain connu et affilié -->
-    <div *ngIf="radioParrain === 'ParrainAffi'" class="alert alert-danger">
+    <div *ngIf="radioParrain === 'ParrainAffi'">
      <p>{{parSelect}}</p>
      <div class="dropdown" dropdown>
        <button dropdownToggle type="button" class="btn btn-primary dropdown-toggle waves-light" mdbRippleRadius>
@ -119,7 +117,7 @@
          <a class="dropdown-item" *ngFor="let parAf of parrainAffListTemp" (click)="getIdParrain(parAf.uid)">{{parAf.firstname}}</a>
        </div>
      </div>
-        <div class="md-form">
+        <div class="md-form" style="padding-top: 2%;">
          <i class="fa fa-birthday-cake prefix grey-text"></i>
          <input type="date" id="orangeForm-Birthday" placeholder="Birthday">
        </div>
@ -130,7 +128,7 @@
          données, y compris notre Utilisation des cookies.
        </label>
        <div class="text-center" style="margin-top:5%">
-          <button class="btn btn-deep-orange" [disabled]="parSelect === ''" (click)="register()">S'inscrire</button>
+          <button class="btn btn-light-green waves-light" [disabled]="parSelect === ''" (click)="register()">S'inscrire</button>
          <button class="btn btn-cyan" (click)="goToOpComm()">Back</button>
        </div>
      </div>
@ -138,3 +136,4 @@
    </div>

 </div>
+</div>
--- a/src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.ts
+++ b/src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.ts
@ -186,7 +186,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
    if (this.radioParrain === 'ParrainAffi'){
      for (let i = 0; i < this.parrainAffListTemp.length; i++) {
        if (this.parrainAffListTemp[i].uid === parUid) {
-          this.parSelect = 'vous avez selectionner le parrain : '
+          this.parSelect = 'Vous avez selectionner le parrain : '
            + this.parrainAffListTemp[i].familyname + ' '
            + this.parrainAffListTemp[i].firstname;
        }
@ -195,7 +195,7 @@ export class EnvoyerCarteComponent implements OnInit, OnDestroy {
      this.parrainExistList.forEach(parEx => {
        parEx.forEach(elementparEx => {
          if (elementparEx.uid === parUid){
-            this.parSelect = 'vous avez selectionner le parrain : '
+            this.parSelect = 'Vous avez selectionner le parrain : '
              + elementparEx.familyname + ' '
              + elementparEx.firstname;
          }
--- a/src/app/components/opCommercial/op-commercial/op-commercial.component.html
+++ b/src/app/components/opCommercial/op-commercial/op-commercial.component.html
@ -11,10 +11,10 @@
 <button (click)="goToCreaOpCom()">Nouvelle opération Commercial</button>
 <button (click)="goToProfil()">Back</button>
 -->
-  <h4 class="h5 text-center mb-4">Liste de vos operations commercials</h4>
-  <div class="btn-group">
-    <button (click)="goToCreaOpCom()">Nouvelle opération Commercial</button>
-    <button (click)="goToProfil()">Profil</button>
+  <h4 class="h5 text-center mb-4" style="padding-top: 5%;">Liste de vos operations commercials</h4>
+  <div class="row" style="padding-top: 5%;">
+    <button class="btn btn-primary btn-rounded waves-light" (click)="goToCreaOpCom()">Nouvelle opération Commercial</button>
+    <button class="btn btn-default btn-rounded waves-light" (click)="goToProfil()">Profil</button>

  </div>
  <div class="list-group">
@ -34,9 +34,17 @@
            </div>
          </div>
        </div>
-        <div class="col-md-6 card subCard2">
-          <label>Operation Commerciale: {{op.name}}</label>
-          <button (click)="goToEnCart(op.uid)">Envoyer carte</button>
+        <div class="col-md-6 subCard2">
+          <div class="row">
+            <div class="col-md-8" style="padding-top: 5%;">
+              <label>Operation Commerciale: {{op.name}}</label>
+            </div>
+            <div class="col-md-2" style="padding-top: 5%;">
+              <button class="btn btn-outline-primary btn-rounded" (click)="goToEnCart(op.uid)">Envoyer</button>
+              <button class="btn btn-outline-default btn-rounded">Scanner</button>
+              <button class="btn btn-outline-info btn-rounded">Débiter</button>
+            </div>
+          </div>
        </div>
      </div>
    </div>
--- a/src/app/components/profil/profil.component.html
+++ b/src/app/components/profil/profil.component.html
@ -1,11 +1,11 @@
-<div class="container" style="padding-top: 5%">
-  <p>
+<div class="container" style="padding-top: 10%">
+  <!--<p>
    Profil
  </p>

  <div> ID: {{ (user | async)?.uid }} </div>
  <div> Email: {{ (user | async)?.email }} </div>
-  <div> Statut: {{ (user | async)?.displayName }} </div>
+  <div> Statut: {{ (user | async)?.displayName }} </div> -->


 <!--Grid row-->
@ -35,7 +35,6 @@
              <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">password </label> : {{localUser.password}}</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>
@ -46,10 +45,11 @@
            </ul>
          </div>

-          <div *ngFor="let user of opCommData | async">
+          <!--<div *ngFor="let user of opCommData | async">
            User is {{user.firstname}}
-          </div>
-          <button (click)="goToCarte()">Cartes</button>
+          </div>-->
+
+          <button class="btn btn-primary btn-rounded waves-light" (click)="goToCarte()">Cartes</button>
        </div>

        <div *ngIf="(user | async)?.displayName === 'Commercant'" >
@ -62,22 +62,20 @@
              <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"> password </label> : {{localUser.password}}</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">
+          <!--<div *ngFor="let user of profileData | async">
            User is {{user.commercialName}}
-          </div>
-          <button (click)="goToOpCom()">Opération Commerciales</button>
+          </div>-->
+          <!--Quotation-->
+          <!--<p><i class="fa fa-quote-left"></i> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eos, adipisci</p>-->
+          <button class="btn btn-primary btn-rounded waves-light" (click)="goToOpCom()">Opération Commerciales</button>
        </div>
-        <button (click)="logout()"> <!--*ngIf="(user | async)?.uid"-->Logout</button>
-
+        <button class="btn btn-default btn-rounded waves-light" (click)="logout()"> <!--*ngIf="(user | async)?.uid"-->Logout</button>

-        <!--Quotation-->
-        <p><i class="fa fa-quote-left"></i> Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eos, adipisci</p>
      </div>

    </div>
--- a/src/app/components/register/register.component.html
+++ b/src/app/components/register/register.component.html
@ -1,6 +1,7 @@
 <div class="card">
  <div class="well">
    <p class="h5 text-center mb-4">Sign up</p>
+    <p class="text-center mb-4" style="padding-top: 2%;">Etes vous parrain ou commercant ?</p>

    <label>
      <form class="form-inline">
@ -15,7 +16,7 @@
      </form>
    </label>
 <!--Si cest un parrain-->
-    <div *ngIf="currentUser.status === 'Parrain'" class="alert alert-danger">
+    <div *ngIf="currentUser.status === 'Parrain'">

      <div class="md-form">
        <i class="fa fa-user prefix grey-text"></i>
@ -87,7 +88,7 @@
    <!--Fin Si cest un parrain-->

    <!--Si cest un commercant-->
-    <div *ngIf="currentUser.status === 'Commercant'" class="alert alert-danger">
+    <div *ngIf="currentUser.status === 'Commercant'">

      <div class="md-form">
        <i class="fa fa-institution prefix grey-text"></i>