-
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 1938837..fc35ab7 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,12 +1,48 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 255a6e6..4fc949c 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
@@ -36,11 +36,11 @@ class PickDateAdapter extends NativeDateAdapter {
]
})
export class NewTunnelFlightComponent implements OnInit {
- public beginDate: Date;
- public endDate: Date;
+ public flightDate: Date;
public minutesOfFlight: number;
public selectedTunnel: TunnelResp;
public listOfTunnel: Array;
+ public listOfFilteredTunnel: Array;
public resetForm: boolean;
public comments: string;
private countDatasLoaded: number;
@@ -49,7 +49,6 @@ export class NewTunnelFlightComponent implements OnInit {
constructor(private serviceComm: ServiceComm,
private serviceTunnel: TunnelService,
private serviceTunnelFlight: TunnelFlightService,
- private dateService: DateService,
private translateService: TranslateService,
private statsService: StatsService) { }
@@ -70,7 +69,7 @@ export class NewTunnelFlightComponent implements OnInit {
this.pendingAddRequest = true;
this.serviceTunnelFlight.addFlight(this.selectedTunnel.id,
- this.beginDate,
+ this.flightDate,
this.minutesOfFlight,
this.comments)
.subscribe(() => {
@@ -95,12 +94,14 @@ export class NewTunnelFlightComponent implements OnInit {
this.serviceTunnel.getListOfTunnels().subscribe((data) => {
data.sort((a, b) => a.name.localeCompare(b.name));
this.listOfTunnel = data;
+ this.listOfFilteredTunnel = data;
this.countDatasLoaded++;
});
}
public notLoadingToDisplay(): boolean {
- return !(this.pendingAddRequest || this.countDatasLoaded !== 1);
+ // return !(this.pendingAddRequest || this.countDatasLoaded > 1);
+ return true;
}
private updateTitle() {
@@ -110,12 +111,29 @@ export class NewTunnelFlightComponent implements OnInit {
}
private initForm() {
- this.endDate = new Date();
- this.endDate.setHours(0, 0, 0, 0);
- this.beginDate = this.dateService.AddDays(this.endDate, -1);
+ this.flightDate = new Date();
+ this.flightDate.setHours(0, 0, 0, 0);
this.minutesOfFlight = 1;
this.selectedTunnel = undefined;
this.comments = undefined;
}
+
+ public resetTunnel() {
+ this.selectedTunnel = undefined;
+ this.onChangeTunnel('');
+ }
+
+ public onChangeTunnel(event: any) {
+ let filterValue: string;
+
+ if (event.id === undefined) {
+ filterValue = event.toLowerCase();
+
+ this.listOfFilteredTunnel = this.listOfTunnel;
+ this.listOfFilteredTunnel = this.listOfFilteredTunnel.filter((option) =>
+ option.name.toLowerCase().includes(filterValue)
+ );
+ }
+ }
}
diff --git a/Front/skydivelogs-app/src/assets/css/Material-Icons.css b/Front/skydivelogs-app/src/assets/css/Material-Icons.css
index 4571efa..dfb4526 100644
--- a/Front/skydivelogs-app/src/assets/css/Material-Icons.css
+++ b/Front/skydivelogs-app/src/assets/css/Material-Icons.css
@@ -6,7 +6,7 @@
src: url(../font/Material-Icons-Fallback.woff2) format('woff2');
}
-.material-icons {
+/* .material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
@@ -20,4 +20,29 @@
direction: ltr;
-moz-font-feature-settings: 'liga';
-moz-osx-font-smoothing: grayscale;
+} */
+
+.material-icons {
+ font-family: 'Material Icons';
+ font-weight: normal;
+ font-style: normal;
+ font-size: 24px; /* Preferred icon size */
+ display: inline-block;
+ line-height: 1;
+ text-transform: none;
+ letter-spacing: normal;
+ word-wrap: normal;
+ white-space: nowrap;
+ direction: ltr;
+
+ /* Support for all WebKit browsers. */
+ -webkit-font-smoothing: antialiased;
+ /* Support for Safari and Chrome. */
+ text-rendering: optimizeLegibility;
+
+ /* Support for Firefox. */
+ -moz-osx-font-smoothing: grayscale;
+
+ /* Support for IE. */
+ font-feature-settings: 'liga';
}
diff --git a/Front/skydivelogs-app/src/assets/css/new-theme.scss b/Front/skydivelogs-app/src/assets/css/new-theme.scss
index 8dc9df9..54919f6 100644
--- a/Front/skydivelogs-app/src/assets/css/new-theme.scss
+++ b/Front/skydivelogs-app/src/assets/css/new-theme.scss
@@ -1,10 +1,11 @@
// https://theme-builder-1623190217839.web.app/
- @use '@angular/material' as mat;
+ // @use '@angular/material' as mat;
@import "Material-Icons";
@import "Roboto";
+ /*
// Be sure that you only ever include this mixin once!
@include mat.core();
@@ -113,4 +114,5 @@
.dark-theme {
@include mat.all-component-colors($mat-dark-theme);
- }
\ No newline at end of file
+ }
+ */
\ No newline at end of file
diff --git a/Front/skydivelogs-app/src/assets/i18n/en.json b/Front/skydivelogs-app/src/assets/i18n/en.json
index f763c06..7e888ce 100644
--- a/Front/skydivelogs-app/src/assets/i18n/en.json
+++ b/Front/skydivelogs-app/src/assets/i18n/en.json
@@ -36,7 +36,7 @@
"ListJumpTypes_Title" : "List of jump types",
"ListGears_Title" : "List of gears",
"ListAircrafts_Title" : "List of aircrafts",
- "NewTunnelFlight_Title" : "Nouveaux tunnel flights",
+ "NewTunnelFlight_Title" : "New tunnel flights",
"App_Footer" : "Web software to log your skydive jumps - v",
"App_Nav_Summary" : "Summary",
@@ -111,5 +111,10 @@
"NewJump_DeployAlt" : "Deploy altitude",
"NewJump_Count" : "Count of jumps",
"NewJump_Comments" : "Comments",
- "NewJump_Submit" : "Submit"
+ "NewJump_Submit" : "Submit",
+
+ "NewTunnelFlight_ChooseTunnel": "Choose the tunnel",
+ "NewTunnelFlight_Minutes": "Minutes of the flight",
+ "NewTunnelFlight_Comments": "Comments",
+ "NewTunnelFlight_Submit": "Submit"
}
\ No newline at end of file
diff --git a/Front/skydivelogs-app/src/assets/i18n/fr.json b/Front/skydivelogs-app/src/assets/i18n/fr.json
index 3a5b1f2..6f5381b 100644
--- a/Front/skydivelogs-app/src/assets/i18n/fr.json
+++ b/Front/skydivelogs-app/src/assets/i18n/fr.json
@@ -101,15 +101,20 @@
"NewJump_GoToJump" : "Voir les sauts",
"NewJump_ResetForm" : "Reset du formulaire après l'ajout",
- "NewJump_ChooseJumpType" : "Choisir un type de saut",
- "NewJump_ChooseAircraft" : "Choisir un avion largueur",
- "NewJump_ChooseDz" : "Choisir un centre",
- "NewJump_ChooseGear" : "Choisir un piège",
+ "NewJump_ChooseJumpType" : "Choisir le type de saut",
+ "NewJump_ChooseAircraft" : "Choisir l'avion largueur",
+ "NewJump_ChooseDz" : "Choisir le centre",
+ "NewJump_ChooseGear" : "Choisir le piège",
"NewJump_Cutaway" : "Libération ?",
"NewJump_Special" : "Saut spécial ?",
"NewJump_ExitAlt" : "Altitude de sortie",
"NewJump_DeployAlt" : "Altitude d'ouverture",
"NewJump_Count" : "Nombre de sauts",
"NewJump_Comments" : "Commentaires",
- "NewJump_Submit" : "Ajouter"
+ "NewJump_Submit" : "Ajouter",
+
+ "NewTunnelFlight_ChooseTunnel": "Choisir le tunnel",
+ "NewTunnelFlight_Minutes": "Temps de vol(minutes)",
+ "NewTunnelFlight_Comments": "Commentaires",
+ "NewTunnelFlight_Submit": "Ajouter"
}
\ No newline at end of file
diff --git a/Front/skydivelogs-app/src/services/tunnel-flight.service.ts b/Front/skydivelogs-app/src/services/tunnel-flight.service.ts
index bb203bc..bd40229 100644
--- a/Front/skydivelogs-app/src/services/tunnel-flight.service.ts
+++ b/Front/skydivelogs-app/src/services/tunnel-flight.service.ts
@@ -8,9 +8,8 @@ import { BaseService } from "./base.service";
@Injectable()
export class TunnelFlightService extends BaseService {
- private datePipe: DatePipe;
-
- constructor(private http: HttpClient) {
+ constructor(private http: HttpClient,
+ private datePipe: DatePipe) {
super();
}