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

Fix

Browse Source
This commit is contained in:
Sébastien André
2020-08-31 14:51:25 +02:00
parent fca55827e8
commit 6e7caaad36
3 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<div class="content"> <div class="content">
<form class="formNewJumps" (ngSubmit)="onFormSubmit()" *ngIf="allDatasLoaded() else loading"> <form class="formNewJumps" (ngSubmit)="onFormSubmit()" *ngIf="notLoadingToDisplay() else loading">
<mat-form-field> <mat-form-field>
<mat-label>Choose the jump type</mat-label> <mat-label>Choose the jump type</mat-label>
<input type="text" matInput [matAutocomplete]="autoJumpType" [(ngModel)]="selectedJumpType" <input type="text" matInput [matAutocomplete]="autoJumpType" [(ngModel)]="selectedJumpType"

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

@@ -1,21 +1,21 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from '@angular/core';
import { JumpTypeResp } from "../../models/jumpType"; import { JumpTypeResp } from '../../models/jumpType';
import { AircraftResp } from "../../models/aircraft"; import { AircraftResp } from '../../models/aircraft';
import { DropZoneResp } from "../../models/dropzone"; import { DropZoneResp } from '../../models/dropzone';
import { DateService } from "../../services/date.service"; import { DateService } from '../../services/date.service';
import { GearResp } from "../../models/gear"; import { GearResp } from '../../models/gear';
import { ServiceComm } from "../../services/service-comm.service"; import { ServiceComm } from '../../services/service-comm.service';
import { DropzoneService } from "../../services/dropzone.service"; import { DropzoneService } from '../../services/dropzone.service';
import { AircraftService } from "../../services/aircraft.service"; import { AircraftService } from '../../services/aircraft.service';
import { JumpService } from "../../services/jump.service"; import { JumpService } from '../../services/jump.service';
import { JumpTypeService } from "../../services/jump-type.service"; import { JumpTypeService } from '../../services/jump-type.service';
import { GearService } from "../../services/gear.service"; import { GearService } from '../../services/gear.service';
import { isNumber } from "util"; import { isNumber } from 'util';
@Component({ @Component({
selector: "app-new-jump", selector: 'app-new-jump',
templateUrl: "./new-jump.component.html", templateUrl: './new-jump.component.html',
styleUrls: ["./new-jump.component.css"], styleUrls: ['./new-jump.component.css'],
}) })
export class NewJumpComponent implements OnInit { export class NewJumpComponent implements OnInit {
beginDate: Date; beginDate: Date;
@@ -47,7 +47,7 @@ export class NewJumpComponent implements OnInit {
) { } ) { }
ngOnInit() { ngOnInit() {
this.serviceComm.UpdatedComponentTitle("Add a new jump"); this.serviceComm.UpdatedComponentTitle('Add a new jump');
this.pendingAddRequest = false; this.pendingAddRequest = false;
this.endDate = new Date(); this.endDate = new Date();
@@ -93,11 +93,11 @@ export class NewJumpComponent implements OnInit {
this.selectedJumpType !== undefined && this.selectedJumpType !== undefined &&
this.selectedJumpType.id !== undefined && this.selectedJumpType.id !== undefined &&
this.exitAltitude !== undefined && this.exitAltitude !== undefined &&
isNumber(this.exitAltitude) && typeof this.exitAltitude === 'number' &&
this.deployAltitude !== undefined && this.deployAltitude !== undefined &&
isNumber(this.deployAltitude) && typeof this.deployAltitude === 'number' &&
this.countOfJumps !== undefined && this.countOfJumps !== undefined &&
isNumber(this.countOfJumps) typeof this.countOfJumps === 'number'
); );
} }
@@ -169,7 +169,7 @@ export class NewJumpComponent implements OnInit {
); );
} }
public loadingToDisplay(): boolean { public notLoadingToDisplay(): boolean {
return this.pendingAddRequest || this.countDatasLoaded === 4; return !(this.pendingAddRequest || this.countDatasLoaded !== 4);
} }
} }

18
Front/skydivelogs-app/src/services/jump.service.ts
View File

@@ -1,12 +1,12 @@
import { Injectable } from "@angular/core"; import { Injectable } from '@angular/core';
import { HttpClient } from "@angular/common/http"; import { HttpClient } from '@angular/common/http';
import { Observable } from "rxjs"; import { Observable } from 'rxjs';
import { map } from "rxjs/operators"; import { map } from 'rxjs/operators';
import { JumpResp, JumpReq } from "../models/jump"; import { JumpResp, JumpReq } from '../models/jump';
import { DateService } from "./date.service"; import { DateService } from './date.service';
import { BaseService } from "./base.service"; import { BaseService } from './base.service';
@Injectable() @Injectable()
export class JumpService extends BaseService { export class JumpService extends BaseService {
@@ -94,11 +94,13 @@ export class JumpService extends BaseService {
exitAltitude: defaultExitAltitude, exitAltitude: defaultExitAltitude,
deployAltitude: defaultDeployAltitude, deployAltitude: defaultDeployAltitude,
gearId: selectedRig, gearId: selectedRig,
notes: "", notes: '',
id: 0, id: 0,
jumpDate: jumpDate, jumpDate: jumpDate,
}; };
console.log(`${this.apiUrl}/Jump`);
this.http.post(`${this.apiUrl}/Jump`, bodyNewjump, { this.http.post(`${this.apiUrl}/Jump`, bodyNewjump, {
headers: this.headers, headers: this.headers,
}); });