From 06a1cd64e302d5152f8e4af0978a29df7cea6e97 Mon Sep 17 00:00:00 2001 From: akastijn Date: Sun, 2 Nov 2025 22:58:21 +0100 Subject: [PATCH] Remove "Last Played" column from Staff Playtime view and enhance time formatting in `minutesToHm` method to include days. --- .../head-mod/staff-pt/staff-pt.component.html | 5 ----- .../pages/head-mod/staff-pt/staff-pt.component.ts | 15 ++++++++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/pages/head-mod/staff-pt/staff-pt.component.html b/frontend/src/app/pages/head-mod/staff-pt/staff-pt.component.html index e69231d..010341b 100644 --- a/frontend/src/app/pages/head-mod/staff-pt/staff-pt.component.html +++ b/frontend/src/app/pages/head-mod/staff-pt/staff-pt.component.html @@ -29,11 +29,6 @@ {{ minutesToHm(row.playtime) }} - - Last Played - {{ row.last_played | date:'medium' }} - - diff --git a/frontend/src/app/pages/head-mod/staff-pt/staff-pt.component.ts b/frontend/src/app/pages/head-mod/staff-pt/staff-pt.component.ts index f082955..c2180ee 100644 --- a/frontend/src/app/pages/head-mod/staff-pt/staff-pt.component.ts +++ b/frontend/src/app/pages/head-mod/staff-pt/staff-pt.component.ts @@ -1,5 +1,5 @@ import {Component, computed, inject, OnInit, signal} from '@angular/core'; -import {CommonModule, DatePipe} from '@angular/common'; +import {CommonModule} from '@angular/common'; import {MatTableModule} from '@angular/material/table'; import {MatButtonModule} from '@angular/material/button'; import {MatIconModule} from '@angular/material/icon'; @@ -10,7 +10,7 @@ import {HeaderComponent} from '@header/header.component'; @Component({ selector: 'app-staff-pt', standalone: true, - imports: [CommonModule, MatTableModule, MatButtonModule, MatIconModule, MatTooltipModule, DatePipe, HeaderComponent], + imports: [CommonModule, MatTableModule, MatButtonModule, MatIconModule, MatTooltipModule, HeaderComponent], templateUrl: './staff-pt.component.html', styleUrl: './staff-pt.component.scss' }) @@ -24,7 +24,7 @@ export class StaffPtComponent implements OnInit { todayStart = signal(this.startOfDay(new Date())); - displayedColumns = ['staff_member', 'playtime', 'last_played']; + displayedColumns = ['staff_member', 'playtime']; ngOnInit(): void { this.loadCurrentWeek(); @@ -70,9 +70,14 @@ export class StaffPtComponent implements OnInit { minutesToHm(mins?: number): string { if (mins == null) return ''; - const h = Math.floor(mins / 60); + const d = Math.floor(mins / 1440); + const h = Math.floor((mins % 1440) / 60); const m = mins % 60; - return `${h}:${m.toString().padStart(2, '0')}`; + const parts = []; + if (d > 0) parts.push(`${d}d`); + if (h > 0 || d > 0) parts.push(`${h}h`); + if (m > 0 || (h === 0 && d === 0)) parts.push(`${m}m`); + return parts.join(' '); } private loadStaffData(from: Date, to: Date) {