-
-
-
-
-
- |
- {{ "ListGears_Header_Id" | translate }}
- |
- {{ element.id }} |
-
-
-
-
- {{ "ListGears_Header_Name" | translate }}
- |
- {{ element.name }} |
-
-
-
-
- {{ "ListGears_Header_Manufacturer" | translate }}
- |
- {{ element.manufacturer }} |
-
-
-
-
- {{ "ListGears_Header_CanopySize" | translate }}
- |
-
- {{ element.minSize }} - {{ element.maxSize }}
- |
-
-
-
-
- {{ "ListGears_Header_Aad" | translate }}
- |
- {{ element.aad }} |
-
-
-
-
- {{ "ListGears_Header_Main" | translate }}
- |
- {{ element.mainCanopy }} |
-
-
-
-
- {{ "ListGears_Header_Reserve" | translate }}
- |
- {{ element.reserveCanopy }} |
-
-
- |
- |
-
-
+ @if (dataSourceTable != null) {
+
+
+
+
+ |
+ {{ "ListGears_Header_Id" | translate }}
+ |
+ {{ element.id }} |
+
+
+
+ {{ "ListGears_Header_Name" | translate }}
+ |
+ {{ element.name }} |
+
+
+
+ {{ "ListGears_Header_Manufacturer" | translate }}
+ |
+ {{ element.manufacturer }} |
+
+
+
+ {{ "ListGears_Header_CanopySize" | translate }}
+ |
+
+ {{ element.minSize }} - {{ element.maxSize }}
+ |
+
+
+
+ {{ "ListGears_Header_Aad" | translate }}
+ |
+ {{ element.aad }} |
+
+
+
+ {{ "ListGears_Header_Main" | translate }}
+ |
+ {{ element.mainCanopy }} |
+
+
+
+ {{ "ListGears_Header_Reserve" | translate }}
+ |
+ {{ element.reserveCanopy }} |
+
+ |
+ |
+
+
+ } @else {
+
+ }
-
-
-
+ />
@@ -31,43 +31,42 @@
-
-
-
- |
- Comments
- |
-
- {{ element.comment }}
- |
-
-
-
-
- Image
- |
-
- 
- |
-
-
- |
- |
-
-
-
-
+
+
+ |
+ Comments
+ |
+
+ {{ element.comment }}
+ |
+
+
+
+ Image
+ |
+
+
+ |
+
+ |
+ |
+
+
+
+ >
×
+ />
diff --git a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html
index 4c35577..d46c59c 100644
--- a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html
+++ b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html
@@ -1,36 +1,35 @@
-
-
-
-
-
- |
- {{ "ListJumpType_Header_Id" | translate }}
- |
- {{ element.id }} |
-
-
-
-
- {{ "ListJumpType_Header_Name" | translate }}
- |
- {{ element.name }} |
-
-
- |
- |
-
-
+ @if (dataSourceTable != null) {
+
+ @if (isUserAdmin == true) {
+
+ }
+
+
+ |
+ {{ "ListJumpType_Header_Id" | translate }}
+ |
+ {{ element.id }} |
+
+
+
+ {{ "ListJumpType_Header_Name" | translate }}
+ |
+ {{ element.name }} |
+
+ |
+ |
+
+
+ } @else {
+
+ }
-
-
-
@@ -28,7 +29,7 @@
mat-cell
*matCellDef="let element"
style="text-align: left; text-wrap: nowrap"
- >
+ >
|
{{
- paginator.length - (paginator.pageIndex * paginator.pageSize + i)
+ paginator.length - (paginator.pageIndex * paginator.pageSize + i)
}}
|
@@ -81,7 +82,7 @@
mat-header-cell
*matHeaderCellDef
style="min-width: 100px; text-wrap: nowrap"
- >
+ >
{{ "ListJump_Header_JumpType" | translate }}
@@ -133,7 +134,7 @@
mat-cell
*matCellDef="let element"
style="text-align: left; text-wrap: nowrap"
- >
+ >
+ >
{{ "ListTunnelFlight_Add" | translate }}
-
+ @if (isLoading) {
+
+ }
+ >
{{
"ListTunnelFlight_CurrentYear" | translate
}}
@@ -32,9 +33,11 @@
-
-
-
+ @for (stat of stats; track stat) {
+
+
+
+ }
@@ -45,7 +48,7 @@
[options]="barChartOptions"
[legend]="barChartLegend"
[type]="barChartType"
- >
+ >
@@ -54,83 +57,77 @@
{{ "ListTunnelFlight_LoadTable" | translate }}
-
-
- | ID |
-
-
- |
-
-
-
- Tunnel |
-
-
- |
-
-
-
- Jump Type |
-
-
- |
-
-
-
- Minutes |
-
-
- |
-
-
-
- Notes |
-
-
- |
-
-
-
- Date |
-
-
- |
-
-
-
- |
-
-
- |
-
-
- |
- |
-
+ @if (dataSourceTable?.data.length) {
+
+
+ | ID |
+
+
+ |
+
+
+ Tunnel |
+
+
+ |
+
+
+ Jump Type |
+
+
+ |
+
+
+ Minutes |
+
+
+ |
+
+
+ Notes |
+
+
+ |
+
+
+ Date |
+
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+ |
+
+ }
diff --git a/Front/skydivelogs-app/src/app/login-user/login-user.component.html b/Front/skydivelogs-app/src/app/login-user/login-user.component.html
index 885a037..fdebc60 100644
--- a/Front/skydivelogs-app/src/app/login-user/login-user.component.html
+++ b/Front/skydivelogs-app/src/app/login-user/login-user.component.html
@@ -4,7 +4,7 @@
style="padding: 10px"
[formGroup]="loginForm"
(ngSubmit)="onLoginSubmit()"
->
+ >
{{ "LoginUser_Username" | translate }}
@@ -14,13 +14,17 @@
#username="matInput"
formControlName="username"
[ngClass]="{ 'is-invalid': submitted && formCtrls['username'].errors }"
- />
-
- {{ "LoginUser_UsernameRequired" | translate }}
-
-
- {{ 'LoginUser_UsernamePattern | translate }}
-
+ />
+ @if (formCtrls['username'].hasError('required')) {
+
+ {{ "LoginUser_UsernameRequired" | translate }}
+
+ }
+ @if (formCtrls['username'].hasError('minlength')) {
+
+ {{ 'LoginUser_UsernamePattern | translate }}
+
+ }
@@ -31,20 +35,28 @@
matInput
formControlName="password"
[ngClass]="{ 'is-invalid': submitted && formCtrls['password'].errors }"
- />
-
- {{ "LoginUser_PasswordRequired" | translate }}
-
-
- {{ "LoginUser_PasswordPattern" | translate }}
-
+ />
+ @if (formCtrls['password'].hasError('required')) {
+
+ {{ "LoginUser_PasswordRequired" | translate }}
+
+ }
+ @if (formCtrls['password'].hasError('pattern')) {
+
+ {{ "LoginUser_PasswordPattern" | translate }}
+
+ }
- {{ error }}
+ @if (error) {
+ {{ error }}
+ }
diff --git a/Front/skydivelogs-app/src/app/login/login.component.ts b/Front/skydivelogs-app/src/app/login/login.component.ts
index 5a57f3d..180ef06 100644
--- a/Front/skydivelogs-app/src/app/login/login.component.ts
+++ b/Front/skydivelogs-app/src/app/login/login.component.ts
@@ -4,7 +4,7 @@ import {
TranslatePipe,
TranslateService,
} from "@ngx-translate/core";
-import { CommonModule } from "@angular/common";
+
import { MatSelectModule } from "@angular/material/select";
import { MatOptionModule } from "@angular/material/core";
import { MatCardModule } from "@angular/material/card";
@@ -19,15 +19,14 @@ import { CreateUserComponent } from "../create-user/create-user.component";
styleUrls: ["./login.component.css"],
imports: [
TranslateModule,
- CommonModule,
MatSelectModule,
MatOptionModule,
MatCardModule,
MatTabsModule,
LoginUserComponent,
CreateUserComponent,
- TranslateModule,
- ],
+ TranslateModule
+],
})
export class LoginComponent implements OnInit {
public selectedLanguageFlag: string;
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 7b640e5..1d09622 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
@@ -6,7 +6,7 @@
[routerLink]="['/jumps']"
[routerLinkActive]="['active']"
skipLocationChange
- >
+ >
{{ "NewJump_GoToJump" | translate }}
@@ -16,255 +16,263 @@
-
+ } @else {
+
+ }
-
- {{ "NewJump_ChooseGear" | translate }}
-
-
-
- {{ gear.name }} ({{ gear.mainCanopy }})
-
-
-
-
-
- {{
- "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 3d487d1..a7a5dfa 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
@@ -7,7 +7,7 @@ import {
NativeDateAdapter,
} from "@angular/material/core";
import { TranslateModule, TranslateService } from "@ngx-translate/core";
-import { CommonModule } from "@angular/common";
+
import { MatIconModule } from "@angular/material/icon";
import { MatOptionModule } from "@angular/material/core";
import { MatFormFieldModule } from "@angular/material/form-field";
@@ -58,7 +58,6 @@ class PickDateAdapter extends NativeDateAdapter {
],
imports: [
TranslateModule,
- CommonModule,
RouterLink,
FormsModule,
RouterModule,
@@ -72,8 +71,8 @@ class PickDateAdapter extends NativeDateAdapter {
MatFormFieldModule,
ReactiveFormsModule,
MatInputModule,
- MatButtonModule,
- ],
+ MatButtonModule
+],
})
export class NewJumpComponent implements OnInit {
public beginDate: Date;
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 86de9b0..2bfab0e 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
@@ -6,140 +6,144 @@
[routerLink]="['/tunnelFlights']"
[routerLinkActive]="['active']"
skipLocationChange
- >
+ >
{{ "NewTunnelFlight_GoToJump" | translate }}
-
-
-
+
+ {{ "NewTunnelFlight_ChooseJumpType" | translate }}
+
+
+ @for (jumpType of listOfJumpType; track jumpType) {
+
+ {{ jumpType.name }}
+
+ }
+
+ @if (selectedJumpType) {
+
+ }
+
+
+ {{ "NewTunnelFlight_ChooseTunnel" | translate }}
+
+
+ @for (tunnel of listOfFilteredTunnel; track tunnel) {
+
+ {{ tunnel.name }}
+
+ }
+
+ @if (selectedTunnel) {
+
+ }
+
+
+ {{ "NewTunnelFlight_Date_Lbl" | translate }}
+
+
+
+
+
+ {{ "NewTunnelFlight_Minutes_Lbl" | translate }}
+
+ @if (minutesOfFlight) {
+
+ }
+
+
+ {{ "NewTunnelFlight_Comments_Lbl" | translate }}
+
+ @if (comments) {
+
+ }
+
+
+ @if (isValidatedForm()) {
+
+ }
+
+ } @else {
-
+ }
+
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 7bf9e5c..e594cd9 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
@@ -7,7 +7,7 @@ import {
NativeDateAdapter,
} from "@angular/material/core";
import { TranslateModule, TranslateService } from "@ngx-translate/core";
-import { CommonModule } from "@angular/common";
+
import { MatIconModule } from "@angular/material/icon";
import { MatOptionModule } from "@angular/material/core";
import { MatAutocompleteModule } from "@angular/material/autocomplete";
@@ -52,7 +52,6 @@ class PickDateAdapter extends NativeDateAdapter {
],
imports: [
TranslateModule,
- CommonModule,
RouterModule,
RouterLink,
FormsModule,
@@ -65,8 +64,8 @@ class PickDateAdapter extends NativeDateAdapter {
MatFormFieldModule,
MatOptionModule,
MatDatepickerModule,
- MatProgressSpinnerModule,
- ],
+ MatProgressSpinnerModule
+],
})
export class NewTunnelFlightComponent implements OnInit {
public flightDate: Date;
|
- 
- 
-