diff options
| author | Birte Kristina Friesel <derf@finalrewind.org> | 2024-01-02 09:12:24 +0100 |
|---|---|---|
| committer | Birte Kristina Friesel <derf@finalrewind.org> | 2024-01-02 09:12:24 +0100 |
| commit | 1690a07d92696f0878a3d305e74c09530b3c49d6 (patch) | |
| tree | a0bfd9cd8a8dc01d8a45141d71471fcced8f6cac | |
| parent | 0229768fe6730a559a42a32d2e9a37fef202bc11 (diff) | |
Rename filter_after/filter_before to filter_from/filter_to (they're inclusive)
| -rwxr-xr-x | lib/Travelynx/Controller/Traveling.pm | 4 | ||||
| -rw-r--r-- | templates/history_by_year.html.ep | 4 | ||||
| -rw-r--r-- | templates/history_map.html.ep | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm index ac14c76..d92137b 100755 --- a/lib/Travelynx/Controller/Traveling.pm +++ b/lib/Travelynx/Controller/Traveling.pm @@ -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; diff --git a/templates/history_by_year.html.ep b/templates/history_by_year.html.ep index adc4840..6aa0c2d 100644 --- a/templates/history_by_year.html.ep +++ b/templates/history_by_year.html.ep @@ -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 %>&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 %>&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"> </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 %>&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 %>&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> diff --git a/templates/history_map.html.ep b/templates/history_map.html.ep index b6ebd9c..9218f76 100644 --- a/templates/history_map.html.ep +++ b/templates/history_map.html.ep @@ -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"> |