diff --git a/frontend/src/app/_components/daterange-picker/daterange-picker.component.html b/frontend/src/app/_components/daterange-picker/daterange-picker.component.html index 734b2a4..f9df57c 100644 --- a/frontend/src/app/_components/daterange-picker/daterange-picker.component.html +++ b/frontend/src/app/_components/daterange-picker/daterange-picker.component.html @@ -1,6 +1,6 @@
- select_date_range + select_date_range + bsDaterangepicker [bsConfig]="dateRangePickerOptions" [maxDate]="maxDate" [(bsValue)]="range" (bsValueChange)="updateValue($event)" #dp="bsDaterangepicker">
\ No newline at end of file diff --git a/frontend/src/app/_components/daterange-picker/daterange-picker.component.scss b/frontend/src/app/_components/daterange-picker/daterange-picker.component.scss index 0c8a794..6e6c348 100644 --- a/frontend/src/app/_components/daterange-picker/daterange-picker.component.scss +++ b/frontend/src/app/_components/daterange-picker/daterange-picker.component.scss @@ -1,3 +1,10 @@ .date-picker { width: 85% -} \ No newline at end of file +} + +/* Hide #dateRangeLabel on mobile */ +@media (max-width: 767px) { + #dateRangeLabel { + display: none; + } +} diff --git a/frontend/src/app/_components/table/table.component.html b/frontend/src/app/_components/table/table.component.html index f08097e..ec78255 100644 --- a/frontend/src/app/_components/table/table.component.html +++ b/frontend/src/app/_components/table/table.component.html @@ -177,7 +177,7 @@
-
+
{{ 'add'|translate|ftitlecase }} {{ 'service'|translate }}
- +
diff --git a/frontend/src/app/_routes/services/services.component.ts b/frontend/src/app/_routes/services/services.component.ts index e758555..b967184 100644 --- a/frontend/src/app/_routes/services/services.component.ts +++ b/frontend/src/app/_routes/services/services.component.ts @@ -17,4 +17,8 @@ export class ServicesComponent implements OnInit { this.router.navigate(['services', 'new']); } + goToStats() { + this.router.navigate(['stats', 'services']); + } + } diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index ce3350a..ad9102c 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -3,6 +3,7 @@ menu.services menu.trainings menu.logs + menu.stats menu.admin {{ 'menu.hi'|translate|ftitlecase }}, {{ auth.profile.name }}. menu.logoutmenu.stop_impersonating diff --git a/frontend/src/app/app.component.scss b/frontend/src/app/app.component.scss index 5d514a1..95dac85 100644 --- a/frontend/src/app/app.component.scss +++ b/frontend/src/app/app.component.scss @@ -3,6 +3,7 @@ background-color: red; overflow: hidden; margin-bottom: 2em; + z-index: 10000; } /* Style the links inside the navigation bar */ diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json index 88cccd5..c1f72b3 100644 --- a/frontend/src/assets/i18n/en.json +++ b/frontend/src/assets/i18n/en.json @@ -4,6 +4,7 @@ "services": "Services", "trainings": "Trainings", "logs": "Logs", + "stats": "Stats", "admin": "Admin", "logout": "Logout", "stop_impersonating": "Stop impersonating", @@ -298,6 +299,7 @@ "never": "never", "optional": "optional", "not_enough_permissions": "You don't have enough permissions to access this page.", + "open_services_stats": "To view the statistics, go to the \"Stats\" page.", "error_title": "Error", "success_title": "Success", "select_date_range": "Select date range", diff --git a/frontend/src/assets/i18n/it.json b/frontend/src/assets/i18n/it.json index ceb2e35..0cf87b3 100644 --- a/frontend/src/assets/i18n/it.json +++ b/frontend/src/assets/i18n/it.json @@ -4,6 +4,7 @@ "services": "Interventi", "trainings": "Esercitazioni", "logs": "Logs", + "stats": "Statistiche", "admin": "Amministrazione", "logout": "Logout", "stop_impersonating": "Torna al vero account", @@ -298,6 +299,7 @@ "never": "mai", "optional": "opzionale", "not_enough_permissions": "Non hai i permessi necessari per accedere a questa pagina.", + "open_services_stats": "Per visualizzare statistiche e mappa degli interventi, vai alla sezione \"Statistiche\".", "error_title": "Errore", "success_title": "Successo", "select_date_range": "Seleziona un intervallo di date",