Unverified Commit 5d3cf2cc authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Make "Zuglauf" links work for non-DB checkins 

replaces text with "Details" for those
parent 5c528816

templates/_checked_in.html.ep

+7 −11
Original line number Original line Diff line number Diff line
@@ -356,24 +356,20 @@ 
				% }

				% }

			</div>

			</div>

			<div class="card-action">

			<div class="card-action">

				% my $url = 'https://bahn.expert/details/';

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

				% if ($journey->{train_id} =~ m{[|]}) {

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

					% if ($journey->{train_type} and $journey->{train_no}) {

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

						% $url .= $journey->{train_type} . ' ' . $journey->{train_no};

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

				% }

				% }

					% $url .=  '/' . $journey->{sched_departure}->epoch . '000?jid=' . $journey->{train_id} =~ s{#}{%23}gr;

				% elsif ($journey->{extra_data}{trip_id}) {

				% }

					% $url .= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr;

				% else {

					% $url .= $journey->{train_type} . ' ' . $journey->{train_no} . '/' . $journey->{sched_departure}->epoch . '000?station=' . $journey->{dep_eva};

				% }

				% if ($journey->{backend_id} <= 1) {

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

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

				% }

				% }

				% else {

				% else {

					&nbsp;

					&nbsp;

				% }

				% }

				% if ($journey->{extra_data}{trip_id}) {

				% if ($journey->{extra_data}{trip_id}) {

					<a class="right" style="margin-right: 0;" href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr %>/<%= $journey->{train_line} || 0 %>?hafas=<%= $journey->{backend_name} // 'DB' %>&amp;from=<%= $journey->{dep_name} %>&amp;to=<%= $journey->{arr_name} %>&amp;dark=<%= (session('theme') and session('theme') eq 'dark') ? 1 : 0 %>"><i class="material-icons left" aria-hidden="true">map</i> Karte</a>

					<a class="right" style="margin-right: 0;" href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr %>/<%= $journey->{train_line} || 0 %>?hafas=<%= $journey->{backend_name} // 'VRN' %>&amp;from=<%= $journey->{dep_name} %>&amp;to=<%= $journey->{arr_name} %>"><i class="material-icons left" aria-hidden="true">map</i> Karte</a>

				% }

				% }

			</div>

			</div>

		</div>

		</div>

templates/_public_status_card.html.ep

+7 −2
Original line number Original line Diff line number Diff line
@@ -168,8 +168,13 @@ 
			<div class="card-action">

			<div class="card-action">

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

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

					<a style="margin-right: 0;" href="<%= $journey->{traewelling_url} %>"><i class="material-icons left">timeline</i> Träwelling</a>

					<a style="margin-right: 0;" href="<%= $journey->{traewelling_url} %>"><i class="material-icons left">timeline</i> Träwelling</a>

				% } elsif ($journey->{backend_id} <= 1) {

				% }

					% my $url = 'https://bahn.expert/details/' . $journey->{train_type} . ' ' . $journey->{train_no} . '/' . DateTime->now(time_zone => 'Europe/Berlin')->epoch . '000';

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

					% my $url = 'https://dbf.finalrewind.org/z/' . $journey->{train_id} =~ s{#}{%23}gr . '?hafas=' . $journey->{backend_name};

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

				% }

				% elsif ($journey->{extra_data}{trip_id}) {

					% my $url = 'https://dbf.finalrewind.org/z/' . $journey->{extra_data}{trip_id} =~ s{#}{%23}gr;

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

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

				% }

				% }

				% else {

				% else {