diff --git a/lib/Travelynx.pm b/lib/Travelynx.pm index d313b25..3e65963 100755 --- a/lib/Travelynx.pm +++ b/lib/Travelynx.pm @@ -317,7 +317,7 @@ sub startup { 'checkin' => sub { my ( $self, $station, $train_id ) = @_; - my $status = $self->get_departures( $station, 140, 30 ); + my $status = $self->get_departures( $station, 140, 40 ); if ( $status->{errstr} ) { return ( undef, $status->{errstr} ); } @@ -753,6 +753,10 @@ sub startup { return $res_h->{id}; } + if ( $opt{readonly} ) { + return; + } + $self->pg->db->insert( 'stations', { @@ -1495,14 +1499,11 @@ sub startup { ); $self->helper( - 'get_connection_targets' => sub { + 'get_latest_dest_id' => sub { my ( $self, %opt ) = @_; - my $uid = $opt{uid} // $self->current_user->{id}; - my $threshold = $opt{threshold} - // DateTime->now( time_zone => 'Europe/Berlin' ) - ->subtract( weeks => 6 ); - my $db = $opt{db} // $self->pg->db; + my $uid = $opt{uid} // $self->current_user->{id}; + my $db = $opt{db} // $self->pg->db; my $journey = $db->select( 'in_transit', ['checkout_station_id'], { user_id => $uid } )->hash; @@ -1525,6 +1526,37 @@ sub startup { return; } + return $journey->{checkout_station_id}; + } + ); + + $self->helper( + 'get_connection_targets' => sub { + my ( $self, %opt ) = @_; + + my $uid = $opt{uid} //= $self->current_user->{id}; + my $threshold = $opt{threshold} + // DateTime->now( time_zone => 'Europe/Berlin' ) + ->subtract( weeks => 6 ); + my $db = $opt{db} //= $self->pg->db; + my $min_count = $opt{min_count} // 3; + + my $dest_id; + + if ( $opt{ds100} ) { + $dest_id = $self->get_station_id( + ds100 => $opt{ds100}, + readonly => 1 + ); + } + else { + $dest_id = $self->get_latest_dest_id(%opt); + } + + if ( not $dest_id ) { + return; + } + my $res = $db->query( qq{ select @@ -1539,11 +1571,12 @@ sub startup { order by count desc; }, $uid, - $journey->{checkout_station_id}, + $dest_id, $threshold ); - my @destinations = $res->hashes->grep( sub { shift->{count} > 2 } ) - ->map( sub { shift->{dest} } )->each; + my @destinations + = $res->hashes->grep( sub { shift->{count} >= $min_count } ) + ->map( sub { shift->{dest} } )->each; return @destinations; } ); @@ -1552,21 +1585,41 @@ sub startup { 'get_connecting_trains' => sub { my ( $self, %opt ) = @_; - my $status = $self->get_user_status; + my $uid = $opt{uid} //= $self->current_user->{id}; + my $use_history = $self->account_use_history($uid); - if ( not $status->{arr_ds100} ) { + my ( $ds100, $exclude_via, $exclude_train_id, $exclude_before ); + + if ( $opt{ds100} ) { + if ( $use_history & 0x01 ) { + $ds100 = $opt{ds100}; + } + } + else { + if ( $use_history & 0x02 ) { + my $status = $self->get_user_status; + $ds100 = $status->{arr_ds100}; + $exclude_via = $status->{dep_name}; + $exclude_train_id = $status->{train_id}; + $exclude_before = $status->{real_arrival}->epoch; + } + } + + if ( not $ds100 ) { return; } my @destinations = $self->get_connection_targets(%opt); - @destinations = grep { $_ ne $status->{dep_name} } @destinations; + + if ($exclude_via) { + @destinations = grep { $_ ne $exclude_via } @destinations; + } if ( not @destinations ) { return; } - my $stationboard - = $self->get_departures( $status->{arr_ds100}, 0, 60 ); + my $stationboard = $self->get_departures( $ds100, 0, 40 ); if ( $stationboard->{errstr} ) { return; } @@ -1576,16 +1629,19 @@ sub startup { if ( not $train->departure ) { next; } - if ( $train->departure->epoch < $status->{real_arrival}->epoch ) + if ( $exclude_before + and $train->departure->epoch < $exclude_before ) { next; } - if ( $train->train_id eq $status->{train_id} ) { + if ( $exclude_train_id + and $train->train_id eq $exclude_train_id ) + { next; } my @via = ( $train->route_post, $train->route_end ); for my $dest (@destinations) { - if ( $via_count{$dest} < 3 + if ( $via_count{$dest} < 2 and List::Util::any { $_ eq $dest } @via ) { push( @results, [ $train, $dest ] ); @@ -1608,6 +1664,24 @@ sub startup { } ); + $self->helper( + 'account_use_history' => sub { + my ( $self, $uid, $value ) = @_; + + if ($value) { + $self->pg->db->update( + 'users', + { use_history => $value }, + { id => $uid } + ); + } + else { + return $self->pg->db->select( 'users', ['use_history'], + { id => $uid } )->hash->{use_history}; + } + } + ); + $self->helper( 'get_user_travels' => sub { my ( $self, %opt ) = @_; @@ -2113,6 +2187,7 @@ sub startup { $authed_r->get('/account')->to('account#account'); $authed_r->get('/account/privacy')->to('account#privacy'); $authed_r->get('/account/hooks')->to('account#webhook'); + $authed_r->get('/account/insight')->to('account#insight'); $authed_r->get('/ajax/status_card.html')->to('traveling#status_card'); $authed_r->get('/cancelled')->to('traveling#cancelled'); $authed_r->get('/account/password')->to('account#password_form'); @@ -2128,6 +2203,7 @@ sub startup { $authed_r->get('/confirm_mail/:token')->to('account#confirm_mail'); $authed_r->post('/account/privacy')->to('account#privacy'); $authed_r->post('/account/hooks')->to('account#webhook'); + $authed_r->post('/account/insight')->to('account#insight'); $authed_r->post('/journey/add')->to('traveling#add_journey_form'); $authed_r->post('/journey/edit')->to('traveling#edit_journey'); $authed_r->post('/account/password')->to('account#change_password'); diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm index a15390d..99fcc61 100644 --- a/lib/Travelynx/Command/database.pm +++ b/lib/Travelynx/Command/database.pm @@ -535,6 +535,17 @@ my @migrations = ( } ); }, + + # v12 -> v13 + sub { + my ($db) = @_; + $db->query( + qq{ + alter table users add column use_history smallint default 255; + update schema_version set version = 13; + } + ); + }, ); sub setup_db { diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm index e2bfd39..0275b96 100644 --- a/lib/Travelynx/Controller/Account.pm +++ b/lib/Travelynx/Controller/Account.pm @@ -232,6 +232,38 @@ sub privacy { } } +sub insight { + my ($self) = @_; + + my $user = $self->current_user; + my $use_history = $self->account_use_history( $user->{id} ); + + if ( $self->param('action') and $self->param('action') eq 'save' ) { + if ( $self->param('on_departure') ) { + $use_history |= 0x01; + } + else { + $use_history &= ~0x01; + } + + if ( $self->param('on_arrival') ) { + $use_history |= 0x02; + } + else { + $use_history &= ~0x02; + } + + $self->account_use_history( $user->{id}, $use_history ); + $self->flash( success => 'use_history' ); + $self->redirect_to('account'); + } + + $self->param( on_departure => $use_history & 0x01 ? 1 : 0 ); + $self->param( on_arrival => $use_history & 0x02 ? 1 : 0 ); + $self->render('use_history'); + +} + sub webhook { my ($self) = @_; diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep index d5b14e5..ebe84e8 100644 --- a/templates/_checked_in.html.ep +++ b/templates/_checked_in.html.ep @@ -79,6 +79,10 @@ % } % if (defined $journey->{arrival_countdown} and $journey->{arrival_countdown} < (20*60)) { % if (my @connections = get_connecting_trains()) { + Verbindungen + % if ($journey->{arrival_countdown} < 0) { +
Zug auswählen zum Einchecken mit Zielwahl.
+ % } %= include '_connections', connections => \@connections, checkin_from => $journey->{arrival_countdown} < 0 ? $journey->{arr_ds100} : undef; % } % } diff --git a/templates/_checked_out.html.ep b/templates/_checked_out.html.ep index 18b613b..ca9373d 100644 --- a/templates/_checked_out.html.ep +++ b/templates/_checked_out.html.ep @@ -5,6 +5,8 @@ bis <%= $journey->{arr_name} %> % if (now()->epoch - $journey->{timestamp}->epoch < (30*60)) { % if (my @connections = get_connecting_trains()) { + Verbindungen +Zug auswählen zum Einchecken mit Zielwahl.
%= include '_connections', connections => \@connections, checkin_from => $journey->{arr_ds100}; % } % } diff --git a/templates/_connections.html.ep b/templates/_connections.html.ep index 1c7f003..d421d4e 100644 --- a/templates/_connections.html.ep +++ b/templates/_connections.html.ep @@ -1,8 +1,4 @@ -Verbindungen -% if ($checkin_from) { -Zug auswählen zum Einchecken mit Zielwahl.
-% } -