diff options
| author | Zakaria BOUZIANE | 2014-06-19 17:21:38 +0200 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2014-06-19 17:21:38 +0200 |
| commit | f6f936ed2c33035904a6c5c002ff21dd27df3f38 (patch) | |
| tree | 3ec9e7de691a461ff0a28c51dbf55f1f0b588236 | |
| parent | 998afbb9f9c0c193efa098634b259e871e979860 (diff) | |
| download | chouette-core-f6f936ed2c33035904a6c5c002ff21dd27df3f38.tar.bz2 | |
Listing number of Vehicle Journeys for a Line
| -rw-r--r-- | app/views/lines/show.html.erb | 12 | ||||
| -rw-r--r-- | config/locales/lines.yml | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb index d66c42d91..2b9961ca2 100644 --- a/app/views/lines/show.html.erb +++ b/app/views/lines/show.html.erb @@ -52,7 +52,9 @@ <% end %> <br> <%= @line.human_attribute_name("number_of_mrs_vj") %> : <%= @line.vehicle_journeys.where("mobility_restricted_suitability = ?", true).count %> <br> <%= @line.human_attribute_name("number_of_non_mrs_vj") %> : <%= @line.vehicle_journeys.where("mobility_restricted_suitability = ?", false).count %> - <br> <%= @line.human_attribute_name("number_of_vj") %> : <%= @line.vehicle_journeys.count %> + <br> <%= @line.human_attribute_name("number_of_null_mrs_vj") %> : <%= @line.vehicle_journeys.count - + (@line.vehicle_journeys.where("mobility_restricted_suitability = ?", true).count + + @line.vehicle_journeys.where("mobility_restricted_suitability = ?", false).count) %> </p> <p> <label><%= @line.human_attribute_name("flexible_service") %> : </label> @@ -65,7 +67,13 @@ <% end %> <br> <%= @line.human_attribute_name("number_of_fs_vj") %> : <%= @line.vehicle_journeys.where("flexible_service = ?", true).count %> <br> <%= @line.human_attribute_name("number_of_non_fs_vj") %> : <%= @line.vehicle_journeys.where("flexible_service = ?", false).count %> - <br> <%= @line.human_attribute_name("number_of_vj") %> : <%= @line.vehicle_journeys.count %> + <br> <%= @line.human_attribute_name("number_of_null_fs_vj") %> + <% if @line.flexible_service.nil? %> + (<%= @line.human_attribute_name("default_fs_msg") %>) + <% end %> + : <%= @line.vehicle_journeys.count - + (@line.vehicle_journeys.where("flexible_service = ?", true).count + + @line.vehicle_journeys.where("flexible_service = ?", false).count) %> </p> <p> diff --git a/config/locales/lines.yml b/config/locales/lines.yml index f9d4321ef..4f6a51553 100644 --- a/config/locales/lines.yml +++ b/config/locales/lines.yml @@ -61,6 +61,9 @@ en: number_of_mrs_vj: "Number of accessible vehicle journeys" number_of_non_fs_vj: "Number of non on demond vehicle journeys" number_of_non_mrs_vj: "Number of non accessible vehicle journeys" + number_of_null_fs_vj: "Number of unspecified on demond vehicle journeys" + number_of_null_mrs_vj: "Number of unspecified accessible vehicle journeys" + default_fs_msg: "These vehicle journeys are considered as regular" group_of_line: "Group of lines" comment: "Comments" objectid: "Neptune identifier" @@ -136,6 +139,9 @@ fr: number_of_mrs_vj: "Nombre de courses accessibles" number_of_non_fs_vj: "Nombre de courses régulières" number_of_non_mrs_vj: "Nombre de courses non accessibles" + number_of_null_fs_vj: "Nombre de courses sans spécification de type de service" + number_of_null_mrs_vj: "Nombre de courses sans spécification d'accessibilité" + default_fs_msg: "Ces courses sont considérées régulières" group_of_line: "Groupe de lignes" comment: "Commentaire" objectid: "Identifiant Neptune" |