diff --git a/main/http_server/axe-os/src/app/components/home/home.component.html b/main/http_server/axe-os/src/app/components/home/home.component.html index 8d0bab9..0c14cdd 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.html +++ b/main/http_server/axe-os/src/app/components/home/home.component.html @@ -218,6 +218,12 @@ +
+
+
Uptime
+ {{info.uptimeSeconds | dateAgo}} +
+
diff --git a/main/http_server/axe-os/src/app/pipes/date-ago.pipe.ts b/main/http_server/axe-os/src/app/pipes/date-ago.pipe.ts index 48659dd..8e50368 100644 --- a/main/http_server/axe-os/src/app/pipes/date-ago.pipe.ts +++ b/main/http_server/axe-os/src/app/pipes/date-ago.pipe.ts @@ -9,7 +9,7 @@ export class DateAgoPipe implements PipeTransform { transform(value: any, args?: any): any { if (value) { value = new Date().getTime() - value * 1000; - const seconds = Math.floor((+new Date() - +new Date(value)) / 1000); + let seconds = Math.floor((+new Date() - +new Date(value)) / 1000); if (seconds < 29) // less than 30 seconds ago will show as 'Just now' return 'Just now'; const intervals: { [key: string]: number } = { @@ -21,16 +21,21 @@ export class DateAgoPipe implements PipeTransform { 'minute': 60, 'second': 1 }; - let counter; + let result = ''; for (const i in intervals) { - counter = Math.floor(seconds / intervals[i]); + const counter = Math.floor(seconds / intervals[i]); if (counter > 0) if (counter === 1) { - return counter + ' ' + i + ''; // singular (1 day ago) + if (result) result += ', ' + result += counter + ' ' + i + ''; // singular (1 day ago) + seconds -= intervals[i] } else { - return counter + ' ' + i + 's'; // plural (2 days ago) + if (result) result += ', ' + result += counter + ' ' + i + 's'; // plural (2 days ago) + seconds -= intervals[i] * counter } } + return result; } return value; }