PrivateCoffee/travelynx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only show latest actions on main page

Browse source
This commit is contained in:
Daniel Friesel 2018-10-13 14:35:05 +02:00
parent ec1842054c
commit 33fd338bc5
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
index.pl
View file

@ -119,7 +119,7 @@ app->attr(
from user_actions from user_actions
join stations on station_id = stations.id join stations on station_id = stations.id
where user_id = ? where user_id = ?
order by action_time asc order by action_time desc
} }
); );
} }
@ -447,9 +447,9 @@ helper 'get_user_travels' => sub {
my $uid = $self->get_user_id; my $uid = $self->get_user_id;
my $query = $self->app->get_all_actions_query; my $query = $self->app->get_all_actions_query;
#if ($limit) { if ($limit) {
# $query = $self->app->get_last_actions_query; $query = $self->app->get_last_actions_query;
#} }
$query->execute($uid); $query->execute($uid);
my @travels; my @travels;
@ -465,37 +465,38 @@ helper 'get_user_travels' => sub {
$raw_route = decode( 'UTF-8', $raw_route ); $raw_route = decode( 'UTF-8', $raw_route );
$raw_messages = decode( 'UTF-8', $raw_messages ); $raw_messages = decode( 'UTF-8', $raw_messages );
if ( $action == $action_type{checkin} ) { if ( $action == $action_type{checkout} ) {
push( push(
@travels, @travels,
{ {
from_name => $name, to_name => $name,
sched_departure => epoch_to_dt($raw_sched_ts), sched_arrival => epoch_to_dt($raw_sched_ts),
rt_departure => epoch_to_dt($raw_real_ts), rt_arrival => epoch_to_dt($raw_real_ts),
type => $train_type, type => $train_type,
line => $train_line, line => $train_line,
no => $train_no, no => $train_no,
messages => [ split( qr{[|]}, $raw_messages ) ], messages => $raw_messages
route => [ split( qr{[|]}, $raw_route ) ], ? [ split( qr{[|]}, $raw_messages ) ]
: undef,
route => $raw_route ? [ split( qr{[|]}, $raw_route ) ]
: undef,
completed => 0, completed => 0,
} }
); );
} }
elsif ( $action == $action_type{checkout} ) { elsif ( $action == $action_type{checkin} and @travels ) {
my $ref = $travels[-1]; my $ref = $travels[-1];
$ref->{to_name} = $name; $ref->{from_name} = $name;
$ref->{completed} = 1; $ref->{completed} = 1;
$ref->{sched_departure} = epoch_to_dt($raw_sched_ts),
# if train_no is undef, we have a forced checkout without data $ref->{rt_departure} = epoch_to_dt($raw_real_ts),
if ($train_no) { $ref->{type} //= $train_type;
$ref->{sched_arrival} = epoch_to_dt($raw_sched_ts), $ref->{line} //= $train_line;
$ref->{rt_arrival} = epoch_to_dt($raw_real_ts), $ref->{no} //= $train_no;
$ref->{messages} = [ split( qr{[|]}, $raw_messages ) ]; $ref->{messages} //= [ split( qr{[|]}, $raw_messages ) ];
$ref->{route} //= [ split( qr{[|]}, $raw_route ) ];
} }
} }
}
@travels = reverse @travels;
return @travels; return @travels;
}; };