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

View File

@@ -1,5 +1,5 @@
<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-label>Choose the jump type</mat-label>
<input type="text" matInput [matAutocomplete]="autoJumpType" [(ngModel)]="selectedJumpType"

View File

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

View File

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