Mirrors/travelynx
2
0
Fork 0
mirror of https://github.com/derf/travelynx synced 2024-11-26 06:20:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

handle substitute connections in passenger rights form

Browse source
This commit is contained in:
Daniel Friesel 2019-09-18 20:21:16 +02:00
parent 8e6ee729e0
commit 1cb26e2053
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/Travelynx/Controller/Passengerrights.pm
View file

@ -75,6 +75,9 @@ sub mark_substitute_connection {
$journey->{has_substitute} = 1;
$journey->{from_substitute} = $first_substitute;
$journey->{to_substitute} = $last_substitute;
$journey->{substitute_delay}
= ( $last_substitute->{rt_arrival}->epoch
- $journey->{sched_arrival}->epoch ) / 60;
}
}
@ -177,7 +180,10 @@ sub generate {
= ( $journey->{rt_arrival}->epoch - $journey->{sched_arrival}->epoch )
/ 60;
if ( $journey->{delay} < 120 ) {
if ( $journey->{cancelled} ) {
$self->mark_substitute_connection($journey);
}
elsif ( $journey->{delay} < 120 ) {
my @connections = $self->get_user_travels(
uid => $uid,
after => $journey->{rt_arrival},
@ -209,7 +215,34 @@ sub generate {
$pdf->fillFormFields( 'S1F7', $journey->{to_name} );
}
if ( not $journey->{cancelled} ) {
if ( $journey->{has_substitute} ) {
# arived with: TRAIN NO
$pdf->fillFormFields( 'S1F13', $journey->{to_substitute}{type} );
$pdf->fillFormFields( 'S1F14', $journey->{to_substitute}{no} );
# arrival YYMMDD
$pdf->fillFormFields( 'S1F10',
$journey->{to_substitute}{rt_arrival}->strftime('%d') );
$pdf->fillFormFields( 'S1F11',
$journey->{to_substitute}{rt_arrival}->strftime('%m') );
$pdf->fillFormFields( 'S1F12',
$journey->{to_substitute}{rt_arrival}->strftime('%y') );
# arrival HHMM
$pdf->fillFormFields( 'S1F15',
$journey->{to_substitute}{rt_arrival}->strftime('%H') );
$pdf->fillFormFields( 'S1F16',
$journey->{to_substitute}{rt_arrival}->strftime('%M') );
if ( $journey->{from_substitute} != $journey->{to_substitute} ) {
# last change in:
$pdf->fillFormFields( 'S1F24',
$journey->{to_substitute}{from_name} );
}
}
elsif ( not $journey->{cancelled} ) {
# arived with: TRAIN NO
if ( $journey->{connection} ) {

6
templates/passengerrights.html.ep
View file

@ -42,12 +42,12 @@
</a></td>
<td>
% if ($journey->{cancelled}) {
Ausfall
% if ($journey->{has_substitute}) {
(Ersatzverbindung)
Ausfall, Ersatzverbindung
%= sprintf('%+d', $journey->{substitute_delay})
% }
% else {
ohne Ersatzverbindung
Ausfall ohne Ersatzverbindung
% }
% }
% elsif ($journey->{connection}) {