will/water-station-tracker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Round hour values instead of floor

Browse Source
This commit is contained in:
Will Bradley 2025-07-16 18:26:26 -07:00
parent 0bf1f38718
commit dbf59e42a8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/dashboard.html
View File

@ -378,13 +378,13 @@
if (diffInSeconds < 60) { if (diffInSeconds < 60) {
return 'Just now'; return 'Just now';
} else if (diffInSeconds < 3600) { } else if (diffInSeconds < 3600) {
const minutes = Math.floor(diffInSeconds / 60); const minutes = Math.round(diffInSeconds / 60);
return `${minutes} minute${minutes !== 1 ? 's' : ''} ago`; return `${minutes} minute${minutes !== 1 ? 's' : ''} ago`;
} else if (diffInSeconds < 86400) { } else if (diffInSeconds < 86400) {
const hours = Math.floor(diffInSeconds / 3600); const hours = Math.round(diffInSeconds / 3600);
return `${hours} hour${hours !== 1 ? 's' : ''} ago`; return `${hours} hour${hours !== 1 ? 's' : ''} ago`;
} else if (diffInSeconds < 604800) { } else if (diffInSeconds < 604800) {
const days = Math.floor(diffInSeconds / 86400); const days = Math.round(diffInSeconds / 86400);
return `${days} day${days !== 1 ? 's' : ''} ago`; return `${days} day${days !== 1 ? 's' : ''} ago`;
} else { } else {
return date.toLocaleDateString() + ' at ' + date.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'}); return date.toLocaleDateString() + ' at ' + date.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
@ -403,13 +403,13 @@
if (diffInSeconds <= 0) { if (diffInSeconds <= 0) {
return 'Already empty'; return 'Already empty';
} else if (diffInSeconds < 3600) { } else if (diffInSeconds < 3600) {
const minutes = Math.floor(diffInSeconds / 60); const minutes = Math.round(diffInSeconds / 60);
return `${minutes} minute${minutes !== 1 ? 's' : ''}`; return `${minutes} minute${minutes !== 1 ? 's' : ''}`;
} else if (diffInSeconds < 86400) { } else if (diffInSeconds < 86400) {
const hours = Math.floor(diffInSeconds / 3600); const hours = Math.round(diffInSeconds / 3600);
return `${hours} hour${hours !== 1 ? 's' : ''}`; return `${hours} hour${hours !== 1 ? 's' : ''}`;
} else { } else {
const days = Math.floor(diffInSeconds / 86400); const days = Math.round(diffInSeconds / 86400);
return `${days} day${days !== 1 ? 's' : ''}`; return `${days} day${days !== 1 ? 's' : ''}`;
} }
} }

12
public/index.html
View File

@ -301,13 +301,13 @@
if (diffInSeconds < 60) { if (diffInSeconds < 60) {
return 'Just now'; return 'Just now';
} else if (diffInSeconds < 3600) { } else if (diffInSeconds < 3600) {
const minutes = Math.floor(diffInSeconds / 60); const minutes = Math.round(diffInSeconds / 60);
return `${minutes} minute${minutes !== 1 ? 's' : ''} ago`; return `${minutes} minute${minutes !== 1 ? 's' : ''} ago`;
} else if (diffInSeconds < 86400) { } else if (diffInSeconds < 86400) {
const hours = Math.floor(diffInSeconds / 3600); const hours = Math.round(diffInSeconds / 3600);
return `${hours} hour${hours !== 1 ? 's' : ''} ago`; return `${hours} hour${hours !== 1 ? 's' : ''} ago`;
} else if (diffInSeconds < 604800) { } else if (diffInSeconds < 604800) {
const days = Math.floor(diffInSeconds / 86400); const days = Math.round(diffInSeconds / 86400);
return `${days} day${days !== 1 ? 's' : ''} ago`; return `${days} day${days !== 1 ? 's' : ''} ago`;
} else { } else {
return date.toLocaleDateString() + ' at ' + date.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'}); return date.toLocaleDateString() + ' at ' + date.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
@ -326,13 +326,13 @@
if (diffInSeconds <= 0) { if (diffInSeconds <= 0) {
return 'Already empty'; return 'Already empty';
} else if (diffInSeconds < 3600) { } else if (diffInSeconds < 3600) {
const minutes = Math.floor(diffInSeconds / 60); const minutes = Math.round(diffInSeconds / 60);
return `${minutes} minute${minutes !== 1 ? 's' : ''}`; return `${minutes} minute${minutes !== 1 ? 's' : ''}`;
} else if (diffInSeconds < 86400) { } else if (diffInSeconds < 86400) {
const hours = Math.floor(diffInSeconds / 3600); const hours = Math.round(diffInSeconds / 3600);
return `${hours} hour${hours !== 1 ? 's' : ''}`; return `${hours} hour${hours !== 1 ? 's' : ''}`;
} else { } else {
const days = Math.floor(diffInSeconds / 86400); const days = Math.round(diffInSeconds / 86400);
return `${days} day${days !== 1 ? 's' : ''}`; return `${days} day${days !== 1 ? 's' : ''}`;
} }
} }