From 74062d4a342cba741ecadf88762321cafcffb69c Mon Sep 17 00:00:00 2001 From: Cassidy Dingenskirchen Date: Sun, 29 Jun 2025 16:45:30 +0200 Subject: /journey/add: datetime inputs --- lib/Travelynx/Controller/Traveling.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/Travelynx/Controller') diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index fd2abb1..f9b608c 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -2518,7 +2518,7 @@ sub add_journey_form { if ( $self->param('action') and $self->param('action') eq 'save' ) { my $parser = DateTime::Format::Strptime->new( - pattern => '%d.%m.%Y %H:%M', + pattern => '%FT%H:%M', locale => 'de_DE', time_zone => 'Europe/Berlin' ); -- cgit v1.2.3 From 02a6b9072d16c521142f04f5dd4a316aa269a5de Mon Sep 17 00:00:00 2001 From: Cassidy Dingenskirchen Date: Sun, 29 Jun 2025 16:46:38 +0200 Subject: /journey/edit: datetime inputs --- lib/Travelynx/Controller/Traveling.pm | 4 ++-- templates/edit_journey.html.ep | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/Travelynx/Controller') diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index f9b608c..4c58c0e 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -2383,7 +2383,7 @@ sub edit_journey { if ( $self->param('action') and $self->param('action') eq 'save' ) { my $parser = DateTime::Format::Strptime->new( - pattern => '%d.%m.%Y %H:%M', + pattern => '%FT%H:%M', locale => 'de_DE', time_zone => 'Europe/Berlin' ); @@ -2486,7 +2486,7 @@ sub edit_journey { for my $key (qw(sched_departure rt_departure sched_arrival rt_arrival)) { if ( $journey->{$key} and $journey->{$key}->epoch ) { $self->param( - $key => $journey->{$key}->strftime('%d.%m.%Y %H:%M') ); + $key => $journey->{$key}->strftime('%FT%H:%M') ); } } diff --git a/templates/edit_journey.html.ep b/templates/edit_journey.html.ep index cb867e5..6316731 100644 --- a/templates/edit_journey.html.ep +++ b/templates/edit_journey.html.ep @@ -69,13 +69,13 @@ Geplante Abfahrt - %= text_field 'sched_departure', id => 'sched_departure', class => 'validate', required => undef, pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9] +[0-9][0-9]:[0-9][0-9]' + %= datetime_field 'sched_departure', id => 'sched_departure', class => 'validate', required => undef Tatsächliche Abfahrt - %= text_field 'rt_departure', id => 'real_departure', class => 'validate', pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9] +[0-9][0-9]:[0-9][0-9]' + %= datetime_field 'rt_departure', id => 'real_departure', class => 'validate' @@ -87,13 +87,13 @@ Geplante Ankunft - %= text_field 'sched_arrival', id => 'sched_arrival', class => 'validate', required => undef, pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9] +[0-9][0-9]:[0-9][0-9]' + %= datetime_field 'sched_arrival', id => 'sched_arrival', class => 'validate', required => undef Tatsächliche Ankunft - %= text_field 'rt_arrival', id => 'real_arrival', class => 'validate', pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9] +[0-9][0-9]:[0-9][0-9]' + %= datetime_field 'rt_arrival', id => 'real_arrival', class => 'validate' -- cgit v1.2.3 From 7ac6d22b4faee90e98589fb827708a84f6e77bfc Mon Sep 17 00:00:00 2001 From: Cassidy Dingenskirchen Date: Sun, 29 Jun 2025 16:47:53 +0200 Subject: /history/map: date inputs --- lib/Travelynx/Controller/Traveling.pm | 8 +++----- templates/history_map.html.ep | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'lib/Travelynx/Controller') diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index 4c58c0e..5ecfcc0 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -1745,13 +1745,12 @@ sub map_history { my $with_polyline = $route_type eq 'beeline' ? 0 : 1; my $parser = DateTime::Format::Strptime->new( - pattern => '%d.%m.%Y', + pattern => '%F', locale => 'de_DE', time_zone => 'Europe/Berlin' ); - if ( $filter_from - and $filter_from =~ m{ ^ (\d+) [.] (\d+) [.] (\d+) $ }x ) + if ( $filter_from ) { $filter_from = $parser->parse_datetime($filter_from); } @@ -1759,8 +1758,7 @@ sub map_history { $filter_from = undef; } - if ( $filter_until - and $filter_until =~ m{ ^ (\d+) [.] (\d+) [.] (\d+) $ }x ) + if ( $filter_until ) { $filter_until = $parser->parse_datetime($filter_until)->set( hour => 23, diff --git a/templates/history_map.html.ep b/templates/history_map.html.ep index c2ff9ed..6620cb2 100644 --- a/templates/history_map.html.ep +++ b/templates/history_map.html.ep @@ -88,14 +88,14 @@

- %= text_field 'filter_from', id => 'filter_from', class => 'validate', pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9]( +[0-9][0-9]:[0-9][0-9])?' - + %= date_field 'filter_from', id => 'filter_from', class => 'validate' +
- %= text_field 'filter_to', id => 'filter_to', class => 'validate', pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9]( +[0-9][0-9]:[0-9][0-9])?' - + %= date_field 'filter_to', id => 'filter_to', class => 'validate' +
-- cgit v1.2.3 From b33bfcafb7c3b1b670b7ca7b46613a25589aff07 Mon Sep 17 00:00:00 2001 From: Cassidy Dingenskirchen Date: Sun, 29 Jun 2025 16:52:15 +0200 Subject: /checkin/add: datetime inputs, change intermediate stop input format to ISO8601 --- lib/Travelynx/Controller/Traveling.pm | 2 +- templates/add_intransit.html.ep | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/Travelynx/Controller') diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index 5ecfcc0..30c9d60 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -2617,7 +2617,7 @@ sub add_intransit_form { if ( $self->param('action') and $self->param('action') eq 'save' ) { my $parser = DateTime::Format::Strptime->new( - pattern => '%d.%m.%Y %H:%M', + pattern => '%FT%H:%M', locale => 'de_DE', time_zone => 'Europe/Berlin' ); diff --git a/templates/add_intransit.html.ep b/templates/add_intransit.html.ep index 9d711c9..193ec50 100644 --- a/templates/add_intransit.html.ep +++ b/templates/add_intransit.html.ep @@ -21,7 +21,7 @@
  • Eingabe der Fahrt als „Typ Linie Nummer“ oder „Typ Nummer“, z.B. „ICE 100“, „S 1 31133“ oder „ABR RE11 26720“
  • Wenn Nummer nicht bekannt oder vorhanden: einen beliebigen Integer eintragen, z.B. „S 5X 0“ oder „U 11 0“
    • -
  • Zeitangaben im Format DD.MM.YYYY HH:MM
    • +
  • Zeitangaben im Format YYYY-MM-DDTHH:MM.
  • Das ausgewählte Backend bestimmt die verfügbaren Halte für Start, Ziel und Route. Siehe auch stops.csv
    • @@ -50,8 +50,8 @@
    - %= text_field 'sched_departure', id => 'sched_departure', class => 'validate', required => undef, pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9] +[0-9][0-9]:[0-9][0-9]' - + %= datetime_field 'sched_departure', id => 'sched_departure', class => 'validate', required => undef +
    @@ -60,8 +60,8 @@
    - %= text_field 'sched_arrival', id => 'sched_arrival', class => 'validate', required => undef, pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9] +[0-9][0-9]:[0-9][0-9]' - + %= datetime_field 'sched_arrival', id => 'sched_arrival', class => 'validate', required => undef +
    -- cgit v1.2.3 From b0d565d65bcad0f5cb0cf1342c38f27a9388d4d4 Mon Sep 17 00:00:00 2001 From: Cassidy Dingenskirchen Date: Sun, 29 Jun 2025 16:58:04 +0200 Subject: /checkin/add: allow eliding date on intermediate stops --- lib/Travelynx/Controller/Traveling.pm | 32 ++++++++++++++++++++++++++++---- templates/add_intransit.html.ep | 4 ++-- 2 files changed, 30 insertions(+), 6 deletions(-) (limited to 'lib/Travelynx/Controller') diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index 30c9d60..74bb5c6 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -2621,6 +2621,11 @@ sub add_intransit_form { locale => 'de_DE', time_zone => 'Europe/Berlin' ); + my $time_parser = DateTime::Format::Strptime->new( + pattern => '%H:%M', + locale => 'de_DE', + time_zone => 'Europe/Berlin' + ); my %opt; my %trip; @@ -2708,7 +2713,7 @@ sub add_intransit_form { if ( $trip{route} ) { my @unknown_stations; - my $prev_epoch; + my $prev_ts = $trip{sched_departure}; for my $station ( @{ $trip{route} } ) { my $ts; my %station_data; @@ -2717,11 +2722,30 @@ sub add_intransit_form { ) { $station = $+{stop}; - $ts = $parser->parse_datetime( $+{timestamp} ); - if ( $ts and $ts->epoch > $prev_epoch ) { + # attempt to parse "07:08" short timestamp first + $ts = $time_parser->parse_datetime( $+{timestamp} ); + if ( $ts ) { + # fill in last stop's (or at the first stop, our departure's) + # date to complete the datetime + $ts = $ts->set( + year => $prev_ts->year, + month => $prev_ts->month, + day => $prev_ts->day + ); + # if we go back in time with this, assume we went + # over midnight and add a day, e.g. in case of a stop + # at 23:00 followed by one at 01:30 + if ($ts < $prev_ts) { + $ts = $ts->add( days => 1 ); + } + } else { + # do a full datetime parse + $ts = $parser->parse_datetime( $+{timestamp} ); + } + if ( $ts and $ts >= $prev_ts ) { $station_data{sched_arr} = $ts->epoch; $station_data{sched_dep} = $ts->epoch; - $prev_epoch = $ts->epoch; + $prev_ts = $ts; } else { $self->render( diff --git a/templates/add_intransit.html.ep b/templates/add_intransit.html.ep index 193ec50..a044917 100644 --- a/templates/add_intransit.html.ep +++ b/templates/add_intransit.html.ep @@ -21,7 +21,7 @@
  • Eingabe der Fahrt als „Typ Linie Nummer“ oder „Typ Nummer“, z.B. „ICE 100“, „S 1 31133“ oder „ABR RE11 26720“
  • Wenn Nummer nicht bekannt oder vorhanden: einen beliebigen Integer eintragen, z.B. „S 5X 0“ oder „U 11 0“
    • -
  • Zeitangaben im Format YYYY-MM-DDTHH:MM.
    • +
  • Zeitangaben im Format YYYY-MM-DDTHH:MM. Bei den Zwischenhalten kann auch nur HH:MM angegeben werden
  • Das ausgewählte Backend bestimmt die verfügbaren Halte für Start, Ziel und Route. Siehe auch stops.csv
    • @@ -69,7 +69,7 @@ %= text_area 'route', id => 'route', class => 'materialize-textarea'
    Eine Station pro Zeile, wahlweise Unterwegshalte oder komplette Route
    - Format: Name oder Name @ Zeitpunkt (inkl. Datum, siehe oben) + Format: Name oder Name @ Zeitpunkt (Format siehe oben, ein ggf. ausgelassenes Datum wird ergänzt)
    -- cgit v1.2.3