diff --git a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts index 5449659..be5bbb0 100644 --- a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.ts @@ -7,6 +7,7 @@ import { AircraftResp } from "../../models/aircraft"; import { AircraftService } from "../../services/aircraft.service"; import { ServiceComm } from "../../services/service-comm.service"; import { NewAircraftComponent } from "../new-aircraft/new-aircraft.component"; +import { AddAction } from "../../models/add-action.enum"; @Component({ selector: "app-list-of-aircrafts", @@ -26,6 +27,11 @@ export class ListOfAircraftsComponent implements OnInit { ) {} ngOnInit() { + this.serviceComm.refreshRequest.subscribe(action => { + if (action === AddAction.Gear) { + this.getListOfAircrafts(); + } + }); this.serviceComm.UpdatedComponentTitle("List of aircrafts"); this.getListOfAircrafts(); } diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts index 070ad4b..d5a78e4 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.ts @@ -3,6 +3,7 @@ import { MatPaginator } from "@angular/material/paginator"; import { MatTableDataSource } from "@angular/material/table"; import { MatDialog } from "@angular/material/dialog"; +import { AddAction } from "../../models/add-action.enum"; import { DropZoneResp } from "../../models/dropzone"; import { DropzoneService } from "../../services/dropzone.service"; import { ServiceComm } from "../../services/service-comm.service"; @@ -35,6 +36,11 @@ export class ListOfDzsComponent implements OnInit { ) {} ngOnInit() { + this.serviceComm.refreshRequest.subscribe(action => { + if (action === AddAction.Gear) { + this.getListOfDropZones(); + } + }); this.serviceComm.UpdatedComponentTitle("List of DZs"); this.getListOfDropZones(); } diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts index b02f545..87b4946 100644 --- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.ts @@ -41,7 +41,6 @@ export class ListOfGearsComponent implements OnInit { } }); this.serviceComm.UpdatedComponentTitle("List of gears"); - this.getListOfGears(); } diff --git a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts index 10486b1..7d2c77c 100644 --- a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.ts @@ -3,6 +3,7 @@ import { MatPaginator } from "@angular/material/paginator"; import { MatTableDataSource } from "@angular/material/table"; import { MatDialog } from "@angular/material/dialog"; +import { AddAction } from "../../models/add-action.enum"; import { JumpTypeResp } from "../../models/jumpType"; import { JumpTypeService } from "../../services/jump-type.service"; import { ServiceComm } from "../../services/service-comm.service"; @@ -26,6 +27,11 @@ export class ListOfJumpTypesComponent implements OnInit { ) {} ngOnInit() { + this.serviceComm.refreshRequest.subscribe(action => { + if (action === AddAction.Gear) { + this.getListOfJumpTypes(); + } + }); this.serviceComm.UpdatedComponentTitle("List of jump types"); this.getListOfJumpTypes(); } diff --git a/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.html b/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.html index 314f523..51cdc59 100644 --- a/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.html +++ b/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.html @@ -1,7 +1,7 @@
-
+

- -

+ +

diff --git a/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts b/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts index fc31948..39ff807 100644 --- a/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts +++ b/Front/skydivelogs-app/src/app/new-aircraft/new-aircraft.component.ts @@ -1,32 +1,33 @@ -import { Component, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { AircraftService } from '../../services/aircraft.service'; -import { ServiceComm } from '../../services/service-comm.service'; -import { AddAction } from '../../models/add-action.enum'; - +import { Component, OnInit } from "@angular/core"; +import { FormControl, FormGroup, Validators } from "@angular/forms"; +import { AircraftService } from "../../services/aircraft.service"; +import { ServiceComm } from "../../services/service-comm.service"; +import { AddAction } from "../../models/add-action.enum"; @Component({ - selector: 'app-new-aircraft', - templateUrl: './new-aircraft.component.html', - styleUrls: ['./new-aircraft.component.css'] + selector: "app-new-aircraft", + templateUrl: "./new-aircraft.component.html", + styleUrls: ["./new-aircraft.component.css"] }) export class NewAircraftComponent implements OnInit { public addForm: FormGroup; - constructor(private serviceComm: ServiceComm, - private serviceApi: AircraftService) { + constructor( + private serviceComm: ServiceComm, + private serviceApi: AircraftService + ) { this.addForm = new FormGroup({ - aircraftName: new FormControl('', Validators.required) + aircraftName: new FormControl("", Validators.required) }); } - ngOnInit() { - } + ngOnInit() {} onSubmit(formData) { this.serviceApi.AddAircraft(formData.value.aircraftName); this.serviceComm.RefreshData(AddAction.Aircraft); + this.serviceComm.RefreshData(AddAction.Aircraft); this.addForm.reset(); } } diff --git a/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.html b/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.html index 18cf45d..3875882 100644 --- a/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.html +++ b/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.html @@ -1,23 +1,27 @@
-
+

- -

-
+ +

+

- -

-
+ +

+

- -

-
+ +

+

- -

-
- - -
+ +

+

+ + +

+

+ + +

diff --git a/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts b/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts index 0f6d067..eb12f15 100644 --- a/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts +++ b/Front/skydivelogs-app/src/app/new-drop-zone/new-drop-zone.component.ts @@ -1,31 +1,37 @@ -import { Component, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { Component, OnInit } from "@angular/core"; +import { FormControl, FormGroup, Validators } from "@angular/forms"; +import { AddAction } from "../../models/add-action.enum"; +import { ServiceComm } from "../../services/service-comm.service"; @Component({ - selector: 'app-new-drop-zone', - templateUrl: './new-drop-zone.component.html', - styleUrls: ['./new-drop-zone.component.css'] + selector: "app-new-drop-zone", + templateUrl: "./new-drop-zone.component.html", + styleUrls: ["./new-drop-zone.component.css"] }) export class NewDropZoneComponent implements OnInit { public addForm: FormGroup; - constructor() { + constructor(private serviceComm: ServiceComm) { this.addForm = new FormGroup({ - dzName: new FormControl('', Validators.required), - gps: new FormControl('x.x,y.y', Validators.required), - address: new FormControl('', Validators.required), - contactMail: new FormControl('tot@toto.fr', [Validators.required, Validators.pattern('\\w+@\\w+\.\\w+')]), - type: new FormControl('dz, tunel', Validators.required) + dzName: new FormControl("", Validators.required), + gps: new FormControl("x.x,y.y", [ + Validators.required, + Validators.pattern("d+.d+,d+.d+") + ]), + address: new FormControl("", Validators.required), + contactMail: new FormControl("", [Validators.required, Validators.email]), + isDz: new FormControl(true), + isTunnel: new FormControl(false) }); } - ngOnInit() { - } + ngOnInit() {} onSubmit(formData) { console.log(formData.status); - console.warn('New data : ', formData); + console.warn("New data : ", formData); + this.serviceComm.RefreshData(AddAction.Gear); this.addForm.reset(); } } diff --git a/Front/skydivelogs-app/src/app/new-gear/new-gear.component.html b/Front/skydivelogs-app/src/app/new-gear/new-gear.component.html index 947bcc9..227521b 100644 --- a/Front/skydivelogs-app/src/app/new-gear/new-gear.component.html +++ b/Front/skydivelogs-app/src/app/new-gear/new-gear.component.html @@ -1,32 +1,32 @@
-
+

- -

-
+ +

+

- -

-
+ +

+

- -

-
+ +

+

- -

-
+ +

+

- -

-
+ +

+

- -

-
+ +

+

- -

+ +

diff --git a/Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts b/Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts index 15d09a0..f9f9664 100644 --- a/Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts +++ b/Front/skydivelogs-app/src/app/new-gear/new-gear.component.ts @@ -1,33 +1,50 @@ -import { Component, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; - -import { ServiceComm } from '../../services/service-comm.service'; -import { GearService } from '../../services/gear.service'; -import { AddAction } from '../../models/add-action.enum'; +import { Component, OnInit } from "@angular/core"; +import { FormControl, FormGroup, Validators } from "@angular/forms"; +import { ServiceComm } from "../../services/service-comm.service"; +import { GearService } from "../../services/gear.service"; +import { AddAction } from "../../models/add-action.enum"; @Component({ - selector: 'app-new-gear', - templateUrl: './new-gear.component.html', - styleUrls: ['./new-gear.component.css'] + selector: "app-new-gear", + templateUrl: "./new-gear.component.html", + styleUrls: ["./new-gear.component.css"] }) export class NewGearComponent implements OnInit { public addForm: FormGroup; - constructor(private serviceComm: ServiceComm, private serviceApi: GearService) { + constructor( + private serviceComm: ServiceComm, + private serviceApi: GearService + ) { this.addForm = new FormGroup({ - name: new FormControl('', Validators.required), - manufacturer: new FormControl('', Validators.required), - minSize: new FormControl('', Validators.required), - maxSize: new FormControl('', Validators.required), - aad: new FormControl('', Validators.required), - mainCanopy: new FormControl('', Validators.required), - reserveCanopy: new FormControl('', Validators.required), + name: new FormControl("", Validators.required), + manufacturer: new FormControl("", Validators.required), + minSize: new FormControl("", [ + Validators.required, + Validators.min(60), + Validators.max(320) + ]), + maxSize: new FormControl("", [ + Validators.required, + Validators.min(60), + Validators.max(320) + ]), + aad: new FormControl("", Validators.required), + mainCanopy: new FormControl("", [ + Validators.required, + Validators.min(60), + Validators.max(320) + ]), + reserveCanopy: new FormControl("", [ + Validators.required, + Validators.min(60), + Validators.max(320) + ]) }); } - ngOnInit() { - } + ngOnInit() {} onSubmit(formData) { this.serviceApi.AddGear( @@ -41,7 +58,6 @@ export class NewGearComponent implements OnInit { ); this.serviceComm.RefreshData(AddAction.Gear); - this.addForm.reset(); } } diff --git a/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.html b/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.html index adb3727..c701755 100644 --- a/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.html +++ b/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.html @@ -1,7 +1,7 @@
-
+

- -

+ +

diff --git a/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts b/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts index fbf3a21..2d53ebb 100644 --- a/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts +++ b/Front/skydivelogs-app/src/app/new-jump-type/new-jump-type.component.ts @@ -1,27 +1,29 @@ -import { Component, OnInit } from '@angular/core'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { Component, OnInit } from "@angular/core"; +import { FormControl, FormGroup, Validators } from "@angular/forms"; +import { AddAction } from "../../models/add-action.enum"; +import { ServiceComm } from "../../services/service-comm.service"; @Component({ - selector: 'app-new-jump-type', - templateUrl: './new-jump-type.component.html', - styleUrls: ['./new-jump-type.component.css'] + selector: "app-new-jump-type", + templateUrl: "./new-jump-type.component.html", + styleUrls: ["./new-jump-type.component.css"] }) export class NewJumpTypeComponent implements OnInit { public addForm: FormGroup; - constructor() { + constructor(private serviceComm: ServiceComm) { this.addForm = new FormGroup({ - jumptypeName: new FormControl('', Validators.required) + jumptypeName: new FormControl("", Validators.required) }); } - ngOnInit() { - } + ngOnInit() {} onSubmit(formData) { console.log(formData.status); - console.warn('New data : ', formData); + console.warn("New data : ", formData); + this.serviceComm.RefreshData(AddAction.Gear); this.addForm.reset(); } }