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 70955e4..9f0bfb4 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 @@ -16,7 +16,7 @@ import { AircraftResp } from '../../models/aircraft'; styleUrls: ['./list-of-aircrafts.component.css'] }) export class ListOfAircraftsComponent implements OnInit { - public displayedColumns: Array = ['id', 'name', 'imageData']; + public displayedColumns: Array = ['name', 'imageData']; public dataSourceTable: MatTableDataSource; public resultsLength = 0; public isUserAdmin: boolean; @@ -43,7 +43,7 @@ export class ListOfAircraftsComponent implements OnInit { private getListOfAircrafts() { this.serviceApi.getListOfAircrafts().subscribe(data => { setTimeout(() => { - data.sort((a, b) => (b.name < a.name ? 1 : -1)); + data.sort((a, b) => a.name.localeCompare(b.name)); this.dataSourceTable = new MatTableDataSource(data); this.dataSourceTable.paginator = this.paginator; this.resultsLength = data.length; 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 026a2f2..c94248f 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 @@ -18,7 +18,6 @@ import { NewDropZoneComponent } from '../new-drop-zone/new-drop-zone.component'; export class ListOfDzsComponent implements OnInit { public displayedColumns: Array = [ 'isfavorite', - 'id', 'name', 'address', 'type', @@ -49,7 +48,7 @@ export class ListOfDzsComponent implements OnInit { private getListOfDropZones() { this.serviceApi.getListOfDropZones().subscribe((data) => { setTimeout(() => { - data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0)); + data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0) || a.name.localeCompare(b.name)); this.dataSourceTable = new MatTableDataSource(data); this.dataSourceTable.paginator = this.paginator; this.resultsLength = data.length; 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 1040a1c..122e44f 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 @@ -16,7 +16,6 @@ import { NewGearComponent } from "../new-gear/new-gear.component"; }) export class ListOfGearsComponent implements OnInit { public displayedColumns: Array = [ - "id", "name", "manufacturer", "maxSize", @@ -47,6 +46,7 @@ export class ListOfGearsComponent implements OnInit { this.serviceApi.getListOfGears() .subscribe(data => { setTimeout(() => { + data.sort((a, b) => b.id - a.id); this.dataSourceTable = new MatTableDataSource(data); this.dataSourceTable.paginator = this.paginator; this.resultsLength = data.length; 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 aeb29f6..02fc9a1 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 @@ -16,7 +16,7 @@ import { NewJumpTypeComponent } from "../new-jump-type/new-jump-type.component"; styleUrls: ["./list-of-jump-types.component.css"] }) export class ListOfJumpTypesComponent implements OnInit { - public displayedColumns: Array = ["id", "name"]; + public displayedColumns: Array = ["name"]; public dataSourceTable: MatTableDataSource; public isUserAdmin: boolean; public resultsLength = 0; @@ -43,7 +43,7 @@ export class ListOfJumpTypesComponent implements OnInit { getListOfJumpTypes() { this.serviceApi.getListOfJumpTypes().subscribe(data => { setTimeout(() => { - data.sort((a, b) => (b.name < a.name ? 1 : -1)); + data.sort((a, b) => a.name.localeCompare(b.name)); this.dataSourceTable = new MatTableDataSource(data); this.dataSourceTable.paginator = this.paginator; this.resultsLength = data.length; diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css index 5f4de71..28559ab 100644 --- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css +++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.css @@ -25,4 +25,8 @@ table { flex-direction: column; align-items: initial; padding-top: 25px; +} + +th.mat-header-cell { + text-align: center; } \ No newline at end of file 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 e0aee03..2514269 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 @@ -5,7 +5,7 @@
- + + @@ -52,7 +52,7 @@ - +
celebration - IDNum {{element.id}} delete @@ -65,7 +65,7 @@
- + 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 395ae81..72a6865 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 @@ -49,7 +49,7 @@ export class ListOfJumpsComponent implements OnInit { this.listOfJumps = this.serviceApi.GetListOfJumps(); this.listOfJumps.subscribe(data => { setTimeout(() => { - data.sort((a, b) => b.jumpDate.getTime() - a.jumpDate.getTime()); + data.sort((a, b) => b.id - a.id); this.dataSourceTable = new MatTableDataSource(data); this.dataSourceTable.paginator = this.paginator; this.resultsLength = data.length; 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 8dc8d37..1539136 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 @@ -98,6 +98,7 @@ export class NewJumpComponent implements OnInit { private getListOfJumpTypes() { this.serviceJumpType.getListOfJumpTypes().subscribe((data) => { + data.sort((a, b) => a.name.localeCompare(b.name)); this.listOfJumpType = data; this.countDatasLoaded = 1; @@ -109,6 +110,7 @@ export class NewJumpComponent implements OnInit { private getListOfAircrafts() { this.serviceAircraft.getListOfAircrafts(true).subscribe((data) => { + data.sort((a, b) => a.name.localeCompare(b.name)); this.listOfAircraft = data; this.countDatasLoaded++; }); @@ -116,7 +118,7 @@ export class NewJumpComponent implements OnInit { private getListOfDropZones() { this.serviceDropzone.getListOfDropZones(true).subscribe((data) => { - data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0)); + data.sort((a, b) => (b.isFavorite ? 1 : 0) - (a.isFavorite ? 1 : 0) || a.name.localeCompare(b.name)); this.listOfDropZone = data; this.listOfFilteredDropZone = data; this.countDatasLoaded++; @@ -125,6 +127,7 @@ export class NewJumpComponent implements OnInit { private getListOfGears() { this.serviceGear.getListOfGears().subscribe((data) => { + data.sort((a, b) => b.id - a.id); this.listOfGear = data; this.countDatasLoaded++; });