From 41eecd2a6860e23b862c293c5cba8a3dd9861162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Mon, 25 Nov 2019 11:20:50 +0100 Subject: [PATCH] =?UTF-8?q?Autcomplete=20ajout=C3=A9=20sur=20les=20dropdow?= =?UTF-8?q?n=20list=20du=20formulaire=20d'ajout=20de=20sauts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Front/skydivelogs-app/src/app/app.module.ts | 64 +++++++++--------- .../src/app/new-jump/new-jump.component.html | 43 ++++++++---- .../src/app/new-jump/new-jump.component.ts | 65 ++++++++++--------- 3 files changed, 99 insertions(+), 73 deletions(-) diff --git a/Front/skydivelogs-app/src/app/app.module.ts b/Front/skydivelogs-app/src/app/app.module.ts index 980c962..d337ad6 100644 --- a/Front/skydivelogs-app/src/app/app.module.ts +++ b/Front/skydivelogs-app/src/app/app.module.ts @@ -1,24 +1,24 @@ -import { BrowserModule } from "@angular/platform-browser"; -import { NgModule } from "@angular/core"; -import { RouterModule, Routes } from "@angular/router"; -import { HttpClientModule, HTTP_INTERCEPTORS } from "@angular/common/http"; +import { BrowserModule } from '@angular/platform-browser'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; -import { AppComponent } from "./app.component"; +import { AppComponent } from './app.component'; -import { SummaryComponent } from "./summary/summary.component"; -import { ListOfJumpsComponent } from "./list-of-jumps/list-of-jumps.component"; -import { ListOfDzsComponent } from "./list-of-dzs/list-of-dzs.component"; -import { NewJumpComponent } from "./new-jump/new-jump.component"; -import { ListOfAircraftsComponent } from "./list-of-aircrafts/list-of-aircrafts.component"; -import { ListOfJumpTypesComponent } from "./list-of-jump-types/list-of-jump-types.component"; -import { ListOfGearsComponent } from "./list-of-gears/list-of-gears.component"; +import { SummaryComponent } from './summary/summary.component'; +import { ListOfJumpsComponent } from './list-of-jumps/list-of-jumps.component'; +import { ListOfDzsComponent } from './list-of-dzs/list-of-dzs.component'; +import { NewJumpComponent } from './new-jump/new-jump.component'; +import { ListOfAircraftsComponent } from './list-of-aircrafts/list-of-aircrafts.component'; +import { ListOfJumpTypesComponent } from './list-of-jump-types/list-of-jump-types.component'; +import { ListOfGearsComponent } from './list-of-gears/list-of-gears.component'; -import { DateService } from "../services/date.service"; -import { ServiceApiGet } from "../services/service-api-get.service"; -import { ServiceApiPost } from "../services/service-api-post.service"; -import { ServiceComm } from "../services/service-comm.service"; -import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; -import { FormsModule } from "@angular/forms"; +import { DateService } from '../services/date.service'; +import { ServiceApiGet } from '../services/service-api-get.service'; +import { ServiceApiPost } from '../services/service-api-post.service'; +import { ServiceComm } from '../services/service-comm.service'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { FormsModule } from '@angular/forms'; import { MatPaginatorModule, MatTableModule, @@ -30,19 +30,20 @@ import { MatNativeDateModule, MatInputModule, MatButtonModule, - MatIconModule -} from "@angular/material"; -import { RequestCache } from "../services/request-cache.service"; -import { CachingInterceptor } from "../services/caching-interceptor.service"; + MatIconModule, + MatAutocompleteModule +} from '@angular/material'; +import { RequestCache } from '../services/request-cache.service'; +import { CachingInterceptor } from '../services/caching-interceptor.service'; const appRoutes: Routes = [ - { path: "summary", component: SummaryComponent }, - { path: "jumps", component: ListOfJumpsComponent }, - { path: "dzs", component: ListOfDzsComponent }, - { path: "newjump", component: NewJumpComponent }, - { path: "aircrafts", component: ListOfAircraftsComponent }, - { path: "jumpTypes", component: ListOfJumpTypesComponent }, - { path: "gears", component: ListOfGearsComponent } + { path: 'summary', component: SummaryComponent }, + { path: 'jumps', component: ListOfJumpsComponent }, + { path: 'dzs', component: ListOfDzsComponent }, + { path: 'newjump', component: NewJumpComponent }, + { path: 'aircrafts', component: ListOfAircraftsComponent }, + { path: 'jumpTypes', component: ListOfJumpTypesComponent }, + { path: 'gears', component: ListOfGearsComponent } ]; @NgModule({ @@ -74,7 +75,8 @@ const appRoutes: Routes = [ MatNativeDateModule, MatInputModule, MatButtonModule, - MatIconModule + MatIconModule, + MatAutocompleteModule ], exports: [HttpClientModule], providers: [ @@ -87,4 +89,4 @@ const appRoutes: Routes = [ ], bootstrap: [AppComponent] }) -export class AppModule {} +export class AppModule { } diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html index 0de5444..d905374 100644 --- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html +++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html @@ -1,38 +1,57 @@
Choose the jump type - - + + + {{jumpType.name}} - + + Choose the aircraft - - + + + {{aircraft.name}} - + + Choose the DZ - - + + + {{dropZone.name}} - + + Choose the used gear - - + + + {{gear.name}} - + + With a cutaway ? diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts index 32c69b2..64589fc 100644 --- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts +++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts @@ -1,18 +1,18 @@ -import { Component, OnInit } from "@angular/core"; -import { ServiceComm } from "../../services/service-comm.service"; -import { ServiceApiGet } from "../../services/service-api-get.service"; -import { ServiceApiPost } from "../../services/service-api-post.service"; -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 { isNumber } from "util"; +import { Component, OnInit } from '@angular/core'; +import { ServiceComm } from '../../services/service-comm.service'; +import { ServiceApiGet } from '../../services/service-api-get.service'; +import { ServiceApiPost } from '../../services/service-api-post.service'; +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 { 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; @@ -20,10 +20,10 @@ export class NewJumpComponent implements OnInit { exitAltitude: number; deployAltitude: number; countOfJumps: number; - selectedDz: number; - selectedGear: number; - selectedAircraft: number; - selectedJumpType: number; + selectedDz: DropZoneResp; + selectedGear: GearResp; + selectedAircraft: AircraftResp; + selectedJumpType: JumpTypeResp; withCutaway: boolean; listOfJumpType: Array; listOfAircraft: Array; @@ -35,10 +35,10 @@ export class NewJumpComponent implements OnInit { private serviceApiGet: ServiceApiGet, private serviceApiPost: ServiceApiPost, private dateService: DateService - ) {} + ) { } ngOnInit() { - this.serviceComm.updatedComponentTitle("Add a new jump"); + this.serviceComm.updatedComponentTitle('Add a new jump'); this.endDate = new Date(); @@ -53,10 +53,10 @@ export class NewJumpComponent implements OnInit { onFormSubmit() { this.serviceApiPost.AddListOfJump( - this.selectedJumpType, - this.selectedAircraft, - this.selectedDz, - this.selectedGear, + this.selectedJumpType.id, + this.selectedAircraft.id, + this.selectedDz.id, + this.selectedGear.id, this.withCutaway, this.beginDate, this.endDate, @@ -68,13 +68,13 @@ export class NewJumpComponent implements OnInit { public isValidatedForm(): boolean { return ( - this.selectedDz != undefined && - this.selectedGear != undefined && - this.selectedAircraft != undefined && - this.selectedJumpType != undefined && - this.exitAltitude != undefined && isNumber(this.exitAltitude) && - this.deployAltitude != undefined && isNumber(this.deployAltitude) && - this.countOfJumps != undefined && isNumber(this.countOfJumps) + this.selectedDz !== undefined && + this.selectedGear !== undefined && + this.selectedAircraft !== undefined && + this.selectedJumpType !== undefined && + this.exitAltitude !== undefined && isNumber(this.exitAltitude) && + this.deployAltitude !== undefined && isNumber(this.deployAltitude) && + this.countOfJumps !== undefined && isNumber(this.countOfJumps) ); } @@ -104,4 +104,9 @@ export class NewJumpComponent implements OnInit { this.listOfGear = data; }); } + + + displayFn(data?: JumpTypeResp): string | undefined { + return data ? data.name : undefined; + } }