diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2020-12-21 19:11:52 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2020-12-21 19:11:52 +0100 |
| commit | f9d1ea47ff7a444f4468aa4fbfade1120d500066 (patch) | |
| tree | 661a76f6af08c97a7b8a23d7391b908064a2287f /lib/DBInfoscreen | |
| parent | 1a6c3ad4ee00a22c684a4142784fc5e2d1a2bc26 (diff) | |
keep detailed mode when following links; show train attributes in detailed mode3.8.1
Diffstat (limited to 'lib/DBInfoscreen')
| -rw-r--r-- | lib/DBInfoscreen/Controller/Stationboard.pm | 5 | ||||
| -rw-r--r-- | lib/DBInfoscreen/Controller/Wagenreihung.pm | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm index b168b6b..0367655 100644 --- a/lib/DBInfoscreen/Controller/Stationboard.pm +++ b/lib/DBInfoscreen/Controller/Stationboard.pm @@ -677,7 +677,8 @@ sub render_train { $self->app->train_details_db->{ $departure->{train_no} }, dt_now => DateTime->now( time_zone => 'Europe/Berlin' ), station_name => $station_name, - nav_link => '/' . $station_name, + nav_link => + $self->url_with( 'station', station => $station_name ), ); } )->wait; @@ -1236,7 +1237,7 @@ sub handle_result { or $template eq 'multi' ), force_mobile => ( $template eq 'app' ), - nav_link => '/' . $station_name, + nav_link => $self->url_with( 'station', station => $station_name ), ); } return; diff --git a/lib/DBInfoscreen/Controller/Wagenreihung.pm b/lib/DBInfoscreen/Controller/Wagenreihung.pm index 36f486b..4707d03 100644 --- a/lib/DBInfoscreen/Controller/Wagenreihung.pm +++ b/lib/DBInfoscreen/Controller/Wagenreihung.pm @@ -27,8 +27,9 @@ sub zugbildung_db { my @wagons; for my $wagon ( @{ $details->{wagons} } ) { - my ( $wagon_type, $wagon_number ) = @{$wagon}; - my %wagon = ( + my $wagon_type = $wagon->{type}; + my $wagon_number = $wagon->{number}; + my %wagon = ( fahrzeugnummer => "", fahrzeugtyp => $wagon_type, kategorie => $wagon_type =~ m{^[0-9.]+$} ? 'LOK' : '', @@ -56,7 +57,7 @@ sub zugbildung_db { $pos += 5; } - my $train_type = $details->{raw}; + my $train_type = $details->{rawType}; $train_type =~ s{ - .* }{}x; my $route_start = $details->{route}{start} // $details->{route}{preStart}; |