From 147e6ae849ebb906ee763b5a39d77b6cd95980f2 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sun, 7 Oct 2018 13:47:32 +0200
Subject: [PATCH] Only show latest travels on landing page

---
 index.pl                      | 18 ++++++++++++------
 templates/landingpage.html.ep |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/index.pl b/index.pl
index d701e36..3bdb7e6 100755
--- a/index.pl
+++ b/index.pl
@@ -131,7 +131,9 @@ app->attr(
 		return $self->app->dbh->prepare(
 			qq{
 			select action_id, action_time, stations.ds100, stations.name,
-			train_type, train_line, train_no, train_id, route
+			train_type, train_line, train_no, train_id,
+			sched_time, real_time,
+			route, messages
 			from user_actions
 			join stations on station_id = stations.id
 			where user_id = ?
@@ -441,14 +443,18 @@ helper 'get_user_id' => sub {
 };
 
 helper 'get_user_travels' => sub {
-	my ($self) = @_;
+	my ( $self, $limit ) = @_;
 
-	my $uid = $self->get_user_id;
-	$self->app->get_all_actions_query->execute($uid);
+	my $uid   = $self->get_user_id;
+	my $query = $self->app->get_all_actions_query;
+	if ($limit) {
+		$query = $self->app->get_last_actions_query;
+	}
+	$query->execute($uid);
 
 	my @travels;
 
-	while ( my @row = $self->app->get_all_actions_query->fetchrow_array ) {
+	while ( my @row = $query->fetchrow_array ) {
 		my (
 			$action,       $raw_ts,      $ds100,     $name,
 			$train_type,   $train_line,  $train_no,  $train_id,
@@ -505,7 +511,7 @@ helper 'get_user_status' => sub {
 		my $now = DateTime->now( time_zone => 'Europe/Berlin' );
 		my $ts = epoch_to_dt( $rows->[0][1] );
 		my $checkin_station_name = decode( 'UTF-8', $rows->[0][3] );
-		my @route = split( qr{[|]}, decode( 'UTF-8', $rows->[0][8] // q{} ) );
+		my @route = split( qr{[|]}, decode( 'UTF-8', $rows->[0][10] // q{} ) );
 		my @route_after;
 		my $is_after = 0;
 		for my $station (@route) {
diff --git a/templates/landingpage.html.ep b/templates/landingpage.html.ep
index c7a28bd..c1d62d8 100644
--- a/templates/landingpage.html.ep
+++ b/templates/landingpage.html.ep
@@ -34,7 +34,7 @@
 		% }
 	</div>
 </div>
-<h1>Bisherige Fahrten</h1>
+<h1>Letzte Fahrten</h1>
 <div class="row">
 	<table class="striped">
 		<thead>
@@ -46,7 +46,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			% for my $travel (get_user_travels()) {
+			% for my $travel (get_user_travels(1)) {
 				% if ($travel->{completed}) {
 					<tr>
 						<td><%= $travel->{sched_departure}->strftime('%d.%m.%Y') %></td>