From c485d2d50d26da48047ba2f4da4935eb594625a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= <sebastien.andre@arolla.fr>
Date: Thu, 24 Dec 2020 20:45:56 +0100
Subject: [PATCH] =?UTF-8?q?Petites=20=C3=A9volutions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                             | 10 ++++++++++
 .../src/app/create-user/create-user.component.html     |  3 +--
 .../src/app/create-user/create-user.component.ts       |  8 ++++----
 .../list-of-aircrafts/list-of-aircrafts.component.html |  4 ++--
 .../src/app/list-of-jumps/list-of-jumps.component.html |  1 +
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4870f27..270e942 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,13 @@
 /Back/skydiveLogs-api.Business/bin
 /Back/dist
 /Back/skydiveLogs-api.v3.ncrunchsolution.user
+/Back/skydiveLogs-api/Data/Init/twinOtter.jpg
+/Back/skydiveLogs-api/Data/Init/skyvan.jpg
+/Back/skydiveLogs-api/Data/Init/Pilatus.png
+/Back/skydiveLogs-api/Data/Init/pac.jpg
+/Back/skydiveLogs-api/Data/Init/dornier.jpg
+/Back/skydiveLogs-api/Data/Init/casa.jpg
+/Back/skydiveLogs-api/Data/Init/caravan.jpg
+/Back/skydiveLogs-api/Data/Init/206.jpg
+/Back/skydiveLogs-api/Data/__JumpsDb.db
+/Back/skydiveLogs-api/Data/_JumpsDb.db
diff --git a/Front/skydivelogs-app/src/app/create-user/create-user.component.html b/Front/skydivelogs-app/src/app/create-user/create-user.component.html
index b48bb48..37ba438 100644
--- a/Front/skydivelogs-app/src/app/create-user/create-user.component.html
+++ b/Front/skydivelogs-app/src/app/create-user/create-user.component.html
@@ -46,8 +46,7 @@
     </mat-form-field>
   </p>
 
-  <button [disabled]="loading" mat-raised-button color="accent">
-    <span *ngIf="loading" class="spinner-border spinner-border-sm mr-1"></span>
+  <button [disabled]="!createForm.valid" mat-raised-button color="accent">
     Create user and login
   </button>
   <div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>
diff --git a/Front/skydivelogs-app/src/app/create-user/create-user.component.ts b/Front/skydivelogs-app/src/app/create-user/create-user.component.ts
index a847b25..977fe89 100644
--- a/Front/skydivelogs-app/src/app/create-user/create-user.component.ts
+++ b/Front/skydivelogs-app/src/app/create-user/create-user.component.ts
@@ -14,7 +14,7 @@ import { User } from "../../models/user";
 })
 export class CreateUserComponent implements OnInit {
   createForm: FormGroup;
-  loading = false;
+  invalidForm = true;
   submitted = false;
   returnUrl: string;
   error = "";
@@ -55,12 +55,12 @@ export class CreateUserComponent implements OnInit {
   }
 
   onCreateSubmit() {
-    this.loading = true;
+    this.invalidForm = false;
     this.submitted = true;
 
     // stop here if form is invalid
     if (this.createForm.invalid) {
-      this.loading = true;
+      this.invalidForm = true;
       return;
     }
 
@@ -80,7 +80,7 @@ export class CreateUserComponent implements OnInit {
         },
         error => {
           this.error = error;
-          this.loading = false;
+          this.invalidForm = false;
         }
       );
   }
diff --git a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html
index 975e126..32993be 100644
--- a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html
+++ b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html
@@ -15,14 +15,14 @@
 
       <ng-container matColumnDef="imageData">
         <th mat-header-cell *matHeaderCellDef>Image</th>
-        <td mat-cell *matCellDef="let element"><img src="{{element.imageData}}" alt="No image"></td>
+        <td mat-cell *matCellDef="let element"><img src="{{element.imageData}}" alt="No image" style="width: 128px;"></td>
       </ng-container>
 
       <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr>
       <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
     </table>
   </div>
-  <mat-paginator [length]="resultsLength" [pageSize]="5"></mat-paginator>
+  <mat-paginator [length]="resultsLength" [pageSize]="10"></mat-paginator>
 
   <ng-template #loading>
     <mat-progress-spinner [mode]="'indeterminate'"></mat-progress-spinner>
diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
index b15b645..432d174 100644
--- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
+++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
@@ -5,6 +5,7 @@
         <th mat-header-cell *matHeaderCellDef></th>
         <td mat-cell *matCellDef="let element" style="text-align: left; cursor: pointer;">
           <mat-icon aria-hidden="false" aria-label="All informations of the jump">info</mat-icon>
+          <span [innerHTML]="element.gear.Name , element.withCutaway, element.notes"></span>
         </td>
       </ng-container>