Add a feature to show all tunnel flights
This commit is contained in:
@@ -9,6 +9,7 @@
|
|||||||
<mat-radio-group [(ngModel)]="selectedPeriod" (ngModelChange)="onPeriodChange()">
|
<mat-radio-group [(ngModel)]="selectedPeriod" (ngModelChange)="onPeriodChange()">
|
||||||
<mat-radio-button value="currentYear">{{ 'ListTunnelFlight_CurrentYear' | translate }}</mat-radio-button>
|
<mat-radio-button value="currentYear">{{ 'ListTunnelFlight_CurrentYear' | translate }}</mat-radio-button>
|
||||||
<mat-radio-button value="12Months">{{ 'ListTunnelFlight_12Months' | translate }}</mat-radio-button>
|
<mat-radio-button value="12Months">{{ 'ListTunnelFlight_12Months' | translate }}</mat-radio-button>
|
||||||
|
<mat-radio-button value="all">{{ 'ListTunnelFlight_AllFlights' | translate }}</mat-radio-button>
|
||||||
</mat-radio-group>
|
</mat-radio-group>
|
||||||
|
|
||||||
<div style="display: block; width: 55%;">
|
<div style="display: block; width: 55%;">
|
||||||
|
|||||||
@@ -103,17 +103,8 @@ export class ListOfTunnelFlightsComponent implements OnInit {
|
|||||||
|
|
||||||
// Get data to show in a table
|
// Get data to show in a table
|
||||||
let endDate = new Date();
|
let endDate = new Date();
|
||||||
let beginDate = new Date();
|
|
||||||
endDate.setHours(0, 0, 0, 0);
|
endDate.setHours(0, 0, 0, 0);
|
||||||
switch (this.selectedPeriod) {
|
let beginDate = this.computeBeginDateByPeriod(this.selectedPeriod, endDate);
|
||||||
case "currentYear":
|
|
||||||
beginDate = new Date(endDate.getFullYear(), 0, 1);
|
|
||||||
break;
|
|
||||||
case "12Months":
|
|
||||||
beginDate = this.dateService.addMonths(endDate, -12);
|
|
||||||
beginDate.setDate(1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.serviceTunnelFlight.getTunnelFlights(beginDate, endDate)
|
this.serviceTunnelFlight.getTunnelFlights(beginDate, endDate)
|
||||||
.subscribe((data) => {
|
.subscribe((data) => {
|
||||||
@@ -127,17 +118,8 @@ export class ListOfTunnelFlightsComponent implements OnInit {
|
|||||||
|
|
||||||
// Get data to show in a table
|
// Get data to show in a table
|
||||||
let endDate = new Date();
|
let endDate = new Date();
|
||||||
let beginDate = new Date();
|
|
||||||
endDate.setHours(0, 0, 0, 0);
|
endDate.setHours(0, 0, 0, 0);
|
||||||
switch (this.selectedPeriod) {
|
let beginDate = this.computeBeginDateByPeriod(this.selectedPeriod, endDate);
|
||||||
case "currentYear":
|
|
||||||
beginDate = new Date(endDate.getFullYear(), 0, 1);
|
|
||||||
break;
|
|
||||||
case "12Months":
|
|
||||||
beginDate = this.dateService.addMonths(endDate, -12);
|
|
||||||
beginDate.setDate(1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.serviceTunnelFlight.getTunnelFlightsByMonth(beginDate, endDate)
|
this.serviceTunnelFlight.getTunnelFlightsByMonth(beginDate, endDate)
|
||||||
.subscribe((data) => {
|
.subscribe((data) => {
|
||||||
@@ -200,4 +182,24 @@ export class ListOfTunnelFlightsComponent implements OnInit {
|
|||||||
|
|
||||||
return 'Sum: ' + sum;
|
return 'Sum: ' + sum;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private computeBeginDateByPeriod(selectedPeriod: String, endDate: Date): Date {
|
||||||
|
let beginDate = new Date();
|
||||||
|
|
||||||
|
switch (selectedPeriod) {
|
||||||
|
case "currentYear":
|
||||||
|
beginDate = new Date(endDate.getFullYear(), 0, 1);
|
||||||
|
break;
|
||||||
|
case "12Months":
|
||||||
|
beginDate = this.dateService.addMonths(endDate, -12);
|
||||||
|
beginDate.setDate(1);
|
||||||
|
break;
|
||||||
|
case "all":
|
||||||
|
beginDate = this.dateService.addMonths(endDate, -120);
|
||||||
|
beginDate.setDate(1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return beginDate;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -128,5 +128,6 @@
|
|||||||
"ListTunnelFlight_CurrentYear": "On the current year",
|
"ListTunnelFlight_CurrentYear": "On the current year",
|
||||||
"ListTunnelFlight_12Months": "On 12 last months",
|
"ListTunnelFlight_12Months": "On 12 last months",
|
||||||
"ListTunnelFlight_Add" : "Add tunnel flights",
|
"ListTunnelFlight_Add" : "Add tunnel flights",
|
||||||
"ListTunnelFlight_LoadTable" : "Load the tunnel flights"
|
"ListTunnelFlight_LoadTable" : "Load the tunnel flights",
|
||||||
|
"ListTunnelFlight_AllFlights" : "All"
|
||||||
}
|
}
|
||||||
@@ -128,5 +128,6 @@
|
|||||||
"ListTunnelFlight_CurrentYear": "Dans l'année en cours",
|
"ListTunnelFlight_CurrentYear": "Dans l'année en cours",
|
||||||
"ListTunnelFlight_12Months": "Sur 12 derniers mois",
|
"ListTunnelFlight_12Months": "Sur 12 derniers mois",
|
||||||
"ListTunnelFlight_Add" : "Ajouter du temps en soufflerie",
|
"ListTunnelFlight_Add" : "Ajouter du temps en soufflerie",
|
||||||
"ListTunnelFlight_LoadTable" : "Charger les vols en tunnel"
|
"ListTunnelFlight_LoadTable" : "Charger les vols en tunnel",
|
||||||
|
"ListTunnelFlight_AllFlights" : "Tous les vols"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user