Unverified Commit 180723a9 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'main' into motis

parents 479373b1 c90ae4cf

cpanfile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ requires 'Mojolicious::Plugin::OAuth2'; 
requires 'Mojo::Pg';

requires 'Text::CSV';

requires 'Text::Markdown';

requires 'Travel::Status::DE::DBRIS', '>= 0.08';

requires 'Travel::Status::DE::DBRIS', '>= 0.10';

requires 'Travel::Status::DE::HAFAS', '>= 6.20';

requires 'Travel::Status::DE::IRIS';

requires 'UUID::Tiny';

cpanfile.snapshot

+18 −21
Original line number Diff line number Diff line
@@ -1774,16 +1774,13 @@ DISTRIBUTIONS 
      if 0

      perl 5.006

      strict 0

  Module-Runtime-0.016

    pathname: Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz

  Module-Runtime-0.017

    pathname: H/HA/HAARG/Module-Runtime-0.017.tar.gz

    provides:

      Module::Runtime 0.016

      Module::Runtime 0.017

    requirements:

      Module::Build 0

      Test::More 0.41

      perl 5.006

      strict 0

      warnings 0

      ExtUtils::MakeMaker 0

      perl 5.006000

  Mojo-Pg-4.27

    pathname: S/SR/SRI/Mojo-Pg-4.27.tar.gz

    provides:
@@ -2106,10 +2103,10 @@ DISTRIBUTIONS 
      strict 0

      warnings 0

      warnings::register 0

  PkgConfig-0.25026

    pathname: P/PL/PLICEASE/PkgConfig-0.25026.tar.gz

  PkgConfig-0.26026

    pathname: P/PL/PLICEASE/PkgConfig-0.26026.tar.gz

    provides:

      PkgConfig 0.25026

      PkgConfig 0.26026

    requirements:

      ExtUtils::MakeMaker 6.56

      Test::More 0.94
@@ -2547,17 +2544,17 @@ DISTRIBUTIONS 
      TimeDate 1.21

    requirements:

      ExtUtils::MakeMaker 0

  Travel-Status-DE-DBRIS-0.09

    pathname: D/DE/DERF/Travel-Status-DE-DBRIS-0.09.tar.gz

  Travel-Status-DE-DBRIS-0.10

    pathname: D/DE/DERF/Travel-Status-DE-DBRIS-0.10.tar.gz

    provides:

      Travel::Status::DE::DBRIS 0.09

      Travel::Status::DE::DBRIS::Formation 0.09

      Travel::Status::DE::DBRIS::Formation::Carriage 0.09

      Travel::Status::DE::DBRIS::Formation::Group 0.09

      Travel::Status::DE::DBRIS::Formation::Sector 0.09

      Travel::Status::DE::DBRIS::Journey 0.09

      Travel::Status::DE::DBRIS::JourneyAtStop 0.09

      Travel::Status::DE::DBRIS::Location 0.09

      Travel::Status::DE::DBRIS 0.10

      Travel::Status::DE::DBRIS::Formation 0.10

      Travel::Status::DE::DBRIS::Formation::Carriage 0.10

      Travel::Status::DE::DBRIS::Formation::Group 0.10

      Travel::Status::DE::DBRIS::Formation::Sector 0.10

      Travel::Status::DE::DBRIS::Journey 0.10

      Travel::Status::DE::DBRIS::JourneyAtStop 0.10

      Travel::Status::DE::DBRIS::Location 0.10

    requirements:

      Carp 0

      Class::Accessor 0.16

lib/Travelynx.pm

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ sub startup { 
							eva          => $found->eva,

							datetime     => $found->sched_dep,

							train_type   => $journey->type,

							train_no     => $journey->number

							train_no     => $journey->train_no,

						);

						$self->add_stationinfo( $uid, 1, $train_id,

							$found->eva );

lib/Travelynx/Model/InTransit.pm

+7 −5
Original line number Diff line number Diff line
@@ -198,11 +198,13 @@ sub add { 
	elsif ( $journey and $stop ) {



		# DBRIS

		my $number = $journey->train_no // $journey->number // $train_suffix;



		my $line;

		if (    $train_suffix

			and $journey->number

			and $train_suffix ne $journey->number )

		{

		if ( defined $journey->line_no and $journey->line_no ne $number ) {

			$line = $journey->line_no;

		}

		elsif ( defined $train_suffix and $train_suffix ne $number ) {

			$line = $train_suffix;

		}
@@ -256,7 +258,7 @@ sub add { 
				dep_platform => $stop->platform,

				train_type   => $journey->type // q{},

				train_line   => $line,

				train_no     => $journey->number,

				train_no     => $number,

				train_id     => $data->{trip_id},

				sched_departure => $stop->sched_dep,

				real_departure  => $stop->rt_dep // $stop->sched_dep,

templates/_checked_in.html.ep

+5 −1
Original line number Diff line number Diff line
@@ -357,7 +357,11 @@ 
			</div>

			<div class="card-action">

				% my $url = 'https://dbf.finalrewind.org/z/';

				% if ($journey->{is_hafas}) {

				% if ($journey->{is_dbris}) {

					% $url .= $journey->{train_id} =~ s{#}{%23}gr . '?dbris=' . $journey->{backend_name};

					<a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left" aria-hidden="true">timeline</i> Details</a>

				% }

				% elsif ($journey->{is_hafas}) {

					% $url .= $journey->{train_id} =~ s{#}{%23}gr . '?hafas=' . $journey->{backend_name};

					<a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left" aria-hidden="true">timeline</i> Details</a>

				% }