diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.css b/Front/skydivelogs-app/src/app/summary/summary.component.css index abf635c..0f8381a 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.css +++ b/Front/skydivelogs-app/src/app/summary/summary.component.css @@ -23,10 +23,10 @@ padding-top: 25px; } -.left130 { +.left160 { clear: both; float: left; - width: 130px; + width: 160px; } .paragraph { diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.html b/Front/skydivelogs-app/src/app/summary/summary.component.html index 5bf3710..a192a1a 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.html +++ b/Front/skydivelogs-app/src/app/summary/summary.component.html @@ -1,32 +1,32 @@
- + : {{ totalJumps }}
- + : {{ totalCutaways }}
- + : {{ lastJump }}
- + cached
- +
- By DZ + {{ 'Summary_LastMonth_ByDz' | translate }} @@ -38,7 +38,7 @@
{{element.label}}
- By jump type + {{ 'Summary_LastMonth_ByJumpType' | translate }} @@ -53,11 +53,11 @@ - +
- By DZ + {{ 'Summary_LastYear_ByDz' | translate }}
{{element.label}}
@@ -69,7 +69,7 @@
{{element.label}}
- By jump type + {{ 'Summary_LastYear_ByJumpType' | translate }} @@ -84,7 +84,7 @@ - +
{{element.label}}
@@ -98,7 +98,7 @@ - +
@@ -112,7 +112,7 @@ - +
@@ -126,7 +126,7 @@ - +
@@ -140,7 +140,7 @@ - +
diff --git a/Front/skydivelogs-app/src/app/summary/summary.component.ts b/Front/skydivelogs-app/src/app/summary/summary.component.ts index 7ef5a3f..93fb222 100644 --- a/Front/skydivelogs-app/src/app/summary/summary.component.ts +++ b/Front/skydivelogs-app/src/app/summary/summary.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatTableDataSource } from '@angular/material/table'; import { MatTabChangeEvent, MatTabGroup } from '@angular/material/tabs'; import { TranslateService } from '@ngx-translate/core'; +import { DatePipe } from '@angular/common'; import { ServiceComm } from '../../services/service-comm.service'; import { StatsService } from '../../services/stats.service'; @@ -48,7 +49,10 @@ export class SummaryComponent implements OnInit { .subscribe(data => { this.totalJumps = data.totalJumps; this.totalCutaways = data.totalCutaways; - this.lastJump = data.lastJump.jumpDate + ' (' + data.lastJump.dropZone.name + ')'; + + const datepipe: DatePipe = new DatePipe('en-US') + let formattedDate = datepipe.transform(data.lastJump.jumpDate, 'EEEE dd MMMM YYYY') + this.lastJump = formattedDate + ' (' + data.lastJump.dropZone.name + ')'; }); this.serviceApi.getStatsOfLastMonth() diff --git a/Front/skydivelogs-app/src/assets/i18n/en.json b/Front/skydivelogs-app/src/assets/i18n/en.json index e6b46eb..e5da883 100644 --- a/Front/skydivelogs-app/src/assets/i18n/en.json +++ b/Front/skydivelogs-app/src/assets/i18n/en.json @@ -79,5 +79,21 @@ "List_Dz_Header_Address" : "Address", "List_Dz_Header_Type" : "Type", "List_Dz_Filter" : "Filter", - "List_Dz_Filter_PlaceHolder" : "Filter on the name or address of center" + "List_Dz_Filter_PlaceHolder" : "Filter on the name or address of center", + + "Summary_TotalJumps" : "Total jumps", + "Summary_TotalCutaways" : "Total cutaways", + "Summary_LastJump" : "Last jump", + "Summary_Refresh" : "Refresh", + "Summary_LastMonth_Title" : "Jumps in the last month", + "Summary_LastMonth_ByDz" : "By DZ", + "Summary_LastMonth_ByJumpType" : "By jump type", + "Summary_LastYear_Title" : "Jumps in the last year", + "Summary_LastYear_ByDz" : "By DZ", + "Summary_LastYear_ByJumpType" : "By jump type", + "Summary_ByDz_Title" : "By DZ", + "Summary_ByAircraft_Title" : "By aircraft", + "Summary_ByGear_Title" : "By gear", + "Summary_ByJumpType_Title" : "By jump type", + "Summary_ByYear_Title" : "By year" } \ No newline at end of file diff --git a/Front/skydivelogs-app/src/assets/i18n/fr.json b/Front/skydivelogs-app/src/assets/i18n/fr.json index 0e0e2a0..59235de 100644 --- a/Front/skydivelogs-app/src/assets/i18n/fr.json +++ b/Front/skydivelogs-app/src/assets/i18n/fr.json @@ -79,5 +79,21 @@ "List_Dz_Header_Address" : "Adresse", "List_Dz_Header_Type" : "Type", "List_Dz_Filter" : "Filtrer", - "List_Dz_Filter_PlaceHolder" : "Filtrer sur le nom ou l'adresse du centre" + "List_Dz_Filter_PlaceHolder" : "Filtrer sur le nom ou l'adresse du centre", + + "Summary_TotalJumps" : "Nombre de sauts", + "Summary_TotalCutaways" : "Nombre de libération", + "Summary_LastJump" : "Le dernier saut", + "Summary_Refresh" : "Refresh", + "Summary_LastMonth_Title" : "Les sauts du dernier mois", + "Summary_LastMonth_ByDz" : "Par centre", + "Summary_LastMonth_ByJumpType" : "Par type de saut", + "Summary_LastYear_Title" : "Les sauts de la dernière année", + "Summary_LastYear_ByDz" : "Par centre", + "Summary_LastYear_ByJumpType" : "Par type de saut", + "Summary_ByDz_Title" : "Par centre", + "Summary_ByAircraft_Title" : "Par avion", + "Summary_ByGear_Title" : "Par piège", + "Summary_ByJumpType_Title" : "Par type de saut", + "Summary_ByYear_Title" : "Par an" } \ No newline at end of file