diff --git a/Front/skydivelogs-app/src/app/app.module.ts b/Front/skydivelogs-app/src/app/app.module.ts
index a0203cf..6e390aa 100644
--- a/Front/skydivelogs-app/src/app/app.module.ts
+++ b/Front/skydivelogs-app/src/app/app.module.ts
@@ -52,7 +52,6 @@ import { MatTabsModule } from "@angular/material/tabs";
import { MatDialogModule } from "@angular/material/dialog";
import { MatCardModule } from "@angular/material/card";
import { MatRadioModule } from "@angular/material/radio";
-import { MatTooltipModule } from '@angular/material/tooltip';
import { CachingInterceptor } from "../interceptor/caching.interceptor";
//import { BasicAuthInterceptor } from '../interceptor/basic-auth.interceptor';
@@ -60,6 +59,7 @@ import { JwtAuthInterceptor } from "../interceptor/jwt-auth.interceptor";
import { ErrorInterceptor } from "../interceptor/error.interceptor";
import { UserProfileComponent } from "./user-profile/user-profile.component";
import { ListOfImagesComponent } from "./list-of-images/list-of-images.component";
+import { JumpInfosComponent } from './jump-infos/jump-infos.component';
const appRoutes: Routes = [
{ path: "", component: DefaultComponent, canActivate: [AuthGuardService] },
@@ -130,6 +130,7 @@ const appRoutes: Routes = [
LoginUserComponent,
UserProfileComponent,
ListOfImagesComponent,
+ JumpInfosComponent,
],
imports: [
RouterModule.forRoot(
@@ -157,8 +158,7 @@ const appRoutes: Routes = [
MatTabsModule,
MatDialogModule,
MatCardModule,
- MatRadioModule,
- MatTooltipModule
+ MatRadioModule
],
exports: [HttpClientModule],
providers: [
diff --git a/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.css b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.css
new file mode 100644
index 0000000..e69de29
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
new file mode 100644
index 0000000..c835782
--- /dev/null
+++ b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.html
@@ -0,0 +1,3 @@
+
Gear : {{data.gear.mainCanopy}} ({{data.gear.mainCanopy}})
+Cutaway : {{data.withCutaway}}
+Notes : {{data.notes}}
\ No newline at end of file
diff --git a/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.spec.ts b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.spec.ts
new file mode 100644
index 0000000..f23b3ad
--- /dev/null
+++ b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { JumpInfosComponent } from './jump-infos.component';
+
+describe('JumpInfosComponent', () => {
+ let component: JumpInfosComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ JumpInfosComponent ]
+ })
+ .compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(JumpInfosComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
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
new file mode 100644
index 0000000..b9f76be
--- /dev/null
+++ b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts
@@ -0,0 +1,18 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+import { JumpResp } from '../../models/jump';
+
+@Component({
+ selector: 'app-jump-infos',
+ templateUrl: './jump-infos.component.html',
+ styleUrls: ['./jump-infos.component.css']
+})
+export class JumpInfosComponent implements OnInit {
+
+ constructor(@Inject(MAT_DIALOG_DATA) public data: JumpResp) {}
+
+ ngOnInit(): void {
+ }
+
+}
diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
index a760006..7cb6cb0 100644
--- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
+++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
@@ -7,28 +7,7 @@
|
info
-
-
-
- Gear : {{element.gear.mainCanopy}} ({{element.gear.mainCanopy}})
- Cutaway : {{element.withCutaway}}
- Notes : {{element.notes}}
-
-
-
-
-
+ (click)='openDialog(element)'>info
|
diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
index f178cc1..2b4b8c8 100644
--- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
+++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
@@ -1,11 +1,13 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatTableDataSource } from '@angular/material/table';
+import { MatDialog } from "@angular/material/dialog";
import { Observable } from 'rxjs';
import { JumpResp } from '../../models/jump';
import { JumpService } from '../../services/jump.service';
import { ServiceComm } from '../../services/service-comm.service';
+import { JumpInfosComponent } from "../jump-infos/jump-infos.component";
@Component({
selector: 'app-list-of-jumps',
@@ -29,7 +31,8 @@ export class ListOfJumpsComponent implements OnInit {
constructor(
private serviceApi: JumpService,
- private serviceComm: ServiceComm
+ private serviceComm: ServiceComm,
+ public dialog: MatDialog
) { }
ngOnInit() {
@@ -60,6 +63,16 @@ export class ListOfJumpsComponent implements OnInit {
calculateClasses(item) {
return {
'showPopin': this.showPopinForItemId != -1 && item.id === this.showPopinForItemId,
- };
+ };
+ }
+
+ openDialog(item: JumpResp) {
+ this.dialog.open(JumpInfosComponent, {
+ data: item,
+ position: {
+ top: '0px',
+ left: '0px'
+ }
+ });
}
}