diff options
| -rw-r--r-- | app/helpers/vehicle_journey_frequencies_helper.rb | 5 | ||||
| -rw-r--r-- | app/helpers/vehicle_journeys_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/journey_patterns/_journey_pattern.html.erb | 13 | ||||
| -rw-r--r-- | app/views/routes/_route.html.erb | 2 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/_vehicle_journeys.html.erb | 7 |
5 files changed, 24 insertions, 7 deletions
diff --git a/app/helpers/vehicle_journey_frequencies_helper.rb b/app/helpers/vehicle_journey_frequencies_helper.rb index 1c603e4b1..28cdc7d21 100644 --- a/app/helpers/vehicle_journey_frequencies_helper.rb +++ b/app/helpers/vehicle_journey_frequencies_helper.rb @@ -6,4 +6,9 @@ module VehicleJourneyFrequenciesHelper width = (right < left ? 100 - left : right - left) [left.round(2), width.round(2)] end + + def exist_vehicle_journey_frequencies?(route, journey_pattern=nil) + where = journey_pattern ? { journey_pattern: journey_pattern } : nil + route.vehicle_journey_frequencies.where(where).count > 0 + end end diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb index c5f3242be..e70f2954b 100644 --- a/app/helpers/vehicle_journeys_helper.rb +++ b/app/helpers/vehicle_journeys_helper.rb @@ -49,6 +49,10 @@ module VehicleJourneysHelper :stop => first_vjas.stop_point.stop_area.name, :time => vehicle_departure(vehicle)) end + + def exist_vehicle_journeys?(route) + route.vehicle_journeys.count > 0 + end end diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb index 5794f8d69..029b3c40e 100644 --- a/app/views/journey_patterns/_journey_pattern.html.erb +++ b/app/views/journey_patterns/_journey_pattern.html.erb @@ -21,9 +21,16 @@ <% end %> <p><%= t('.stop_count', :count => journey_pattern.stop_points.count, :route_count => @route.stop_points.count) %> | <%= t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count) %></p> <% if journey_pattern.vehicle_journeys.count > 0 %> - <p> - <i class="fa fa-clock-o"></i><%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), :class => "with_fa" %> - </p> + <p> + <i class="fa fa-clock-o"></i> + <%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), :class => "with_fa" %> + </p> + <% if exist_vehicle_journey_frequencies?(@route, journey_pattern) %> + <p> + <i class="fa fa-clock-o"></i> + <%= link_to t('vehicle_journey_frequencies.actions.index'), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}) %> + </p> + <% end %> <% end %> </div> </div> diff --git a/app/views/routes/_route.html.erb b/app/views/routes/_route.html.erb index 179f06a25..d428d5b38 100644 --- a/app/views/routes/_route.html.erb +++ b/app/views/routes/_route.html.erb @@ -30,7 +30,7 @@ <%= t('.no_journey_pattern')%> <% end%> </p> - <% if @line.vehicle_journey_frequencies? %> + <% if exist_vehicle_journey_frequencies?(route) %> <p> <i class="fa fa-clock-o"></i> <%= link_to t("vehicle_journey_frequencies.actions.index"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, route) %> diff --git a/app/views/vehicle_journeys/_vehicle_journeys.html.erb b/app/views/vehicle_journeys/_vehicle_journeys.html.erb index 3bff10b59..71a28ec6e 100644 --- a/app/views/vehicle_journeys/_vehicle_journeys.html.erb +++ b/app/views/vehicle_journeys/_vehicle_journeys.html.erb @@ -2,10 +2,11 @@ <span class="search"><%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @vehicle_journeys %> <span class="pull-right"> - <i class="fa fa-clock-o"></i> - <% if controller_name == 'vehicle_journey_frequencies' %> + <% if controller_name == 'vehicle_journey_frequencies' && exist_vehicle_journeys?(@route) %> + <i class="fa fa-clock-o"></i> <%= link_to t("vehicle_journeys.actions.show"), referential_line_route_vehicle_journeys_path(@referential, @line, @route) %> - <% else %> + <% elsif exist_vehicle_journey_frequencies?(@route) %> + <i class="fa fa-clock-o"></i> <%= link_to t("vehicle_journey_frequencies.actions.show"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route) %> <% end %> </span> |