Merge branch 'release-0.11.0' of https://github.com/blakeblackshear/frigate into reorder-hide-cameras

This commit is contained in:
Nick Mowen 2022-03-21 10:05:14 -06:00
commit ac6556e19a

View File

@ -102,7 +102,7 @@ export function EventCard({ camera, event, delay }) {
const end = fromUnixTime(event.end_time); const end = fromUnixTime(event.end_time);
const hours = differenceInHours(end, start); const hours = differenceInHours(end, start);
const minutes = differenceInMinutes(end, start) - hours * 60; const minutes = differenceInMinutes(end, start) - hours * 60;
const seconds = differenceInSeconds(end, start) - hours * 60 - minutes * 60; const seconds = differenceInSeconds(end, start) - hours * 60 * 60 - minutes * 60;
duration = ''; duration = '';
if (hours) duration += `${hours}h `; if (hours) duration += `${hours}h `;
if (minutes) duration += `${minutes}m `; if (minutes) duration += `${minutes}m `;