diff --git a/Front/skydivelogs-app/src/app/create-user/create-user.component.ts b/Front/skydivelogs-app/src/app/create-user/create-user.component.ts index 72a850c..bd42bed 100644 --- a/Front/skydivelogs-app/src/app/create-user/create-user.component.ts +++ b/Front/skydivelogs-app/src/app/create-user/create-user.component.ts @@ -1,6 +1,11 @@ import { Component, OnInit } from "@angular/core"; import { Router, ActivatedRoute } from "@angular/router"; -import { FormBuilder, FormGroup, Validators } from "@angular/forms"; +import { + FormBuilder, + FormGroup, + ReactiveFormsModule, + Validators, +} from "@angular/forms"; import { TranslateModule, TranslateService } from "@ngx-translate/core"; import { CommonModule } from "@angular/common"; import { MatFormFieldModule } from "@angular/material/form-field"; @@ -14,7 +19,12 @@ import { User } from "../../models/user"; selector: "app-create-user", templateUrl: "./create-user.component.html", styleUrls: ["./create-user.component.css"], - imports: [TranslateModule, CommonModule, MatFormFieldModule], + imports: [ + TranslateModule, + CommonModule, + MatFormFieldModule, + ReactiveFormsModule, + ], }) export class CreateUserComponent implements OnInit { createForm: FormGroup; diff --git a/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.html b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.html index 2f1f54d..ba26a16 100644 --- a/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.html +++ b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.html @@ -1,11 +1,34 @@
-

Gear : {{jump.gear.name}} ({{jump.gear.mainCanopy}})

-

Special jump

-

Cutaway

- - - +

+ Gear : {{ jump.gear.name }} ({{ jump.gear.mainCanopy }}) +

+

+ Special jump +

+

+ Cutaway +

+ + + -
- -
\ No newline at end of file +
+ + diff --git a/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts index 69e37ac..68916b1 100644 --- a/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts +++ b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts @@ -4,6 +4,7 @@ import { MAT_DIALOG_DATA } from "@angular/material/dialog"; import { TranslateModule } from "@ngx-translate/core"; import { MatCheckboxModule } from "@angular/material/checkbox"; import { MatFormFieldModule } from "@angular/material/form-field"; +import { FormsModule } from "@angular/forms"; import { AddAction } from "../../models/add-action.enum"; import { JumpResp } from "../../models/jump"; @@ -20,6 +21,7 @@ import { ServiceComm } from "../../services/service-comm.service"; CommonModule, MatCheckboxModule, MatFormFieldModule, + FormsModule, ], }) export class JumpInfosComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/app/list-of-images/list-of-images.component.ts b/Front/skydivelogs-app/src/app/list-of-images/list-of-images.component.ts index a0eca6a..bac1926 100644 --- a/Front/skydivelogs-app/src/app/list-of-images/list-of-images.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-images/list-of-images.component.ts @@ -1,5 +1,10 @@ import { Component, OnInit, ViewChild } from "@angular/core"; -import { FormGroup, FormControl, Validators } from "@angular/forms"; +import { + FormGroup, + FormControl, + Validators, + ReactiveFormsModule, +} from "@angular/forms"; import { MatTableDataSource } from "@angular/material/table"; import { MatPaginator, MatPaginatorModule } from "@angular/material/paginator"; import { trigger, state, style } from "@angular/animations"; @@ -31,6 +36,7 @@ import { TranslateModule } from "@ngx-translate/core"; MatIconModule, MatPaginatorModule, MatFormFieldModule, + ReactiveFormsModule, ], }) export class ListOfImagesComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/app/list-of-tunnel-flights/list-of-tunnel-flights.component.ts b/Front/skydivelogs-app/src/app/list-of-tunnel-flights/list-of-tunnel-flights.component.ts index 6d025e0..c7da921 100644 --- a/Front/skydivelogs-app/src/app/list-of-tunnel-flights/list-of-tunnel-flights.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-tunnel-flights/list-of-tunnel-flights.component.ts @@ -9,6 +9,7 @@ import { MatListModule } from "@angular/material/list"; import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; import { MatRadioModule } from "@angular/material/radio"; import { MatProgressBarModule } from "@angular/material/progress-bar"; +import { FormsModule } from "@angular/forms"; import { ChartConfiguration, ChartData, ChartType } from "chart.js"; import { from, groupBy, mergeMap, reduce, map } from "rxjs"; @@ -33,6 +34,7 @@ import { TunnelFlight, TunnelFlightByMonth } from "../../models/tunnel-flight"; RouterLink, MatRadioModule, MatProgressBarModule, + FormsModule, ], }) export class ListOfTunnelFlightsComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/app/login-user/login-user.component.ts b/Front/skydivelogs-app/src/app/login-user/login-user.component.ts index 5b20d71..1a91183 100644 --- a/Front/skydivelogs-app/src/app/login-user/login-user.component.ts +++ b/Front/skydivelogs-app/src/app/login-user/login-user.component.ts @@ -1,7 +1,12 @@ import { Component, OnInit, ViewChild, AfterViewInit } from "@angular/core"; import { Router, ActivatedRoute } from "@angular/router"; import { CommonModule } from "@angular/common"; -import { FormBuilder, FormGroup, Validators } from "@angular/forms"; +import { + FormBuilder, + FormGroup, + ReactiveFormsModule, + Validators, +} from "@angular/forms"; import { TranslateModule } from "@ngx-translate/core"; import { MatInput } from "@angular/material/input"; import { MatFormFieldModule } from "@angular/material/form-field"; @@ -14,7 +19,12 @@ import { AuthenticationService } from "../../services/authentication.service"; selector: "app-login-user", templateUrl: "./login-user.component.html", styleUrls: ["./login-user.component.css"], - imports: [TranslateModule, CommonModule, MatFormFieldModule], + imports: [ + TranslateModule, + CommonModule, + MatFormFieldModule, + ReactiveFormsModule, + ], }) export class LoginUserComponent implements OnInit, AfterViewInit { loginForm: FormGroup; 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 7704851..c296c39 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,5 +1,10 @@ import { Component, OnInit } from "@angular/core"; -import { FormControl, FormGroup, Validators } from "@angular/forms"; +import { + FormControl, + FormGroup, + ReactiveFormsModule, + Validators, +} from "@angular/forms"; import { TranslateModule } from "@ngx-translate/core"; import { MatFormFieldModule } from "@angular/material/form-field"; @@ -12,7 +17,7 @@ import { ServiceComm } from "../../services/service-comm.service"; selector: "app-new-aircraft", templateUrl: "./new-aircraft.component.html", styleUrls: ["./new-aircraft.component.css"], - imports: [TranslateModule, MatFormFieldModule], + imports: [TranslateModule, MatFormFieldModule, ReactiveFormsModule], }) export class NewAircraftComponent implements OnInit { public addForm: FormGroup; 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 eaae780..3904338 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,5 +1,10 @@ import { Component, OnInit } from "@angular/core"; -import { FormControl, FormGroup, Validators } from "@angular/forms"; +import { + FormControl, + FormGroup, + ReactiveFormsModule, + Validators, +} from "@angular/forms"; import { TranslateModule } from "@ngx-translate/core"; import { MatFormFieldModule } from "@angular/material/form-field"; import { MatCheckboxModule } from "@angular/material/checkbox"; @@ -13,7 +18,12 @@ import { DropzoneService } from "../../services/dropzone.service"; selector: "app-new-drop-zone", templateUrl: "./new-drop-zone.component.html", styleUrls: ["./new-drop-zone.component.css"], - imports: [TranslateModule, MatFormFieldModule, MatCheckboxModule], + imports: [ + TranslateModule, + MatFormFieldModule, + MatCheckboxModule, + ReactiveFormsModule, + ], }) export class NewDropZoneComponent implements OnInit { public addForm: FormGroup; 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 c0818ed..e601840 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,5 +1,10 @@ import { Component, OnInit } from "@angular/core"; -import { FormControl, FormGroup, Validators } from "@angular/forms"; +import { + FormControl, + FormGroup, + ReactiveFormsModule, + Validators, +} from "@angular/forms"; import { MatFormFieldModule } from "@angular/material/form-field"; import { ServiceComm } from "../../services/service-comm.service"; @@ -11,7 +16,7 @@ import { TranslateModule } from "@ngx-translate/core"; selector: "app-new-gear", templateUrl: "./new-gear.component.html", styleUrls: ["./new-gear.component.css"], - imports: [TranslateModule, MatFormFieldModule], + imports: [TranslateModule, MatFormFieldModule, ReactiveFormsModule], }) export class NewGearComponent implements OnInit { public addForm: FormGroup; 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 af75ef1..7069576 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,5 +1,10 @@ import { Component, OnInit } from "@angular/core"; -import { FormControl, FormGroup, Validators } from "@angular/forms"; +import { + FormControl, + FormGroup, + ReactiveFormsModule, + Validators, +} from "@angular/forms"; import { TranslateModule } from "@ngx-translate/core"; import { MatFormFieldModule } from "@angular/material/form-field"; @@ -11,7 +16,7 @@ import { JumpTypeService } from "../../services/jump-type.service"; selector: "app-new-jump-type", templateUrl: "./new-jump-type.component.html", styleUrls: ["./new-jump-type.component.css"], - imports: [TranslateModule, MatFormFieldModule], + imports: [TranslateModule, MatFormFieldModule, ReactiveFormsModule], }) export class NewJumpTypeComponent implements OnInit { public addForm: FormGroup; 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 680d2bf..7b640e5 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,119 +1,267 @@
- -

{{ 'NewJump_ResetForm' | translate }}

+ +

+ {{ + "NewJump_ResetForm" | translate + }} +

- -
+ + - {{ 'NewJump_ChooseJumpType' | translate }} - - + {{ "NewJump_ChooseJumpType" | translate }} + + - {{jumpType.name}} + {{ jumpType.name }} - - {{ 'NewJump_ChooseAircraft' | translate }} - - + {{ "NewJump_ChooseAircraft" | translate }} + + - {{aircraft.name}} + {{ aircraft.name }} - - {{ 'NewJump_ChooseDz' | translate }} - - - - {{dropZone.name}} - - favorite + {{ "NewJump_ChooseDz" | translate }} + + + + {{ dropZone.name }} + + favorite - - {{ 'NewJump_ChooseGear' | translate }} - - + {{ "NewJump_ChooseGear" | translate }} + + - {{gear.name}} ({{gear.mainCanopy}}) + {{ gear.name }} ({{ gear.mainCanopy }}) - - {{ 'NewJump_Cutaway' | translate }} - {{ 'NewJump_Special' | translate }} + {{ + "NewJump_Cutaway" | translate + }} + {{ + "NewJump_Special" | translate + }} - - + + - - + + - - - - - - - -
- +
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 51339cf..c7c4be7 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 @@ -15,6 +15,7 @@ import { MatCheckboxModule } from "@angular/material/checkbox"; import { MatAutocompleteModule } from "@angular/material/autocomplete"; import { MatDatepickerModule } from "@angular/material/datepicker"; import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; +import { FormsModule } from "@angular/forms"; import { JumpTypeResp } from "../../models/jumpType"; import { AircraftResp } from "../../models/aircraft"; @@ -64,6 +65,7 @@ class PickDateAdapter extends NativeDateAdapter { MatAutocompleteModule, MatDatepickerModule, MatProgressSpinnerModule, + FormsModule, ], }) export class NewJumpComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/app/new-tunnel-flight/new-tunnel-flight.component.html b/Front/skydivelogs-app/src/app/new-tunnel-flight/new-tunnel-flight.component.html index f17874c..86de9b0 100644 --- a/Front/skydivelogs-app/src/app/new-tunnel-flight/new-tunnel-flight.component.html +++ b/Front/skydivelogs-app/src/app/new-tunnel-flight/new-tunnel-flight.component.html @@ -1,66 +1,145 @@
- +
-
+ - {{ 'NewTunnelFlight_ChooseJumpType' | translate }} - - + {{ "NewTunnelFlight_ChooseJumpType" | translate }} + + - {{jumpType.name}} + {{ jumpType.name }} - - {{ 'NewTunnelFlight_ChooseTunnel' | translate }} - - - - {{tunnel.name}} + {{ "NewTunnelFlight_ChooseTunnel" | translate }} + + + + {{ tunnel.name }} - - {{ 'NewTunnelFlight_Date_Lbl' | translate }} - - + {{ "NewTunnelFlight_Date_Lbl" | translate }} + + - {{ 'NewTunnelFlight_Minutes_Lbl' | translate }} - - - {{ 'NewTunnelFlight_Comments_Lbl' | translate }} - -
- +
-
\ No newline at end of file +
diff --git a/Front/skydivelogs-app/src/app/new-tunnel-flight/new-tunnel-flight.component.ts b/Front/skydivelogs-app/src/app/new-tunnel-flight/new-tunnel-flight.component.ts index 9f5d1fb..76de816 100644 --- a/Front/skydivelogs-app/src/app/new-tunnel-flight/new-tunnel-flight.component.ts +++ b/Front/skydivelogs-app/src/app/new-tunnel-flight/new-tunnel-flight.component.ts @@ -14,6 +14,7 @@ import { MatAutocompleteModule } from "@angular/material/autocomplete"; import { MatFormFieldModule } from "@angular/material/form-field"; import { MatDatepickerModule } from "@angular/material/datepicker"; import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; +import { FormsModule } from "@angular/forms"; import { TunnelResp } from "../../models/tunnel"; @@ -57,6 +58,7 @@ class PickDateAdapter extends NativeDateAdapter { RouterLink, MatDatepickerModule, MatProgressSpinnerModule, + FormsModule, ], }) export class NewTunnelFlightComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.ts b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.ts index 6b5edac..43c77d0 100644 --- a/Front/skydivelogs-app/src/app/user-profile/user-profile.component.ts +++ b/Front/skydivelogs-app/src/app/user-profile/user-profile.component.ts @@ -1,5 +1,10 @@ import { Component, OnInit } from "@angular/core"; -import { FormGroup, FormControl, Validators } from "@angular/forms"; +import { + FormGroup, + FormControl, + Validators, + ReactiveFormsModule, +} from "@angular/forms"; import { AuthenticationService } from "../../services/authentication.service"; import { User } from "../../models/user"; import { ListOfImagesComponent } from "../list-of-images/list-of-images.component"; @@ -15,6 +20,7 @@ import { TranslateModule } from "@ngx-translate/core"; MatLabel, MatFormFieldModule, TranslateModule, + ReactiveFormsModule, ], }) export class UserProfileComponent implements OnInit {