Merge branch 'sismo_val' into sismo

3 files changed, 84 insertions, 26 deletions

diff --git a/app/views/rule_parameter_sets/_form.html.erb b/app/views/rule_parameter_sets/_form.html.erb
index 1f12d6b14..90d6850fb 100644
--- a/app/views/rule_parameter_sets/_form.html.erb
+++ b/app/views/rule_parameter_sets/_form.html.erb
@@ -14,10 +14,29 @@
     <%= form.input :inter_access_link_distance_max, :as => :number %>
     <%= form.input :inter_stop_duration_max, :as => :number %>
     <%= form.input :facility_stop_area_distance_max, :as => :number %>
-
+    
+    <%= form.input :vehicle_journey_number_min, :as => :number %>
+    <%= form.input :vehicle_journey_number_max, :as => :number %>
+    <%= form.input :check_allowed_transport_modes, :as => :boolean %>
+    
+    <table class="table table-striped table-condensed">
+    	<tr>
+    		<th><%= t("transport_modes.name") %></th>
+			<% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
+			    <% if prefix == "allowed_transport" %>
+                  <% hidden = (@rule_parameter_set.check_allowed_transport_modes == "1") ? "" : 'display:none;'%>
+            <th class="allowed" style="<%= hidden %>" ><%= RuleParameterSet.human_attribute_name(prefix) %></th>
+                <% else %>
+            <th><%= RuleParameterSet.human_attribute_name(prefix) %></th>
+                <% end %>
+			<% end %>
+        </tr>
     <% Chouette::Line.transport_modes.map(&:to_s).each do |mode| %>
+      <tr>
       <%= render :partial => "mode_fields", :locals => { :f => form, :mode => mode} %>
+      </tr>
     <% end %>
+    </table>
   <% end %>
 
    <%= form.actions do %>
@@ -25,3 +44,11 @@
      <%= form.action :cancel, :as => :link %>
    <% end %>
 <% end %>
+
+<script>
+	$(function() {
+        $( "#rule_parameter_set_check_allowed_transport_modes").change( function(){
+            $(".allowed").toggle();
+        });
+    });
+</script>
diff --git a/app/views/rule_parameter_sets/_mode_fields.html.erb b/app/views/rule_parameter_sets/_mode_fields.html.erb
index 0a17b4d82..a305c4d0a 100644
--- a/app/views/rule_parameter_sets/_mode_fields.html.erb
+++ b/app/views/rule_parameter_sets/_mode_fields.html.erb
@@ -1,5 +1,12 @@
-<%= f.inputs t("transport_modes.label.#{mode}"), :id => "specific_parameters_#{mode}" do %>
+  <td><%= t("transport_modes.label.#{mode}") %></td>
   <% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
-    <%= f.input "#{prefix}_mode_#{mode}".to_sym, :as => :number, :label => RuleParameterSet.human_attribute_name(prefix), :wrapper_html => { :class => "special"} %>
+    <% if prefix == "allowed_transport" %>
+    <% hidden = (@rule_parameter_set.check_allowed_transport_modes == "1") ? "" : 'display: none;'%>
+    <td class="allowed" style="<%= hidden %>" >
+      <%= f.check_box "#{prefix}_mode_#{mode}".to_sym, :class => "special" %>
+    <% else%>
+    <td>
+      <%= f.number_field "#{prefix}_mode_#{mode}".to_sym,  :class => "special" %>
+    <% end %>
+    </td>
   <% end %>
-<% end %>
diff --git a/app/views/rule_parameter_sets/show.html.erb b/app/views/rule_parameter_sets/show.html.erb
index f4ca5e912..66e002b94 100644
--- a/app/views/rule_parameter_sets/show.html.erb
+++ b/app/views/rule_parameter_sets/show.html.erb
@@ -4,10 +4,6 @@
 
   <div class="summary">
     <p>
-      <label><%= RuleParameterSet.human_attribute_name("name") %>: </label>
-      <%= @rule_parameter_set.name %>
-    </p>
-    <p>
       <label><%= RuleParameterSet.human_attribute_name("stop_areas_area") %>: </label>
       <%= @rule_parameter_set.stop_areas_area %>
     </p>
@@ -72,25 +68,53 @@
       <label><%= t(".inter_stop_duration_max") %>: </label>
       <%= @rule_parameter_set.inter_stop_duration_max %>
     </p>
-    <div class="rule_parameter_by_mode">
-      <label><%= t(".rule_parameter_by_mode") %>: </label>
-      <select id="mode" >
-        <%= options_for_select( Chouette::Line.transport_modes.map(&:to_s).map { |s| [ I18n.t("transport_modes.label.#{s}"), s]}, 1) %>
-      </select>
-      <% Chouette::Line.transport_modes.map(&:to_s).each_with_index do |mode, index| %>
-        <% selected_class = (index==0) ? 'selected' : '' %>
-        <% style = (index==0) ? "style='display: block;'" : '' %>
-        <div class='<%= "#{mode} mode_specific #{selected_class}" %>' <%= style %> >
-        <% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
-          <% unless @rule_parameter_set.send("#{prefix}_mode_#{mode}" ).blank? %>
-            <p>
-              <label><%= RuleParameterSet.human_attribute_name( prefix) %>: </label>
-              <%= @rule_parameter_set.send  "#{prefix}_mode_#{mode}" %>
-            </p>
-          <% end %>
-        <% end %>
+    <% if @rule_parameter_set.vehicle_journey_number_min.present? && @rule_parameter_set.vehicle_journey_number_max.present? %>
+    <div class="attributes_group" >
+      <span class="title"><%= t(".vehicle_journey_number_bounds") %></span>
+      <div class="columns">
+        <div class="two_columns">
+          <label><%= t(".min_value") %> : </label>
+          <span class="value"><%= @rule_parameter_set.vehicle_journey_number_min %></span>
+        </div>
+        <div class="two_columns">
+          <label><%= t(".max_value") %> : </label>
+          <span class="value"><%= @rule_parameter_set.vehicle_journey_number_max %></span>
+        </div>
       </div>
-      <% end %>
+    </div>
+    <% end %>
+    <p>
+      <label><%= RuleParameterSet.human_attribute_name("check_allowed_transport_modes") %>: </label>
+      <%= @rule_parameter_set.check_allowed_transport_modes ? t("true") : t("false") %>
+    </p>
+
+    <div class="rule_parameter_by_mode">
+    <label><%= t(".rule_parameter_by_mode") %>
+    	<%= t(".modes_allowed") if @rule_parameter_set.check_allowed_transport_modes %>
+    </label>
+    <table class="table table-striped table-condensed">
+    	<tr>
+    		<th><%= t("transport_modes.name") %></th>
+			<% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
+			    <% unless prefix == "allowed_transport" %>
+            		<th><%= RuleParameterSet.human_attribute_name(prefix) %></th>
+                <% end %>
+			<% end %>
+        </tr>
+    	<% Chouette::Line.transport_modes.map(&:to_s).each do |mode| %>
+	    	<% if @rule_parameter_set.allowed(mode) %>
+      	<tr>
+  			<td><%= t("transport_modes.label.#{mode}") %></td>
+  			<% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
+	    
+    			<% unless prefix == "allowed_transport" %>
+    		<td><%= @rule_parameter_set.send  "#{prefix}_mode_#{mode}" %></td>
+    			<% end %>
+  			<% end %>
+      	</tr>
+    		<% end %>
+    	<% end %>
+    </table>
     </div>
   </div>
 </div>