administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 17:55:21 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adjust for timezone config

Browse Source
This commit is contained in:
Nick Mowen 2023-01-13 13:51:36 -07:00
parent e45cd1597d
commit 19a20ab8e3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/routes/Events.jsx
View File

@ -122,7 +122,7 @@ export default function Events({ path, ...props }) {
return memo; return memo;
}, config?.objects?.track || []) }, config?.objects?.track || [])
.filter((value, i, self) => self.indexOf(value) === i), .filter((value, i, self) => self.indexOf(value) === i),
sub_labels: (allSubLabels || []).length > 0 ? [...Object.values(allSubLabels), "None"] : [], sub_labels: (allSubLabels || []).length > 0 ? [...Object.values(allSubLabels), 'None'] : [],
}), }),
[config, allSubLabels] [config, allSubLabels]
); );
@ -295,6 +295,8 @@ export default function Events({ path, ...props }) {
return <ActivityIndicator />; return <ActivityIndicator />;
} }
const timezone = config.ui.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone;
return ( return (
<div className="space-y-4 p-2 px-4 w-full"> <div className="space-y-4 p-2 px-4 w-full">
<Heading>Events</Heading> <Heading>Events</Heading>
@ -512,8 +514,8 @@ export default function Events({ path, ...props }) {
({(event.top_score * 100).toFixed(0)}%) ({(event.top_score * 100).toFixed(0)}%)
</div> </div>
<div className="text-sm"> <div className="text-sm">
{new Date(event.start_time * 1000).toLocaleDateString()}{' '} {new Date(event.start_time * 1000).toLocaleDateString({ timeZone: timezone })}{' '}
{new Date(event.start_time * 1000).toLocaleTimeString()} ( {new Date(event.start_time * 1000).toLocaleTimeString({ timeZone: timezone })} (
{clipDuration(event.start_time, event.end_time)}) {clipDuration(event.start_time, event.end_time)})
</div> </div>
<div className="capitalize text-sm flex align-center mt-1"> <div className="capitalize text-sm flex align-center mt-1">

2
web/src/routes/Recording.jsx
View File

@ -10,7 +10,7 @@ import useSWR from 'swr';
export default function Recording({ camera, date, hour = '00', minute = '00', second = '00' }) { export default function Recording({ camera, date, hour = '00', minute = '00', second = '00' }) {
const { data: config } = useSWR('config'); const { data: config } = useSWR('config');
const timezone = config?.ui?.timezone ? config.ui.timezone : Intl.DateTimeFormat().resolvedOptions().timeZone; const timezone = config?.ui?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone;
const currentDate = useMemo( const currentDate = useMemo(
() => (date ? parseISO(`${date}T${hour || '00'}:${minute || '00'}:${second || '00'}`) : new Date()), () => (date ? parseISO(`${date}T${hour || '00'}:${minute || '00'}:${second || '00'}`) : new Date()),
[date, hour, minute, second] [date, hour, minute, second]