From 7af8236561ed3547df7ed1c0902375e0368ae555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?=
Date: Wed, 23 Oct 2019 18:31:52 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20du=20travail=20sur=20la=20page=20d?=
=?UTF-8?q?e=20r=C3=A9sum=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../list-of-aircrafts.component.ts | 2 -
.../app/list-of-dzs/list-of-dzs.component.ts | 2 -
.../list-of-jump-types.component.ts | 2 -
.../src/app/summary/summary.component.html | 88 ++++++++++++++++++-
.../src/app/summary/summary.component.ts | 6 ++
5 files changed, 93 insertions(+), 7 deletions(-)
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 8e7f8f2..34ee53d 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
@@ -12,7 +12,6 @@ import { ServiceComm } from '../../services/serviceComm';
styleUrls: ['./list-of-aircrafts.component.css']
})
export class ListOfAircraftsComponent implements OnInit {
- public listOfAircrafts: Array = new Array();
public displayedColumns: Array = ['id', 'name'];
public dataSourceTable;
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@@ -28,7 +27,6 @@ export class ListOfAircraftsComponent implements OnInit {
getListOfAircrafts() {
this.serviceApi.getListOfAircrafts()
.subscribe(data => {
- this.listOfAircrafts = data;
this.dataSourceTable = new MatTableDataSource(data);
this.dataSourceTable.paginator = this.paginator;
});
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 7b6febc..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
@@ -14,7 +14,6 @@ import { ServiceComm } from '../../services/serviceComm';
export class ListOfDzsComponent implements OnInit {
- public listOfDropZones: Array = new Array();
public displayedColumns: Array = ['id', 'name', 'latitude', 'longitude', 'address', 'email', 'type'];
public dataSourceTable;
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@@ -31,7 +30,6 @@ export class ListOfDzsComponent implements OnInit {
getListOfDropZones() {
this.serviceApi.getListOfDropZones()
.subscribe(data => {
- this.listOfDropZones = data;
this.dataSourceTable = new MatTableDataSource(data);
this.dataSourceTable.paginator = this.paginator;
});
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 61da9cc..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
@@ -12,7 +12,6 @@ import { ServiceComm } from '../../services/serviceComm';
styleUrls: ['./list-of-jump-types.component.css']
})
export class ListOfJumpTypesComponent implements OnInit {
- public listOfJumpTypes: Array = new Array();
public displayedColumns: Array = ['id', 'name'];
public dataSourceTable;
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@@ -28,7 +27,6 @@ export class ListOfJumpTypesComponent implements OnInit {
getListOfJumpTypes() {
this.serviceApi.getListOfJumpTypes()
.subscribe(data => {
- this.listOfJumpTypes = data;
this.dataSourceTable = new MatTableDataSource(data);
this.dataSourceTable.paginator = this.paginator;
});
diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.html b/Front/skydivelogs-app/src/app/summary/summary.component.html
index fad0388..4fddda0 100644
--- a/Front/skydivelogs-app/src/app/summary/summary.component.html
+++ b/Front/skydivelogs-app/src/app/summary/summary.component.html
@@ -1,3 +1,89 @@
- summary works!
+
+ Total Total
+
+
+
+
+
+
+ | {{element.label}} |
+
+
+
+ {{element.nb}} |
+
+
+
+
+
+
+
+
+
+
+ | {{element.label}} |
+
+
+ {{element.nb}} |
+
+
+
+
+
+
+
+
+
+ | {{element.label}} |
+
+
+ {{element.nb}} |
+
+
+
+
+
+
+
+
+
+ | {{element.label}} |
+
+
+ {{element.nb}} |
+
+
+
+
+
+
+ Per year
+
+
+ | {{element.label}} |
+
+
+ {{element.nb}} |
+
+
+
+
+
+
+
+
+
+
+
+
+ Date and location
+
+
+
+
+
+
+
+
diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.ts b/Front/skydivelogs-app/src/app/summary/summary.component.ts
index 69f0648..df91e59 100644
--- a/Front/skydivelogs-app/src/app/summary/summary.component.ts
+++ b/Front/skydivelogs-app/src/app/summary/summary.component.ts
@@ -7,6 +7,12 @@ import { ServiceComm } from '../../services/serviceComm';
styleUrls: ['./summary.component.css']
})
export class SummaryComponent implements OnInit {
+ public displayedColumns: Array = ['label', 'nb'];
+ public dsNbJumpByDz;
+ public dsNbJumpByAircraft;
+ public dsNbJumpByRig;
+ public dsNbJumpByType;
+ public dsNbJumpByYear;
constructor(private serviceComm: ServiceComm) { }