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

Petites évolutions

Browse Source
This commit is contained in:
Sébastien André
2020-12-24 20:45:56 +01:00
parent cd4ac50cb1
commit c485d2d50d
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@@ -16,3 +16,13 @@
/Back/skydiveLogs-api.Business/bin /Back/skydiveLogs-api.Business/bin
/Back/dist /Back/dist
/Back/skydiveLogs-api.v3.ncrunchsolution.user /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

3
Front/skydivelogs-app/src/app/create-user/create-user.component.html
View File

@@ -46,8 +46,7 @@
</mat-form-field> </mat-form-field>
</p> </p>
<button [disabled]="loading" mat-raised-button color="accent"> <button [disabled]="!createForm.valid" mat-raised-button color="accent">
<span *ngIf="loading" class="spinner-border spinner-border-sm mr-1"></span>
Create user and login Create user and login
</button> </button>
<div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div> <div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>

8
Front/skydivelogs-app/src/app/create-user/create-user.component.ts
View File

@@ -14,7 +14,7 @@ import { User } from "../../models/user";
}) })
export class CreateUserComponent implements OnInit { export class CreateUserComponent implements OnInit {
createForm: FormGroup; createForm: FormGroup;
loading = false; invalidForm = true;
submitted = false; submitted = false;
returnUrl: string; returnUrl: string;
error = ""; error = "";
@@ -55,12 +55,12 @@ export class CreateUserComponent implements OnInit {
} }
onCreateSubmit() { onCreateSubmit() {
this.loading = true; this.invalidForm = false;
this.submitted = true; this.submitted = true;
// stop here if form is invalid // stop here if form is invalid
if (this.createForm.invalid) { if (this.createForm.invalid) {
this.loading = true; this.invalidForm = true;
return; return;
} }
@@ -80,7 +80,7 @@ export class CreateUserComponent implements OnInit {
}, },
error => { error => {
this.error = error; this.error = error;
this.loading = false; this.invalidForm = false;
} }
); );
} }

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

@@ -15,14 +15,14 @@
<ng-container matColumnDef="imageData"> <ng-container matColumnDef="imageData">
<th mat-header-cell *matHeaderCellDef>Image</th> <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> </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr> <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table> </table>
</div> </div>
<mat-paginator [length]="resultsLength" [pageSize]="5"></mat-paginator> <mat-paginator [length]="resultsLength" [pageSize]="10"></mat-paginator>
<ng-template #loading> <ng-template #loading>
<mat-progress-spinner [mode]="'indeterminate'"></mat-progress-spinner> <mat-progress-spinner [mode]="'indeterminate'"></mat-progress-spinner>

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

@@ -5,6 +5,7 @@
<th mat-header-cell *matHeaderCellDef></th> <th mat-header-cell *matHeaderCellDef></th>
<td mat-cell *matCellDef="let element" style="text-align: left; cursor: pointer;"> <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> <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> </td>
</ng-container> </ng-container>