mirror of
https://github.com/Dispatcharr/Dispatcharr.git
synced 2026-01-23 02:35:14 +00:00
Move buttons to the right side and correctly load in output timezone for custom dummy epg.
This commit is contained in:
parent
603c9f9269
commit
163b1dd7cf
2 changed files with 5 additions and 3 deletions
|
|
@ -355,7 +355,7 @@ def generate_custom_dummy_programs(channel_id, channel_name, now, num_days, cust
|
|||
except pytz.exceptions.UnknownTimeZoneError:
|
||||
logger.warning(f"Unknown timezone: {timezone_value}, defaulting to UTC")
|
||||
source_tz = pytz.utc
|
||||
|
||||
|
||||
# Parse output timezone if provided (for display purposes)
|
||||
output_tz = None
|
||||
if output_timezone_value:
|
||||
|
|
@ -510,7 +510,7 @@ def generate_custom_dummy_programs(channel_id, channel_name, now, num_days, cust
|
|||
if time_info:
|
||||
hour_24 = time_info['hour']
|
||||
minute = time_info['minute']
|
||||
|
||||
|
||||
# If output_timezone is specified, convert the display time to that timezone
|
||||
if output_tz:
|
||||
# Create a datetime in the source timezone
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
|
|||
time_pattern: '',
|
||||
date_pattern: '',
|
||||
timezone: 'US/Eastern',
|
||||
output_timezone: '',
|
||||
program_duration: 180,
|
||||
sample_title: '',
|
||||
title_template: '',
|
||||
|
|
@ -192,6 +193,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
|
|||
custom.timezone ||
|
||||
custom.timezone_offset?.toString() ||
|
||||
'US/Eastern',
|
||||
output_timezone: custom.output_timezone || '',
|
||||
program_duration: custom.program_duration || 180,
|
||||
sample_title: custom.sample_title || '',
|
||||
title_template: custom.title_template || '',
|
||||
|
|
@ -757,7 +759,7 @@ const DummyEPGForm = ({ epg, isOpen, onClose }) => {
|
|||
</Box>
|
||||
)}
|
||||
|
||||
<Group position="right" mt="md">
|
||||
<Group justify="flex-end" mt="md">
|
||||
<Button variant="default" onClick={onClose}>
|
||||
Cancel
|
||||
</Button>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue