add date and period on timetables and missing fields on connectionlinks

2 files changed, 50 insertions, 2 deletions

diff --git a/app/views/connection_links/_form.erb b/app/views/connection_links/_form.erb
index 31777c253..31c3e3bde 100644
--- a/app/views/connection_links/_form.erb
+++ b/app/views/connection_links/_form.erb
@@ -3,7 +3,16 @@
   <%= form.inputs do %> 
     <%= form.input :name %>
     <%= form.input :connection_link_type, :as => :select, :collection => Chouette::ConnectionLink.connection_link_types, :include_blank => false, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") }  %>
-    <%= form.input :comment %>              
+    <%= form.input :comment %>  
+    <%= form.input :link_distance %> 
+    <%= form.input :defaultduration, :as => :time ,:include_seconds => true , :label => @connection_link.human_attribute_name("default_duration")%>
+    <%= form.input :frequenttravellerduration, :as => :time ,:include_seconds => true , :label => @connection_link.human_attribute_name("frequent_traveller_duration")%>
+    <%= form.input :occasionaltravellerduration, :as => :time ,:include_seconds => true , :label => @connection_link.human_attribute_name("occasional_traveller_duration")%>
+    <%= form.input :mobilityrestrictedtravellerduration, :as => :time ,:include_seconds => true , :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration")%>
+    <%= form.input :mobility_restricted_suitability,:as => :boolean %>
+    <%= form.input :stairs_availability,:as => :boolean %>
+    <%= form.input :lift_availability,:as => :boolean %>
+
     <% if @connection_link.new_record? %>
       <%= form.input :objectid %>  
     <% else %>
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
index da8ca5702..273d9102e 100644
--- a/app/views/connection_links/show.html.erb
+++ b/app/views/connection_links/show.html.erb
@@ -33,12 +33,51 @@
       <%= @connection_link.comment %>
     </p>
     <p>
+      <label><%= @connection_link.human_attribute_name("link_distance") %>: </label>
+      <%= @connection_link.link_distance %> 
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("default_duration") %>: </label>
+      <% if (@connection_link.default_duration.present?) %>
+         <%= @connection_link.default_duration.strftime('%Hh %Mm %Ss') %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("frequent_traveller_duration") %>: </label>
+      <% if (@connection_link.frequent_traveller_duration.present?) %>
+         <%= @connection_link.frequent_traveller_duration.strftime('%Hh %Mm %Ss') %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("occasional_traveller_duration") %>: </label>
+      <% if (@connection_link.occasional_traveller_duration.present?) %>
+         <%= @connection_link.occasional_traveller_duration.strftime('%Hh %Mm %Ss') %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("mobility_restricted_traveller_duration") %>: </label>
+      <% if (@connection_link.mobility_restricted_traveller_duration.present?) %>
+         <%= @connection_link.mobility_restricted_traveller_duration.strftime('%Hh %Mm %Ss') %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("mobility_restricted_suitability") %>: </label>
+      <%= @connection_link.mobility_restricted_suitability %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("stairs_availability") %>: </label>
+      <%= @connection_link.stairs_availability %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("lift_availability") %>: </label>
+      <%= @connection_link.lift_availability %>
+    </p>
       <label><%= @connection_link.human_attribute_name("objectid") %>: </label>
       <%= @connection_link.objectid %>
     </p>
     <p>
       <label><%= @connection_link.human_attribute_name("creation_time") %>: </label>
-      <%= @connection_link.creation_time %>
+      <%= l(@connection_link.creation_time) %>
     </p>
     <p>
       <label><%= @connection_link.human_attribute_name("creator_id") %>: </label>