Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

9 files changed, 34 insertions, 25 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 37c7bfcdb..45f3da9cc 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -6,4 +6,5 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require jquery-ui
 //= require_tree .
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 919c92a2d..a05e3f065 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -21,6 +21,10 @@ class Referential < ActiveRecord::Base
     Chouette::StopArea.scoped
   end
 
+  def time_tables
+    Chouette::TimeTable.scoped
+  end
+
   def switch
     raise "Referential not created" if new_record?
     Apartment::Database.switch(slug)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1f9397116..630898405 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -37,6 +37,7 @@
             <li><%= tab_link_to Chouette::Company, referential_companies_path(@referential) %></li>
             <li><%= tab_link_to Chouette::Line, referential_lines_path(@referential) %></li>
             <li><%= tab_link_to Chouette::StopArea, referential_stop_areas_path(@referential) %></li>
+            <li><%= tab_link_to Chouette::TimeTable, referential_time_tables_path(@referential) %></li>
           <% end %>    
         </ul>
       </div>
diff --git a/app/views/networks/_form.erb b/app/views/networks/_form.erb
index 7c3eb3fdc..4b5b7e509 100644
--- a/app/views/networks/_form.erb
+++ b/app/views/networks/_form.erb
@@ -1,12 +1,12 @@
 <%= semantic_form_for [@referential, @network] do |form| %>
   <%= form.inputs do %> 
     <%= form.input :name %> 
-    <%= form.input :registration_number %>  
+    <%= form.input :registrationnumber %>  
     <%= form.input :comment %>
-    <%= form.input :version_date, :as => :date %> 
+    <%= form.input :versiondate, :as => :date %> 
     <%= form.input :description %>              
-    <%= form.input :source_name %>              
-    <%= form.input :source_identifier %>              
+    <%= form.input :sourcename %>              
+    <%= form.input :sourceidentifier %>              
     <% if @network.new_record? %>
       <%= form.input :objectid %>  
     <% else %>
diff --git a/app/views/stop_areas/_stop_area.html.erb b/app/views/stop_areas/_stop_area.html.erb
index a0b681d48..be230c931 100644
--- a/app/views/stop_areas/_stop_area.html.erb
+++ b/app/views/stop_areas/_stop_area.html.erb
@@ -16,7 +16,7 @@
     </p>
     <div class="actions">  
       <%= link_to t("actions.edit"), edit_referential_stop_area_path(@referential, stop_area), :class => "edit" %> |
-      <%= link_to t("actions.destroy"), referential_stop_area_path(@referential, stop_area), :method => :delete, :confirm =>  t('networks.actions.destroy_confirm'), :class => "remove" %>
+      <%= link_to t("actions.destroy"), referential_stop_area_path(@referential, stop_area), :method => :delete, :confirm =>  t('stop_areas.actions.destroy_confirm'), :class => "remove" %>
     </div>
   </div>
 <% end %>
diff --git a/config/locales/networks.yml b/config/locales/networks.yml
index 5d75577b9..4a95bc7cf 100644
--- a/config/locales/networks.yml
+++ b/config/locales/networks.yml
@@ -20,22 +20,22 @@ en:
       network: Networks
     attributes:
       network:
-        registration_number: "Registration number"
+        registrationnumber: "Registration number"
         name: "Name"
         comment: "Comments"
-        version_date: "Date of this network's version"
+        versiondate: "Date of this network's version"
         description: Description
-        source_type: Source type
-        source_name: Source name
-        source_identifier: Source identifier        
+        sourcetype: Source type
+        sourcename: Source name
+        sourceidentifier: Source identifier        
         objectid: Neptune identifier
-        object_version: Version
-        creation_time: Created on
-        creator_id: Created by 
+        objectversion: Version
+        creationtime: Created on
+        creatorid: Created by 
   formtastic:
     hints:
       network:
-        registration_number: only alphanumerical or underscore characters 
+        registrationnumber: only alphanumerical or underscore characters 
         objectid: "[prefix]:GroupOfLine:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
 
 fr:
@@ -54,27 +54,26 @@ fr:
     index:
       title: "Réseaux"
       name: Nom
-      
   activerecord:
     models:
       network: Réseau
     attributes:
       network:
-        registration_number: "Numéro d'enregistrement"
+        registrationnumber: "Numéro d'enregistrement"
         name: "Nom"
         comment: "Commentaire"
-        version_date: Date de version
+        versiondate: Date de version
         description: Description
-        source_type: "Type de système origine"
-        source_name: "Nom du système origine"
-        source_identifier: "Identifiant du système origine"        
+        sourcetype: "Type de système origine"
+        sourcename: "Nom du système origine"
+        sourceidentifier: "Identifiant du système origine"        
         objectid: "Identifiant Neptune"
-        object_version: "Version"
-        creation_time: "Créé le"
-        creator_id: "Créé par"
+        objectversion: "Version"
+        creationtime: "Créé le"
+        creatorid: "Créé par"
   formtastic:
     hints:
       network:
-        registration_number: "caractères autorisés : alphanumériques et 'souligné'" 
+        registrationnumber: "caractères autorisés : alphanumériques et 'souligné'" 
         objectid: "[prefixe]:GroupOfLine:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
 
diff --git a/config/routes.rb b/config/routes.rb
index e353937cd..fc76c76b8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,7 +17,7 @@ ChouetteIhm::Application.routes.draw do
       resources :stop_areas
     end
 
-    resources :companies, :stop_areas
+    resources :companies, :stop_areas, :time_tables
   end 
 
   # Sample resource route with options:
diff --git a/spec/factories/chouette_companies.rb b/spec/factories/chouette_companies.rb
index f88fbca4a..62c02e65a 100644
--- a/spec/factories/chouette_companies.rb
+++ b/spec/factories/chouette_companies.rb
@@ -1,4 +1,6 @@
 Factory.define :company, :class => "Chouette::Company" do |company|
   company.sequence(:name) { |n| "Company #{n}" }
   company.sequence(:objectid) { |n| "test:Company:#{n}" }
+  company.sequence(:registration_number) { |n| "test-#{n}" }
+
 end
diff --git a/spec/factories/chouette_networks.rb b/spec/factories/chouette_networks.rb
index 227835d25..41cc3ac1b 100644
--- a/spec/factories/chouette_networks.rb
+++ b/spec/factories/chouette_networks.rb
@@ -1,4 +1,6 @@
 Factory.define :network, :class => "Chouette::Network" do |network|
   network.sequence(:name) { |n| "Network #{n}" }
   network.sequence(:objectid) { |n| "test:GroupOfLine:#{n}" }
+  network.sequence(:registration_number) { |n| "test-#{n}" }
+
 end