sandre/SkydiveLogs
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ajout d'un message de chargement

Browse Source
This commit is contained in:
Sébastien André
2019-11-24 18:39:18 +01:00
parent 3d25119757
commit bab92186dd
9 changed files with 143 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Back/skydiveLogs-api/Data/JumpsDb-log.db
View File

Binary file not shown.

BIN
Back/skydiveLogs-api/Data/JumpsDb.db
View File

Binary file not shown.

29
Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html
View File

@@ -1,15 +1,18 @@
<table mat-table [dataSource]="dataSourceTable"> <div *ngIf="dataSourceTable != null else loading">
<ng-container matColumnDef="id"> <table mat-table [dataSource]="dataSourceTable">
<th mat-header-cell *matHeaderCellDef>ID</th> <ng-container matColumnDef="id">
<td mat-cell *matCellDef="let element">{{element.id}}</td> <th mat-header-cell *matHeaderCellDef>ID</th>
</ng-container> <td mat-cell *matCellDef="let element">{{element.id}}</td>
</ng-container>
<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>Name</th> <th mat-header-cell *matHeaderCellDef>Name</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td> <td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table> </table>
<mat-paginator [length]="resultsLength" [pageSize]="20"></mat-paginator> <mat-paginator [length]="resultsLength" [pageSize]="20"></mat-paginator>
</div>
<ng-template #loading>Waiting...</ng-template>

69
Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html
View File

@@ -1,37 +1,40 @@
<table mat-table [dataSource]="dataSourceTable"> <div *ngIf="dataSourceTable != null else loading">
<ng-container matColumnDef="id"> <table mat-table [dataSource]="dataSourceTable">
<th mat-header-cell *matHeaderCellDef>ID</th> <ng-container matColumnDef="id">
<td mat-cell *matCellDef="let element">{{element.id}}</td> <th mat-header-cell *matHeaderCellDef>ID</th>
</ng-container> <td mat-cell *matCellDef="let element">{{element.id}}</td>
</ng-container>
<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>Name</th> <th mat-header-cell *matHeaderCellDef>Name</th>
<td mat-cell *matCellDef="let element">{{element.name}} <a href='http://{{element.website}}'>ici</a></td> <td mat-cell *matCellDef="let element">{{element.name}} <a href='http://{{element.website}}'>ici</a></td>
</ng-container> </ng-container>
<ng-container matColumnDef="latitude"> <ng-container matColumnDef="latitude">
<th mat-header-cell *matHeaderCellDef>Latitude</th> <th mat-header-cell *matHeaderCellDef>Latitude</th>
<td mat-cell *matCellDef="let element">{{element.latitude}}</td> <td mat-cell *matCellDef="let element">{{element.latitude}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="longitude"> <ng-container matColumnDef="longitude">
<th mat-header-cell *matHeaderCellDef>Longitude</th> <th mat-header-cell *matHeaderCellDef>Longitude</th>
<td mat-cell *matCellDef="let element">{{element.longitude}}</td> <td mat-cell *matCellDef="let element">{{element.longitude}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="address"> <ng-container matColumnDef="address">
<th mat-header-cell *matHeaderCellDef>Address</th> <th mat-header-cell *matHeaderCellDef>Address</th>
<td mat-cell *matCellDef="let element"><span [innerHTML]="element.address"></span></td> <td mat-cell *matCellDef="let element"><span [innerHTML]="element.address"></span></td>
</ng-container> </ng-container>
<ng-container matColumnDef="email"> <ng-container matColumnDef="email">
<th mat-header-cell *matHeaderCellDef>E-mail</th> <th mat-header-cell *matHeaderCellDef>E-mail</th>
<td mat-cell *matCellDef="let element">{{element.email}}</td> <td mat-cell *matCellDef="let element">{{element.email}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="type"> <ng-container matColumnDef="type">
<th mat-header-cell *matHeaderCellDef>Type</th> <th mat-header-cell *matHeaderCellDef>Type</th>
<td mat-cell *matCellDef="let element">{{element.type}}</td> <td mat-cell *matCellDef="let element">{{element.type}}</td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table> </table>
<mat-paginator [length]="resultsLength" [pageSize]="20"></mat-paginator> <mat-paginator [length]="resultsLength" [pageSize]="20"></mat-paginator>
</div>
<ng-template #loading>Waiting...</ng-template>

69
Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html
View File

@@ -1,37 +1,40 @@
<table mat-table [dataSource]="dataSourceTable"> <div *ngIf="dataSourceTable != null else loading">
<ng-container matColumnDef="id"> <table mat-table [dataSource]="dataSourceTable">
<th mat-header-cell *matHeaderCellDef>ID</th> <ng-container matColumnDef="id">
<td mat-cell *matCellDef="let element">{{element.id}}</td> <th mat-header-cell *matHeaderCellDef>ID</th>
</ng-container> <td mat-cell *matCellDef="let element">{{element.id}}</td>
</ng-container>
<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>Name</th> <th mat-header-cell *matHeaderCellDef>Name</th>
<td mat-cell *matCellDef="let element">{{element.name}} <a href='http://{{element.website}}'>ici</a></td> <td mat-cell *matCellDef="let element">{{element.name}} <a href='http://{{element.website}}'>ici</a></td>
</ng-container> </ng-container>
<ng-container matColumnDef="latitude"> <ng-container matColumnDef="latitude">
<th mat-header-cell *matHeaderCellDef>Latitude</th> <th mat-header-cell *matHeaderCellDef>Latitude</th>
<td mat-cell *matCellDef="let element">{{element.latitude}}</td> <td mat-cell *matCellDef="let element">{{element.latitude}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="longitude"> <ng-container matColumnDef="longitude">
<th mat-header-cell *matHeaderCellDef>Longitude</th> <th mat-header-cell *matHeaderCellDef>Longitude</th>
<td mat-cell *matCellDef="let element">{{element.longitude}}</td> <td mat-cell *matCellDef="let element">{{element.longitude}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="address"> <ng-container matColumnDef="address">
<th mat-header-cell *matHeaderCellDef>Address</th> <th mat-header-cell *matHeaderCellDef>Address</th>
<td mat-cell *matCellDef="let element"><span [innerHTML]="element.address"></span></td> <td mat-cell *matCellDef="let element"><span [innerHTML]="element.address"></span></td>
</ng-container> </ng-container>
<ng-container matColumnDef="email"> <ng-container matColumnDef="email">
<th mat-header-cell *matHeaderCellDef>E-mail</th> <th mat-header-cell *matHeaderCellDef>E-mail</th>
<td mat-cell *matCellDef="let element">{{element.email}}</td> <td mat-cell *matCellDef="let element">{{element.email}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="type"> <ng-container matColumnDef="type">
<th mat-header-cell *matHeaderCellDef>Type</th> <th mat-header-cell *matHeaderCellDef>Type</th>
<td mat-cell *matCellDef="let element">{{element.type}}</td> <td mat-cell *matCellDef="let element">{{element.type}}</td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table> </table>
<mat-paginator [length]="resultsLength" [pageSize]="10"></mat-paginator> <mat-paginator [length]="resultsLength" [pageSize]="10"></mat-paginator>
</div>
<ng-template #loading>Waiting...</ng-template>

29
Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html
View File

@@ -1,15 +1,18 @@
<table mat-table [dataSource]="dataSourceTable"> <div *ngIf="dataSourceTable != null else loading">
<ng-container matColumnDef="id"> <table mat-table [dataSource]="dataSourceTable">
<th mat-header-cell *matHeaderCellDef>ID</th> <ng-container matColumnDef="id">
<td mat-cell *matCellDef="let element">{{element.id}}</td> <th mat-header-cell *matHeaderCellDef>ID</th>
</ng-container> <td mat-cell *matCellDef="let element">{{element.id}}</td>
</ng-container>
<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>Name</th> <th mat-header-cell *matHeaderCellDef>Name</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td> <td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table> </table>
<mat-paginator [length]="resultsLength" [pageSize]="20"></mat-paginator> <mat-paginator [length]="resultsLength" [pageSize]="20"></mat-paginator>
</div>
<ng-template #loading>Waiting...</ng-template>

61
Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
View File

@@ -1,32 +1,35 @@
<table mat-table [dataSource]="dataSourceTable"> <div *ngIf="dataSourceTable != null else loading">
<ng-container matColumnDef="id"> <table mat-table [dataSource]="dataSourceTable">
<th mat-header-cell *matHeaderCellDef>ID</th> <ng-container matColumnDef="id">
<td mat-cell *matCellDef="let element">{{element.id}}</td> <th mat-header-cell *matHeaderCellDef>ID</th>
</ng-container> <td mat-cell *matCellDef="let element">{{element.id}}</td>
</ng-container>
<ng-container matColumnDef="jumpDate"> <ng-container matColumnDef="jumpDate">
<th mat-header-cell *matHeaderCellDef>Date</th> <th mat-header-cell *matHeaderCellDef>Date</th>
<td mat-cell *matCellDef="let element">{{element.jumpDate | date: 'yyyy-MM-dd'}} </td> <td mat-cell *matCellDef="let element">{{element.jumpDate | date: 'yyyy-MM-dd'}} </td>
</ng-container> </ng-container>
<ng-container matColumnDef="jumpType"> <ng-container matColumnDef="jumpType">
<th mat-header-cell *matHeaderCellDef>Jump Type</th> <th mat-header-cell *matHeaderCellDef>Jump Type</th>
<td mat-cell *matCellDef="let element">{{element.jumpType.name}}</td> <td mat-cell *matCellDef="let element">{{element.jumpType.name}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="aircraft"> <ng-container matColumnDef="aircraft">
<th mat-header-cell *matHeaderCellDef>Aircraft</th> <th mat-header-cell *matHeaderCellDef>Aircraft</th>
<td mat-cell *matCellDef="let element">{{element.aircraft.name}}</td> <td mat-cell *matCellDef="let element">{{element.aircraft.name}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="dropZone"> <ng-container matColumnDef="dropZone">
<th mat-header-cell *matHeaderCellDef>Drop Zone</th> <th mat-header-cell *matHeaderCellDef>Drop Zone</th>
<td mat-cell *matCellDef="let element">{{element.dropZone.name}}</td> <td mat-cell *matCellDef="let element">{{element.dropZone.name}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="gear"> <ng-container matColumnDef="gear">
<th mat-header-cell *matHeaderCellDef>Gear</th> <th mat-header-cell *matHeaderCellDef>Gear</th>
<td mat-cell *matCellDef="let element">{{element.gear.name}}</td> <td mat-cell *matCellDef="let element">{{element.gear.name}}</td>
</ng-container> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table> </table>
<mat-paginator [length]="resultsLength" [pageSize]="10"></mat-paginator> <mat-paginator [length]="resultsLength" [pageSize]="10"></mat-paginator>
</div>
<ng-template #loading>Waiting...</ng-template>

2
Front/skydivelogs-app/src/app/new-jump/new-jump.component.html
View File

@@ -72,5 +72,5 @@
</mat-form-field> </mat-form-field>
<br /> <br />
<button class="btn btn-primary">Submit</button> <button class="btn btn-primary" *ngIf="isValidatedForm">Submit</button>
</form> </form>

6
Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts
View File

@@ -65,6 +65,12 @@ export class NewJumpComponent implements OnInit {
); );
} }
public isValidatedForm: boolean =
this.selectedDz != undefined &&
this.selectedGear != undefined &&
this.selectedAircraft != undefined &&
this.selectedJumpType != undefined;
private getListOfJumpTypes() { private getListOfJumpTypes() {
this.serviceApiGet.getListOfJumpTypes().subscribe(data => { this.serviceApiGet.getListOfJumpTypes().subscribe(data => {
this.listOfJumpType = data; this.listOfJumpType = data;