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

Rename filter_after/filter_before to filter_from/filter_to (they're inclusive)

Browse source
This commit is contained in:
Birte Kristina Friesel 2024-01-02 09:12:24 +01:00
parent 0229768fe6
commit 1690a07d92
No known key found for this signature in database
GPG key ID: 19E6E524EBB177BA
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Travelynx/Controller/Traveling.pm
View file

@ -1309,8 +1309,8 @@ sub map_history {
}
my $route_type = $self->param('route_type');
my $filter_from = $self->param('filter_after');
my $filter_until = $self->param('filter_before');
my $filter_from = $self->param('filter_from');
my $filter_until = $self->param('filter_to');
my $filter_type = $self->param('filter_type');
my $with_polyline = $route_type eq 'beeline' ? 0 : 1;

4
templates/history_by_year.html.ep
View file

@ -7,7 +7,7 @@
<div class="row">
% if (stash('have_review')) {
<div class="col s12 m12 l5 center-align">
<a href="/history/map?filter_after=1.1.<%= $year %>&amp;filter_before=31.12.<%= $year %>" class="waves-effect waves-light btn"><i class="material-icons left" aria-hidden="true">map</i> Karte</a>
<a href="/history/map?filter_from=1.1.<%= $year %>&amp;filter_to=31.12.<%= $year %>" class="waves-effect waves-light btn"><i class="material-icons left" aria-hidden="true">map</i> Karte</a>
</div>
<div class="col s12 m12 l2">&nbsp;</div>
<div class="col s12 m12 l5 center-align">
@ -16,7 +16,7 @@
% }
% else {
<div class="col s12 m12 l12 center-align">
<a href="/history/map?filter_after=1.1.<%= $year %>&amp;filter_before=31.12.<%= $year %>" class="waves-effect waves-light btn"><i class="material-icons left" aria-hidden="true">map</i> Karte</a>
<a href="/history/map?filter_from=1.1.<%= $year %>&amp;filter_to=31.12.<%= $year %>" class="waves-effect waves-light btn"><i class="material-icons left" aria-hidden="true">map</i> Karte</a>
</div>
% }
</div>

12
templates/history_map.html.ep
View file

@ -3,8 +3,8 @@
% if (stash('year')) {
Fahrten im Jahr <strong><%= stash('year') %></strong>
% }
% elsif (param('filter_after') and param('filter_before')) {
Fahrten zwischen dem <strong><%= param('filter_after') %></strong> und dem <strong><%= param('filter_before') %></strong>
% elsif (param('filter_from') and param('filter_to')) {
Fahrten zwischen dem <strong><%= param('filter_from') %></strong> und dem <strong><%= param('filter_to') %></strong>
% }
% elsif (@{$station_coordinates}) {
Alle bisherigen Fahrten
@ -73,14 +73,14 @@
</p>
<div class="row">
<div class="input-field col s12">
%= text_field 'filter_after', id => 'filter_after', class => 'validate', pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9]( +[0-9][0-9]:[0-9][0-9])?'
<label for="filter_after">Abfahrt ab (DD.MM.YYYY)</label>
%= text_field 'filter_from', id => 'filter_from', class => 'validate', pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9]( +[0-9][0-9]:[0-9][0-9])?'
<label for="filter_from">Abfahrt ab (DD.MM.YYYY)</label>
</div>
</div>
<div class="row">
<div class="input-field col s12">
%= text_field 'filter_before', id => 'filter_before', class => 'validate', pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9]( +[0-9][0-9]:[0-9][0-9])?'
<label for="filter_before">Abfahrt bis (DD.MM.YYYY)</label>
%= text_field 'filter_to', id => 'filter_to', class => 'validate', pattern => '[0-9][0-9]?[.][0-9][0-9]?[.][0-9][0-9][0-9][0-9]( +[0-9][0-9]:[0-9][0-9])?'
<label for="filter_to">Abfahrt bis (DD.MM.YYYY)</label>
</div>
</div>
<div class="row">