From 08f04480d5c84068fb559315d52daf591165ca8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Sun, 27 Oct 2019 21:20:32 +0100 Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20de=20la=20page=20d'ajout=20de=20sa?= =?UTF-8?q?uts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Front/skydivelogs-app/src/app/app.module.ts | 8 +++--- .../app/list-of-dzs/list-of-dzs.component.ts | 6 ++--- .../list-of-jump-types.component.ts | 6 ++--- .../list-of-jumps/list-of-jumps.component.ts | 6 ++--- .../src/app/new-jump/new-jump.component.css | 8 ++++++ .../src/app/new-jump/new-jump.component.html | 23 +++++++++++++--- .../src/app/new-jump/new-jump.component.ts | 16 +++++------ .../src/app/summary/summary.component.html | 27 +++++++++---------- .../src/app/summary/summary.component.ts | 4 +-- .../src/services/serviceApi.ts | 10 +++---- 10 files changed, 66 insertions(+), 48 deletions(-) diff --git a/Front/skydivelogs-app/src/app/app.module.ts b/Front/skydivelogs-app/src/app/app.module.ts index 89f6bb8..b9eab74 100644 --- a/Front/skydivelogs-app/src/app/app.module.ts +++ b/Front/skydivelogs-app/src/app/app.module.ts @@ -15,8 +15,8 @@ import { ListOfJumpTypesComponent } from './list-of-jump-types/list-of-jump-type import { ServiceApi } from '../services/serviceApi'; import { ServiceComm } from '../services/serviceComm'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { MatPaginatorModule } from '@angular/material/paginator'; -import { MatTableModule } from '@angular/material/table'; +import { MatPaginatorModule, MatTableModule, MatSelectModule, MatOptionModule, MatFormFieldModule } from '@angular/material'; + const appRoutes: Routes = [ @@ -45,9 +45,7 @@ const appRoutes: Routes = [ { enableTracing: true } // <-- debugging purposes only ), BrowserModule, - BrowserAnimationsModule, - MatPaginatorModule, - MatTableModule + BrowserAnimationsModule, MatPaginatorModule, MatTableModule, MatSelectModule, MatOptionModule, MatFormFieldModule ], exports: [HttpClientModule], providers: [ServiceApi, ServiceComm], 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 e85af14..b830f86 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 @@ -2,9 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; -import { DropZoneResp } from 'src/models/dropzone'; -import { ServiceApi } from 'src/services/serviceApi'; -import { ServiceComm } from 'src/services/serviceComm'; +import { DropZoneResp } from '../../models/dropzone'; +import { ServiceApi } from '../../services/serviceApi'; +import { ServiceComm } from '../../services/serviceComm'; @Component({ selector: 'app-list-of-dzs', 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 c7fa904..de9ac5f 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 @@ -2,9 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; -import { JumpTypeResp } from 'src/models/jumpType'; -import { ServiceApi } from 'src/services/serviceApi'; -import { ServiceComm } from 'src/services/serviceComm'; +import { JumpTypeResp } from '../../models/jumpType'; +import { ServiceApi } from '../../services/serviceApi'; +import { ServiceComm } from '../../services/serviceComm'; @Component({ selector: 'app-list-of-jump-types', 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 ead8a37..56efa16 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 @@ -3,9 +3,9 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; import { Observable } from 'rxjs'; -import { JumpResp } from 'src/models/jump'; -import { ServiceApi } from 'src/services/serviceApi'; -import { ServiceComm } from 'src/services/serviceComm'; +import { JumpResp } from '../../models/jump'; +import { ServiceApi } from '../../services/serviceApi'; +import { ServiceComm } from '../../services/serviceComm'; @Component({ diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.css b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.css index e69de29..96944f6 100644 --- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.css +++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.css @@ -0,0 +1,8 @@ +.example-container { + display: flex; + flex-direction: column; +} + +.example-container>* { + width: 100%; +} 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 eb1c10e..5f8c070 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,3 +1,20 @@ -

- new-jump works! -

+
+

Basic native select

+ + Choose the jump type + + Option 1 + Option 2 (disabled) + Option 3 + + + +

Basic native select

+ + Choose the aircraft + + Option 1 + Option 2 + + +
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 54df22f..9053be3 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 @@ -1,17 +1,15 @@ -import { Component, OnInit } from '@angular/core'; -import { ServiceComm } from 'src/services/serviceComm'; +import { Component, OnInit } from "@angular/core"; +import { ServiceComm } from "../../services/serviceComm"; @Component({ - selector: 'app-new-jump', - templateUrl: './new-jump.component.html', - styleUrls: ['./new-jump.component.css'] + selector: "app-new-jump", + templateUrl: "./new-jump.component.html", + styleUrls: ["./new-jump.component.css"] }) export class NewJumpComponent implements OnInit { - - constructor(private serviceComm: ServiceComm) { } + constructor(private serviceComm: ServiceComm) {} ngOnInit() { - this.serviceComm.updatedComponentTitle('Add a new jump'); + this.serviceComm.updatedComponentTitle("Add a new jump"); } - } diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.html b/Front/skydivelogs-app/src/app/summary/summary.component.html index 7b897a8..bba50fa 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.html +++ b/Front/skydivelogs-app/src/app/summary/summary.component.html @@ -2,23 +2,20 @@ Total Total

-

+

- - -
{{element.label}} {{element.nb}}
-

-

+

+
@@ -30,9 +27,9 @@
-

-

- +

+
+ @@ -43,8 +40,8 @@
{{element.label}}
-

-

+

+
@@ -56,9 +53,9 @@
-

-

- By year +

+
+ @@ -69,7 +66,7 @@
{{element.label}}
-

+

diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.ts b/Front/skydivelogs-app/src/app/summary/summary.component.ts index a2be631..59a0cef 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.ts +++ b/Front/skydivelogs-app/src/app/summary/summary.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { ServiceComm } from 'src/services/serviceComm'; -import { ServiceApi } from 'src/services/serviceApi'; +import { ServiceComm } from '../../services/serviceComm'; +import { ServiceApi } from '../../services/serviceApi'; @Component({ selector: 'app-summary', diff --git a/Front/skydivelogs-app/src/services/serviceApi.ts b/Front/skydivelogs-app/src/services/serviceApi.ts index 9beee0f..d230c13 100644 --- a/Front/skydivelogs-app/src/services/serviceApi.ts +++ b/Front/skydivelogs-app/src/services/serviceApi.ts @@ -3,11 +3,11 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { DropZoneResp } from 'src/models/dropzone'; -import { JumpResp } from 'src/models/jump'; -import { AircraftResp } from 'src/models/aircraft'; -import { JumpTypeResp } from 'src/models/jumpType'; -import { StatsResp, StatsByDzResp, StatsByAircraftResp, StatsByJumpTypeResp, StatsByRigResp, StatsByYearResp } from 'src/models/statsresp'; +import { DropZoneResp } from '../models/dropzone'; +import { JumpResp } from '../models/jump'; +import { AircraftResp } from '../models/aircraft'; +import { JumpTypeResp } from '../models/jumpType'; +import { StatsResp, StatsByDzResp, StatsByAircraftResp, StatsByJumpTypeResp, StatsByRigResp, StatsByYearResp } from '../models/statsresp'; @Injectable()