add tests for hub export

8 files changed, 107 insertions, 22 deletions

diff --git a/app/views/devise/mailer/invitation_instructions.fr.html.erb b/app/views/devise/mailer/invitation_instructions.fr.html.erb
index 7ef4e6c99..c932763f2 100644
--- a/app/views/devise/mailer/invitation_instructions.fr.html.erb
+++ b/app/views/devise/mailer/invitation_instructions.fr.html.erb
@@ -1,6 +1,6 @@
 <p>Bonjour <%= @resource.email %>,</p>
 
-<p>Ce message est une invitation pour accéder à <%= link_to nil, root_url %>, vous pouvez l'accepter en cliquant sur le lien suivant :</p>
+<p>Ce message est une invitation pour accéder à <%= link_to nil, unauthenticated_root_url %>, vous pouvez l'accepter en cliquant sur le lien suivant :</p>
 
 <p><%= link_to "Accepter l'invitation", accept_invitation_url(@resource, :invitation_token => @resource.invitation_token) %></p>
 
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index e0cad44a2..0c5ba77cf 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -8,8 +8,8 @@
       <%= f.input :password, :as => :password %>
       <%= f.input :password_confirmation, :as => :password %>
       
-      <div class="submit">
-        <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
+      <div class="col-md-offset-2">
+        <%= link_to t("cancel"), unauthenticated_root_path, :class => "btn btn-default" %>    
         <%= f.button :submit, :value => t("devise.passwords.edit.commit"), :class => "btn-info" %>
       </div>
       <% end %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 8f5ec0f10..498e24c4c 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -5,8 +5,8 @@
       <%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |form| %>
       <%= form.input :email, :as => :email, placeholder: 'user@domain.com'  %> 
 
-      <div class="submit">
-        <%= link_to t("cancel"), root_path, :class => "btn btn-default" %>    
+      <div class="col-md-offset-2">
+        <%= link_to t("cancel"), unauthenticated_root_path, :class => "btn btn-default" %>    
         <%= form.button :submit, :value => t("devise.passwords.new.commit"), :class => "btn-info" %>
       </div>
       <% end %>
diff --git a/app/views/layouts/_user_links.erb b/app/views/layouts/_user_links.erb
index 404f52172..bd9196b3f 100644
--- a/app/views/layouts/_user_links.erb
+++ b/app/views/layouts/_user_links.erb
@@ -1,5 +1,5 @@
 <ul class="user">
-  <li class="home"><%= link_to  t('layouts.home'), root_path %></li>
+  <li class="home"><%= link_to  t('layouts.home'), authenticated_root_path %></li>
 
   <% if user_signed_in?  %>
   <li> | </li>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 387221103..ac00bdfea 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -18,7 +18,7 @@
   </div>
 
   <div style="color: #333333; text-align:center; font-size: 10px;">
-    Envoyé par <%= link_to root_url, "Chouette" %>
+    Envoyé par <%= link_to "Chouette", unauthenticated_root_url %>
   </div>
 </body>
 </html>
diff --git a/app/views/rule_parameter_sets/_column_fields.html.erb b/app/views/rule_parameter_sets/_column_fields.html.erb
new file mode 100644
index 000000000..abb2af4a8
--- /dev/null
+++ b/app/views/rule_parameter_sets/_column_fields.html.erb
@@ -0,0 +1,11 @@
+  <td></td>
+  <td><%= t("activerecord.attributes.#{obj.table_name.singularize}.#{column}") %></td>
+  <% suffix = "column_#{column}_object_#{obj.table_name.singularize}"%>
+  <td> <%= f.check_box "unique_#{suffix}".to_sym, :class => "special" %></td>
+  <% if obj.columns_hash[column].type == :string %>
+    <td><%=  f.select "pattern_#{suffix}".to_sym, options_for_select([[t("rule_parameter_sets.labels.free_char"), "0"], [t("rule_parameter_sets.labels.num_char"), "1"], [t("rule_parameter_sets.labels.alpha_char"), "2"], [t("rule_parameter_sets.labels.upper_char"), "3"], [t("rule_parameter_sets.labels.lower_char"), "4"]]) %></td>
+  <% else %>
+    <td><%= t "rule_parameter_sets.labels.num_char" %></td>
+  <% end %>
+  <td><%= f.number_field "min_size_#{suffix}".to_sym,  :class => "special" %></td>
+  <td><%= f.number_field "max_size_#{suffix}".to_sym,  :class => "special" %></td>
diff --git a/app/views/rule_parameter_sets/_form.html.erb b/app/views/rule_parameter_sets/_form.html.erb
index 90d6850fb..905e7f691 100644
--- a/app/views/rule_parameter_sets/_form.html.erb
+++ b/app/views/rule_parameter_sets/_form.html.erb
@@ -17,9 +17,15 @@
     
     <%= form.input :vehicle_journey_number_min, :as => :number %>
     <%= form.input :vehicle_journey_number_max, :as => :number %>
+    
+    <%= form.input :check_lines_in_groups, :as => :boolean %>
+    <%= form.input :check_line_routes, :as => :boolean %>
+    <%= form.input :check_stop_parent, :as => :boolean %>
+    <%= form.input :check_connection_link_on_physical, :as => :boolean %>
     <%= form.input :check_allowed_transport_modes, :as => :boolean %>
     
     <table class="table table-striped table-condensed">
+      <thead>
     	<tr>
     		<th><%= t("transport_modes.name") %></th>
 			<% RuleParameterSet.mode_attribute_prefixes.each do |prefix| %>
@@ -31,12 +37,39 @@
                 <% end %>
 			<% end %>
         </tr>
+      </thead>
+      <tbody>
     <% Chouette::Line.transport_modes.map(&:to_s).each do |mode| %>
       <tr>
       <%= render :partial => "mode_fields", :locals => { :f => form, :mode => mode} %>
       </tr>
     <% end %>
+      </tbody>
+    </table>
+    
+    <%= t("rule_parameter_sets.labels.columns_restrictions") %>
+    <table class="table table-bordered table-condensed">
+    <% RuleParameterSet.validable_objects.each do |obj| %>
+      <thead>
+      <tr>
+         <th> <%= form.check_box "check_#{obj.table_name.singularize}".to_sym, :class => "special" %> <%= t("activerecord.models.#{obj.table_name.singularize}.one") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("attribute") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("unique") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("string_type") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("min_size") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("max_size") %></th>
+      </tr>
+      </thead>
+      <tbody>
+      <% RuleParameterSet.validable_columns[obj.table_name.singularize].each do |col| %>
+        <tr class="<%= "columns_for_#{obj.table_name}" %>">
+        <%= render :partial => "column_fields", :locals => { :f => form, :obj => obj, :column => col} %>
+        </tr>
+      <% end %>
+      </tbody>
+    <% end %>
     </table>
+
   <% end %>
 
    <%= form.actions do %>
diff --git a/app/views/rule_parameter_sets/show.html.erb b/app/views/rule_parameter_sets/show.html.erb
index 66e002b94..810730e50 100644
--- a/app/views/rule_parameter_sets/show.html.erb
+++ b/app/views/rule_parameter_sets/show.html.erb
@@ -68,26 +68,33 @@
       <label><%= t(".inter_stop_duration_max") %>: </label>
       <%= @rule_parameter_set.inter_stop_duration_max %>
     </p>
-    <% 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>
-    </div>
-    <% end %>
+    
+    <p>
+      <label><%= RuleParameterSet.human_attribute_name("check_lines_in_groups") %>: </label>
+      <%= @rule_parameter_set.check_lines_in_groups ? t("true") : t("false") %>
+    </p>
+
+    <p>
+      <label><%= RuleParameterSet.human_attribute_name("check_line_routes") %>: </label>
+      <%= @rule_parameter_set.check_line_routes ? t("true") : t("false") %>
+    </p>
+
+    <p>
+      <label><%= RuleParameterSet.human_attribute_name("check_stop_parent") %>: </label>
+      <%= @rule_parameter_set.check_stop_parent ? t("true") : t("false") %>
+    </p>
+
     <p>
+      <label><%= RuleParameterSet.human_attribute_name("check_connection_link_on_physical") %>: </label>
+      <%= @rule_parameter_set.check_allowed_transport_modes ? t("true") : t("false") %>
+    </p>
+
+    </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 %>
@@ -116,6 +123,40 @@
     	<% end %>
     </table>
     </div>
+    <div class="rule_parameter_by_object">
+    <label><%= t("rule_parameter_sets.labels.columns_restrictions") %>  </label>
+    <table class="table table-bordered table-condensed">
+    <% RuleParameterSet.validable_objects.each do |obj| %>
+    <% if @rule_parameter_set.selected(obj.table_name.singularize) %>
+      <thead>
+      <tr>
+            <th> <%= t("activerecord.models.#{obj.table_name.singularize}.one") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("attribute") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("unique") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("string_type") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("min_size") %></th>
+    		<th><%= RuleParameterSet.human_attribute_name("max_size") %></th>
+      </tr>
+      </thead>
+      <tbody>
+      <% RuleParameterSet.validable_columns[obj.table_name.singularize].each do |col| %>
+      <% if @rule_parameter_set.selected_column(obj.table_name.singularize,col)%>
+        <tr>
+		  <td></td>
+		  <td><%= t("activerecord.attributes.#{obj.table_name.singularize}.#{col}") %></td>
+		  <% suffix = "column_#{col}_object_#{obj.table_name.singularize}"%>
+		  <td><%= unique(@rule_parameter_set.send  "unique_#{suffix}".to_sym) %></td>
+		  <td><%= pattern(@rule_parameter_set.send  "pattern_#{suffix}".to_sym) %></td>
+		  <td><%= @rule_parameter_set.send  "min_size_#{suffix}".to_sym %></td>
+		  <td><%= @rule_parameter_set.send  "max_size_#{suffix}".to_sym %></td>
+        </tr>
+        <% end %>
+      <% end %>
+      </tbody>
+    <% end %>
+    <% end %>
+    </table>
+    </div>
   </div>
 </div>