From c7a8e9d3bdb72ad746f7206057686681158c53bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Wed, 25 Mar 2020 14:15:10 +0100 Subject: [PATCH] Ajout d'une pop-in pour l'ajout --- Back/skydiveLogs-api/Data/JumpsDb-log.db | Bin 401408 -> 409600 bytes Front/skydivelogs-app/src/app/app.module.ts | 4 +- .../create-user/create-user.component.html | 34 ++++++------- .../list-of-aircrafts.component.html | 3 +- .../list-of-aircrafts.component.ts | 36 ++++++------- .../list-of-dzs/list-of-dzs.component.html | 3 +- .../app/list-of-dzs/list-of-dzs.component.ts | 48 +++++++++--------- .../list-of-gears.component.html | 3 +- .../list-of-gears/list-of-gears.component.ts | 48 +++++++++--------- .../list-of-jump-types.component.html | 3 +- .../list-of-jump-types.component.ts | 36 ++++++------- 11 files changed, 112 insertions(+), 106 deletions(-) diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db index 8c5401f568df4c200f3865735487d620f188cad9..a10789b3762b32c731e414de3302f3d803e88ab8 100644 GIT binary patch delta 4470 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 b=gN+Whsy2oca%?$vCJni*Imt+8K(RP7;OW4 delta 20 bcmZo@kZd?0(a^%!!qmdt!qURJgiQeeOYR0= diff --git a/Front/skydivelogs-app/src/app/app.module.ts b/Front/skydivelogs-app/src/app/app.module.ts index f7f3bf8..fb74169 100644 --- a/Front/skydivelogs-app/src/app/app.module.ts +++ b/Front/skydivelogs-app/src/app/app.module.ts @@ -45,6 +45,7 @@ import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; import { MatSelectModule } from "@angular/material/select"; import { MatTableModule } from "@angular/material/table"; import { MatTabsModule } from "@angular/material/tabs"; +import { MatDialogModule } from "@angular/material/dialog"; import { CachingInterceptor } from "../interceptor/caching.interceptor"; //import { BasicAuthInterceptor } from '../interceptor/basic-auth.interceptor'; @@ -138,7 +139,8 @@ const appRoutes: Routes = [ MatIconModule, MatAutocompleteModule, MatProgressSpinnerModule, - MatTabsModule + MatTabsModule, + MatDialogModule ], exports: [HttpClientModule], providers: [ diff --git a/Front/skydivelogs-app/src/app/create-user/create-user.component.html b/Front/skydivelogs-app/src/app/create-user/create-user.component.html index b767d64..b62f86e 100644 --- a/Front/skydivelogs-app/src/app/create-user/create-user.component.html +++ b/Front/skydivelogs-app/src/app/create-user/create-user.component.html @@ -1,21 +1,4 @@
-
- - -
-
Username is required
-
-
-
- - -
-
Password is required
-
-
-
+
+ + +
+
Username is required
+
+
+
+ + +
+
Password is required
+
+
+ - + 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 a70b740..5449659 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 @@ -1,37 +1,39 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; +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 { AircraftResp } from '../../models/aircraft'; -import { AircraftService } from '../../services/aircraft.service'; -import { ServiceComm } from '../../services/service-comm.service'; +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"; @Component({ - selector: 'app-list-of-aircrafts', - templateUrl: './list-of-aircrafts.component.html', - styleUrls: ['./list-of-aircrafts.component.css'] + selector: "app-list-of-aircrafts", + templateUrl: "./list-of-aircrafts.component.html", + styleUrls: ["./list-of-aircrafts.component.css"] }) export class ListOfAircraftsComponent implements OnInit { - public displayedColumns: Array = ['id', 'name']; + public displayedColumns: Array = ["id", "name"]; public dataSourceTable: MatTableDataSource; public resultsLength = 0; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; - public showAddForm: boolean; constructor( private serviceApi: AircraftService, - private serviceComm: ServiceComm - ) { } + private serviceComm: ServiceComm, + public dialog: MatDialog + ) {} ngOnInit() { - this.serviceComm.UpdatedComponentTitle('List of aircrafts'); + this.serviceComm.UpdatedComponentTitle("List of aircrafts"); this.getListOfAircrafts(); } private getListOfAircrafts() { this.serviceApi.getListOfAircrafts().subscribe(data => { setTimeout(() => { - data.sort((a, b) => (b.name < a.name) ? 1 : -1); + data.sort((a, b) => (b.name < a.name ? 1 : -1)); this.dataSourceTable = new MatTableDataSource(data); this.dataSourceTable.paginator = this.paginator; this.resultsLength = data.length; @@ -39,7 +41,7 @@ export class ListOfAircraftsComponent implements OnInit { }); } - public add() { - this.showAddForm = true; + openDialogToAdd() { + this.dialog.open(NewAircraftComponent); } } diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html index 7a24c77..4e48cbd 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html @@ -1,6 +1,5 @@
- - +
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 bbde394..55975b6 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 @@ -1,39 +1,41 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; +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 { DropZoneResp } from '../../models/dropzone'; -import { DropzoneService } from '../../services/dropzone.service'; -import { ServiceComm } from '../../services/service-comm.service'; +import { DropZoneResp } from "../../models/dropzone"; +import { DropzoneService } from "../../services/dropzone.service"; +import { ServiceComm } from "../../services/service-comm.service"; +import { NewDropZoneComponent } from "../new-drop-zone/new-drop-zone.component"; @Component({ - selector: 'app-list-of-dzs', - templateUrl: './list-of-dzs.component.html', - styleUrls: ['./list-of-dzs.component.css'] + selector: "app-list-of-dzs", + templateUrl: "./list-of-dzs.component.html", + styleUrls: ["./list-of-dzs.component.css"] }) export class ListOfDzsComponent implements OnInit { public displayedColumns: Array = [ - 'isfavorite', - 'id', - 'name', - 'latitude', - 'longitude', - 'address', - 'email', - 'type' + "isfavorite", + "id", + "name", + "latitude", + "longitude", + "address", + "email", + "type" ]; public dataSourceTable: MatTableDataSource; public resultsLength = 0; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; - public showAddForm: boolean; constructor( private serviceApi: DropzoneService, - private serviceComm: ServiceComm - ) { } + private serviceComm: ServiceComm, + public dialog: MatDialog + ) {} ngOnInit() { - this.serviceComm.UpdatedComponentTitle('List of DZs'); + this.serviceComm.UpdatedComponentTitle("List of DZs"); this.getListOfDropZones(); } @@ -56,7 +58,7 @@ export class ListOfDzsComponent implements OnInit { dropzone.isFavorite = this.serviceApi.RemoveFavoriteDropZone(dropzone); } - public add() { - this.showAddForm = true; + openDialogToAdd() { + this.dialog.open(NewDropZoneComponent); } } diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html index 51535f2..24529d2 100644 --- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html +++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html @@ -1,6 +1,5 @@
- - +
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 ccbe241..b02f545 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 @@ -1,36 +1,38 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; +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 { GearService } from '../../services/gear.service'; -import { ServiceComm } from '../../services/service-comm.service'; -import { GearResp } from '../../models/gear'; -import { AddAction } from '../../models/add-action.enum'; +import { GearService } from "../../services/gear.service"; +import { ServiceComm } from "../../services/service-comm.service"; +import { GearResp } from "../../models/gear"; +import { AddAction } from "../../models/add-action.enum"; +import { NewGearComponent } from "../new-gear/new-gear.component"; @Component({ - selector: 'app-list-of-gears', - templateUrl: './list-of-gears.component.html', - styleUrls: ['./list-of-gears.component.css'] + selector: "app-list-of-gears", + templateUrl: "./list-of-gears.component.html", + styleUrls: ["./list-of-gears.component.css"] }) export class ListOfGearsComponent implements OnInit { public displayedColumns: Array = [ - 'id', - 'name', - 'manufacturer', - 'maxSize', - 'aad', - 'mainCanopy', - 'reserveCanopy' + "id", + "name", + "manufacturer", + "maxSize", + "aad", + "mainCanopy", + "reserveCanopy" ]; public dataSourceTable: MatTableDataSource; public resultsLength = 0; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; - public showAddForm: boolean; constructor( private serviceApi: GearService, - private serviceComm: ServiceComm - ) { } + private serviceComm: ServiceComm, + public dialog: MatDialog + ) {} ngOnInit() { this.serviceComm.refreshRequest.subscribe(action => { @@ -38,7 +40,7 @@ export class ListOfGearsComponent implements OnInit { this.getListOfGears(); } }); - this.serviceComm.UpdatedComponentTitle('List of gears'); + this.serviceComm.UpdatedComponentTitle("List of gears"); this.getListOfGears(); } @@ -53,7 +55,7 @@ export class ListOfGearsComponent implements OnInit { }); } - public add() { - this.showAddForm = true; + openDialogToAdd() { + this.dialog.open(NewGearComponent); } } 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 1f37d11..38b0c1e 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,6 +1,5 @@
- - +
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 c3f9e65..10486b1 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 @@ -1,37 +1,39 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator } from '@angular/material/paginator'; -import { MatTableDataSource } from '@angular/material/table'; +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 { JumpTypeResp } from '../../models/jumpType'; -import { JumpTypeService } from '../../services/jump-type.service'; -import { ServiceComm } from '../../services/service-comm.service'; +import { JumpTypeResp } from "../../models/jumpType"; +import { JumpTypeService } from "../../services/jump-type.service"; +import { ServiceComm } from "../../services/service-comm.service"; +import { NewJumpTypeComponent } from "../new-jump-type/new-jump-type.component"; @Component({ - selector: 'app-list-of-jump-types', - templateUrl: './list-of-jump-types.component.html', - styleUrls: ['./list-of-jump-types.component.css'] + selector: "app-list-of-jump-types", + templateUrl: "./list-of-jump-types.component.html", + styleUrls: ["./list-of-jump-types.component.css"] }) export class ListOfJumpTypesComponent implements OnInit { - public displayedColumns: Array = ['id', 'name']; + public displayedColumns: Array = ["id", "name"]; public dataSourceTable: MatTableDataSource; public resultsLength = 0; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; - public showAddForm: boolean; constructor( private serviceApi: JumpTypeService, - private serviceComm: ServiceComm - ) { } + private serviceComm: ServiceComm, + public dialog: MatDialog + ) {} ngOnInit() { - this.serviceComm.UpdatedComponentTitle('List of jump types'); + this.serviceComm.UpdatedComponentTitle("List of jump types"); this.getListOfJumpTypes(); } getListOfJumpTypes() { this.serviceApi.getListOfJumpTypes().subscribe(data => { setTimeout(() => { - data.sort((a, b) => (b.name < a.name) ? 1 : -1); + data.sort((a, b) => (b.name < a.name ? 1 : -1)); this.dataSourceTable = new MatTableDataSource(data); this.dataSourceTable.paginator = this.paginator; this.resultsLength = data.length; @@ -39,7 +41,7 @@ export class ListOfJumpTypesComponent implements OnInit { }); } - public add() { - this.showAddForm = true; + openDialogToAdd() { + this.dialog.open(NewJumpTypeComponent); } }