From 9c052ed7bc763ace5ef5a61d4408bfc5468f8d5a Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Tue, 10 May 2016 14:56:23 +0200
Subject: Remove user/organization edit, create, destroy link

Refs #819
---
 app/views/devise/sessions/new.html.erb | 16 +++++++++++-----
 app/views/organisations/show.html.erb  |  3 +++
 app/views/shared/_header.erb           |  9 +++++++--
 app/views/users/_user.html.erb         |  3 +++
 app/views/users/show.html.erb          | 13 ++++++++-----
 spec/features/users/user_show_spec.rb  |  3 ++-
 6 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 2df4f3d97..4df538161 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -21,17 +21,23 @@
             </div>
             <div class="col-md-6 new_password">
               <%= link_to t("devise.links.new_password"), new_password_path(resource_name) %>
-              <% if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-                <br>
-                <%= link_to t("devise.links.new_confirmation"), new_confirmation_path(resource_name) %>
-              <% end %>
+                <!-- FIXME ref #819 -->
+                <%- if false %>
+                  <% if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+                    <br>
+                    <%= link_to t("devise.links.new_confirmation"), new_confirmation_path(resource_name) %>
+                  <% end %>
+                <% end %>
             </div>
           </div>
         <% end %>
       </div>
     </div>
-    <%= render partial: 'devise/shared/form_registration', locals: {
+    <!-- FIXME ref #819 -->
+    <%- if false %>
+      <%= render partial: 'devise/shared/form_registration', locals: {
       organisation: (resource.organisation || Organisation.new) } %>
+    <% end %>
 
   </div>
 </div>
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb
index f6c497173..3994228fd 100644
--- a/app/views/organisations/show.html.erb
+++ b/app/views/organisations/show.html.erb
@@ -48,8 +48,11 @@
 
 <% content_for :sidebar do %>
 <ul class="actions">
+<!-- FIXME ref #819 -->
+<% if false %>
   <li><%= link_to t('organisations.actions.edit'), edit_organisation_path, :class => "edit" %></li>
   <li><%= link_to t('users.actions.new'), new_organisation_user_path, :class => "add" %></li>
+<% end %>
   <li><%= link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, :class => "add" %></li>
 </ul>
 <% end %>
diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb
index 9d53d807f..ae712e48d 100644
--- a/app/views/shared/_header.erb
+++ b/app/views/shared/_header.erb
@@ -95,8 +95,13 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle user_admin" data-toggle="dropdown"><span class="gravatar"><%= user_gravatar_image_tag(current_user, 16) %></span><%= truncate(current_user.name, :length => 20) %> <b class="caret"></b></a>
           <ul class="dropdown-menu">
-            <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li>
-            <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>
+
+              <!-- FIXME ref #819 -->
+              <%- if false %>
+                <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li>
+              <% end %>
+
+              <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>
             <li class="divider"></li>
             <li><%= tab_link_to Organisation.model_name.human, organisation_path %></li>
           </ul>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index c4b396650..7cd0cc17c 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -2,6 +2,8 @@
   <div class="panel-heading">
     <div class="panel-title clearfix">
       <span class="pull-right">
+      <!-- FIXME ref #819 -->
+      <% if false %>
         <% if user == current_user %>
           <%= link_to( edit_user_registration_path(user), :class => "btn btn-default btn-sm" ) do %>
             <span class="fa fa-pencil"></span>
@@ -10,6 +12,7 @@
         <%= link_to organisation_user_path(user), :method => :delete, :data => {:confirm =>  t('users.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
           <span class="fa fa-trash-o"></span>
         <% end %>
+      <% end %>
       </span>
       <h5>
         <%= link_to( organisation_user_path(user), :class => "preview", :title => "#{User.model_name.human.capitalize} #{user.email}") do %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 94e968ca5..6e1c3d089 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -11,9 +11,12 @@
 </p>
 </div>
 
-<% content_for(:sidebar) do %>
-  <ul class="actions">
-    <li><%= link_to( t('users.actions.edit'), edit_user_registration_path, :class => "edit") if @user == current_user %></li>
-    <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "remove" %></li>
-  </ul>
+<!-- FIXME ref #819 -->
+<% if false %>
+  <% content_for(:sidebar) do %>
+    <ul class="actions">
+      <li><%= link_to( t('users.actions.edit'), edit_user_registration_path, :class => "edit") if @user == current_user %></li>
+      <li><%= link_to t('users.actions.destroy'), organisation_user_path(@user),:method => :delete, :data => {:confirm => t('users.actions.destroy_confirm')}, :class => "remove" %></li>
+    </ul>
+  <% end %>
 <% end %>
diff --git a/spec/features/users/user_show_spec.rb b/spec/features/users/user_show_spec.rb
index a4db51497..4a56e3255 100644
--- a/spec/features/users/user_show_spec.rb
+++ b/spec/features/users/user_show_spec.rb
@@ -22,7 +22,8 @@ feature 'User profile page', :devise do
     user.confirm!
     login_as(user, :scope => :user)
     visit organisation_user_path(user)
-    expect(page).to have_content 'Mon Profil'
+    # FIXME ref #819
+    # expect(page).to have_content 'Mon Profil'
     expect(page).to have_content user.email
   end
 
-- 
cgit v1.2.3


From 848e6de7d25c41ee3b6cfb77740f0ce2f9eb0dd3 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Tue, 10 May 2016 15:34:30 +0200
Subject: Remove referential create link / index list

Refs #823
---
 app/views/referentials/index.html.erb | 16 +++++++++++-----
 spec/features/referentials_spec.rb    | 36 ++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/app/views/referentials/index.html.erb b/app/views/referentials/index.html.erb
index 7f1604b7c..51088dbd3 100644
--- a/app/views/referentials/index.html.erb
+++ b/app/views/referentials/index.html.erb
@@ -1,12 +1,18 @@
-<%= title_tag Referential.model_name.human(:count => 2) %>
 
-<div class="referentials paginated_content">
-  <%= paginated_content @referentials %>
-</div>
+<!-- FIXME #823 -->
+<% if false %>
+  <%= title_tag Referential.model_name.human(:count => 2) %>
+  <div class="referentials paginated_content">
+    <%= paginated_content @referentials %>
+  </div>
+<% end %>
 
 <% content_for :sidebar do %>
 <ul class="actions">
-  <li><%= link_to t('referentials.actions.new'), new_referential_path, :class => "add" %></li>
+  <!-- FIXME #823 -->
+  <% if false %>
+    <li><%= link_to t('referentials.actions.new'), new_referential_path, :class => "add" %></li>
+  <% end %>
 </ul>
 <ul>
   <!-- FIXME #820 -->
diff --git a/spec/features/referentials_spec.rb b/spec/features/referentials_spec.rb
index 1bce09da7..d04c53e18 100644
--- a/spec/features/referentials_spec.rb
+++ b/spec/features/referentials_spec.rb
@@ -6,33 +6,35 @@ describe "Referentials", :type => :feature do
 
   describe "index" do
 
-    it "should support no referential" do
-      visit referentials_path
-      expect(page).to have_content("Espaces de Données")
-    end
+    # FIXME #823
+    # it "should support no referential" do
+    #   visit referentials_path
+    #   expect(page).to have_content("Espaces de Données")
+    # end
 
     context "when several referentials exist" do
 
       def retrieve_referential_by_slug( slug)
-        @user.organisation.referentials.find_by_slug(slug) || 
+        @user.organisation.referentials.find_by_slug(slug) ||
           create(:referential, :slug => slug, :name => slug, :organisation => @user.organisation)
       end
-                                                
+
       let!(:referentials) { [ retrieve_referential_by_slug("aa"),
-                              retrieve_referential_by_slug("bb")] }  
+                              retrieve_referential_by_slug("bb")] }
+
+      # FIXME #823
+      # it "should show n referentials" do
+      #   visit referentials_path
+      #   expect(page).to have_content(referentials.first.name)
+      #   expect(page).to have_content(referentials.last.name)
+      # end
 
-      it "should show n referentials" do
-        visit referentials_path
-        expect(page).to have_content(referentials.first.name)
-        expect(page).to have_content(referentials.last.name)
-      end
-      
     end
 
   end
-  
+
   describe "create" do
-    
+
     it "should" do
       visit new_referential_path
       fill_in "Nom", :with => "Test"
@@ -48,7 +50,7 @@ describe "Referentials", :type => :feature do
   end
 
   describe "destroy" do
-    let(:referential) {  create(:referential, :organisation => @user.organisation) } 
+    let(:referential) {  create(:referential, :organisation => @user.organisation) }
 
     it "should remove referential" do
       visit referential_path(referential)
@@ -57,5 +59,5 @@ describe "Referentials", :type => :feature do
     end
 
   end
-  
+
 end
-- 
cgit v1.2.3


From 17b85942577dd038d1ba12a9e5af775196fe4a3a Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Tue, 10 May 2016 16:34:31 +0200
Subject: Add model LineReferential

Refs #824
---
 app/controllers/line_referentials_controller.rb    |  3 +
 app/models/line_referential.rb                     |  4 +
 app/views/line_referentials/show.html.erb          |  1 +
 app/views/referentials/index.html.erb              |  3 +
 config/routes.rb                                   |  1 +
 .../20160510134254_create_line_referentials.rb     |  9 +++
 db/schema.rb                                       | 88 +++++++++++++++-------
 db/seeds.rb                                        |  1 +
 .../line_referentials_controller_spec.rb           |  5 ++
 spec/factories/line_referentials.rb                |  5 ++
 spec/models/line_referential_spec.rb               |  9 +++
 11 files changed, 103 insertions(+), 26 deletions(-)
 create mode 100644 app/controllers/line_referentials_controller.rb
 create mode 100644 app/models/line_referential.rb
 create mode 100644 app/views/line_referentials/show.html.erb
 create mode 100644 db/migrate/20160510134254_create_line_referentials.rb
 create mode 100644 spec/controllers/line_referentials_controller_spec.rb
 create mode 100644 spec/factories/line_referentials.rb
 create mode 100644 spec/models/line_referential_spec.rb

diff --git a/app/controllers/line_referentials_controller.rb b/app/controllers/line_referentials_controller.rb
new file mode 100644
index 000000000..0138bb67d
--- /dev/null
+++ b/app/controllers/line_referentials_controller.rb
@@ -0,0 +1,3 @@
+class LineReferentialsController < BreadcrumbController
+  defaults :resource_class => LineReferential
+end
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
new file mode 100644
index 000000000..e4b0fd746
--- /dev/null
+++ b/app/models/line_referential.rb
@@ -0,0 +1,4 @@
+class LineReferential < ActiveRecord::Base
+
+  validates :name, presence: true
+end
diff --git a/app/views/line_referentials/show.html.erb b/app/views/line_referentials/show.html.erb
new file mode 100644
index 000000000..023e8160c
--- /dev/null
+++ b/app/views/line_referentials/show.html.erb
@@ -0,0 +1 @@
+<%= title_tag @line_referential.name %>
diff --git a/app/views/referentials/index.html.erb b/app/views/referentials/index.html.erb
index 51088dbd3..e4847b2a4 100644
--- a/app/views/referentials/index.html.erb
+++ b/app/views/referentials/index.html.erb
@@ -7,6 +7,9 @@
   </div>
 <% end %>
 
+<!-- FIXME #824 -->
+<%= link_to "Codifligne", line_referential_path(LineReferential.find_by(name: 'CodifLigne')) %>
+
 <% content_for :sidebar do %>
 <ul class="actions">
   <!-- FIXME #823 -->
diff --git a/config/routes.rb b/config/routes.rb
index d9dbeb84a..19cb60538 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,6 +43,7 @@ ChouetteIhm::Application.routes.draw do
   end
 
   resources :stop_area_referentials
+  resources :line_referentials, :only => [:show]
 
   resources :referentials do
     resources :api_keys
diff --git a/db/migrate/20160510134254_create_line_referentials.rb b/db/migrate/20160510134254_create_line_referentials.rb
new file mode 100644
index 000000000..6bc49f081
--- /dev/null
+++ b/db/migrate/20160510134254_create_line_referentials.rb
@@ -0,0 +1,9 @@
+class CreateLineReferentials < ActiveRecord::Migration
+  def change
+    create_table :line_referentials do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 99448dd12..73f63a85e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160504160504) do
+ActiveRecord::Schema.define(version: 20160510134254) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -209,18 +209,6 @@ ActiveRecord::Schema.define(version: 20160504160504) do
     t.integer "line_id",          limit: 8
   end
 
-  create_table "jobs", force: true do |t|
-    t.string   "action"
-    t.datetime "created"
-    t.string   "filename"
-    t.text     "parameters"
-    t.string   "referential"
-    t.datetime "started"
-    t.string   "status"
-    t.string   "type"
-    t.datetime "updated"
-  end
-
   create_table "journey_frequencies", force: true do |t|
     t.integer  "vehicle_journey_id",         limit: 8
     t.time     "scheduled_headway_interval",                           null: false
@@ -249,7 +237,7 @@ ActiveRecord::Schema.define(version: 20160504160504) do
 
   create_table "journey_patterns", force: true do |t|
     t.integer  "route_id",                limit: 8
-    t.string   "objectid",                                       null: false
+    t.string   "objectid",                                      null: false
     t.integer  "object_version"
     t.datetime "creation_time"
     t.string   "creator_id"
@@ -259,12 +247,10 @@ ActiveRecord::Schema.define(version: 20160504160504) do
     t.string   "published_name"
     t.integer  "departure_stop_point_id", limit: 8
     t.integer  "arrival_stop_point_id",   limit: 8
-    t.integer  "route_section_ids",                 default: [],              array: true
-    t.integer  "section_status",                    default: 0,  null: false
+    t.integer  "section_status",                    default: 0, null: false
   end
 
   add_index "journey_patterns", ["objectid"], :name => "journey_patterns_objectid_key", :unique => true
-  add_index "journey_patterns", ["route_section_ids"], :name => "index_journey_patterns_on_route_section_ids"
 
   create_table "journey_patterns_stop_points", id: false, force: true do |t|
     t.integer "journey_pattern_id", limit: 8
@@ -273,6 +259,12 @@ ActiveRecord::Schema.define(version: 20160504160504) do
 
   add_index "journey_patterns_stop_points", ["journey_pattern_id"], :name => "index_journey_pattern_id_on_journey_patterns_stop_points"
 
+  create_table "line_referentials", force: true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "lines", force: true do |t|
     t.integer  "network_id",                      limit: 8
     t.integer  "company_id",                      limit: 8
@@ -298,12 +290,6 @@ ActiveRecord::Schema.define(version: 20160504160504) do
   add_index "lines", ["objectid"], :name => "lines_objectid_key", :unique => true
   add_index "lines", ["registration_number"], :name => "lines_registration_number_key"
 
-  create_table "links", id: false, force: true do |t|
-    t.integer "job_id", limit: 8, null: false
-    t.string  "rel"
-    t.string  "type"
-  end
-
   create_table "networks", force: true do |t|
     t.string   "objectid",            null: false
     t.integer  "object_version"
@@ -361,8 +347,8 @@ ActiveRecord::Schema.define(version: 20160504160504) do
   end
 
   create_table "route_sections", force: true do |t|
-    t.integer  "departure_id"
-    t.integer  "arrival_id"
+    t.integer  "departure_id",       limit: 8
+    t.integer  "arrival_id",         limit: 8
     t.string   "objectid",                                                       null: false
     t.integer  "object_version"
     t.datetime "creation_time"
@@ -613,12 +599,62 @@ ActiveRecord::Schema.define(version: 20160504160504) do
   add_index "vehicle_journeys", ["route_id"], :name => "index_vehicle_journeys_on_route_id"
 
   Foreigner.load
+  add_foreign_key "access_links", "access_points", name: "aclk_acpt_fkey", dependent: :delete
+  add_foreign_key "access_links", "stop_areas", name: "aclk_area_fkey", dependent: :delete
+
+  add_foreign_key "access_points", "stop_areas", name: "access_area_fkey", dependent: :delete
+
+  add_foreign_key "connection_links", "stop_areas", name: "colk_endarea_fkey", column: "arrival_id", dependent: :delete
+  add_foreign_key "connection_links", "stop_areas", name: "colk_startarea_fkey", column: "departure_id", dependent: :delete
+
+  add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", dependent: :delete
+  add_foreign_key "group_of_lines_lines", "lines", name: "groupofline_line_fkey", dependent: :delete
+
   add_foreign_key "journey_frequencies", "timebands", name: "journey_frequencies_timeband_id_fk", dependent: :nullify
   add_foreign_key "journey_frequencies", "vehicle_journeys", name: "journey_frequencies_vehicle_journey_id_fk", dependent: :nullify
 
   add_foreign_key "journey_pattern_sections", "journey_patterns", name: "journey_pattern_sections_journey_pattern_id_fk", dependent: :delete
   add_foreign_key "journey_pattern_sections", "route_sections", name: "journey_pattern_sections_route_section_id_fk", dependent: :delete
 
-  add_foreign_key "links", "jobs", name: "fk_n5ypxycc1stckgkm6ust2l6on"
+  add_foreign_key "journey_patterns", "routes", name: "jp_route_fkey", dependent: :delete
+  add_foreign_key "journey_patterns", "stop_points", name: "arrival_point_fkey", column: "arrival_stop_point_id", dependent: :nullify
+  add_foreign_key "journey_patterns", "stop_points", name: "departure_point_fkey", column: "departure_stop_point_id", dependent: :nullify
+
+  add_foreign_key "journey_patterns_stop_points", "journey_patterns", name: "jpsp_jp_fkey", dependent: :delete
+  add_foreign_key "journey_patterns_stop_points", "stop_points", name: "jpsp_stoppoint_fkey", dependent: :delete
+
+  add_foreign_key "lines", "companies", name: "line_company_fkey", dependent: :nullify
+  add_foreign_key "lines", "networks", name: "line_ptnetwork_fkey", dependent: :nullify
+
+  add_foreign_key "route_sections", "stop_areas", name: "route_sections_arrival_id_fk", column: "arrival_id", dependent: :delete
+  add_foreign_key "route_sections", "stop_areas", name: "route_sections_departure_id_fk", column: "departure_id", dependent: :delete
+
+  add_foreign_key "routes", "lines", name: "route_line_fkey", dependent: :delete
+  add_foreign_key "routes", "routes", name: "route_opposite_route_fkey", column: "opposite_route_id", dependent: :nullify
+
+  add_foreign_key "routing_constraints_lines", "lines", name: "routingconstraint_line_fkey", dependent: :delete
+  add_foreign_key "routing_constraints_lines", "stop_areas", name: "routingconstraint_stoparea_fkey", dependent: :delete
+
+  add_foreign_key "stop_areas", "stop_areas", name: "area_parent_fkey", column: "parent_id", dependent: :nullify
+
+  add_foreign_key "stop_areas_stop_areas", "stop_areas", name: "stoparea_child_fkey", column: "child_id", dependent: :delete
+  add_foreign_key "stop_areas_stop_areas", "stop_areas", name: "stoparea_parent_fkey", column: "parent_id", dependent: :delete
+
+  add_foreign_key "stop_points", "routes", name: "stoppoint_route_fkey", dependent: :delete
+  add_foreign_key "stop_points", "stop_areas", name: "stoppoint_area_fkey"
+
+  add_foreign_key "time_table_dates", "time_tables", name: "tm_date_fkey", dependent: :delete
+
+  add_foreign_key "time_table_periods", "time_tables", name: "tm_period_fkey", dependent: :delete
+
+  add_foreign_key "time_tables_vehicle_journeys", "time_tables", name: "vjtm_tm_fkey", dependent: :delete
+  add_foreign_key "time_tables_vehicle_journeys", "vehicle_journeys", name: "vjtm_vj_fkey", dependent: :delete
+
+  add_foreign_key "vehicle_journey_at_stops", "stop_points", name: "vjas_sp_fkey", dependent: :delete
+  add_foreign_key "vehicle_journey_at_stops", "vehicle_journeys", name: "vjas_vj_fkey", dependent: :delete
+
+  add_foreign_key "vehicle_journeys", "companies", name: "vj_company_fkey", dependent: :nullify
+  add_foreign_key "vehicle_journeys", "journey_patterns", name: "vj_jp_fkey", dependent: :delete
+  add_foreign_key "vehicle_journeys", "routes", name: "vj_route_fkey", dependent: :delete
 
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index ef65b4b6e..cf138896f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -10,3 +10,4 @@ stif = Organisation.find_or_create_by(name: "STIF")
 StopAreaReferential.find_or_create_by(name: "Reflex") do |referential|
   referential.add_member stif, owner: true
 end
+LineReferential.find_or_create_by(name: 'CodifLigne')
diff --git a/spec/controllers/line_referentials_controller_spec.rb b/spec/controllers/line_referentials_controller_spec.rb
new file mode 100644
index 000000000..6f8356507
--- /dev/null
+++ b/spec/controllers/line_referentials_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+RSpec.describe LineReferentialsController, :type => :controller do
+
+end
diff --git a/spec/factories/line_referentials.rb b/spec/factories/line_referentials.rb
new file mode 100644
index 000000000..a7e02e9e3
--- /dev/null
+++ b/spec/factories/line_referentials.rb
@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :line_referential do
+    sequence(:name) { |n| "StopArea Referential #{n}" }
+  end
+end
diff --git a/spec/models/line_referential_spec.rb b/spec/models/line_referential_spec.rb
new file mode 100644
index 000000000..70c005017
--- /dev/null
+++ b/spec/models/line_referential_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+RSpec.describe LineReferential, :type => :model do
+  it 'should have a valid factory' do
+    expect(FactoryGirl.build(:line_referential)).to be_valid
+  end
+
+  it { should validate_presence_of(:name) }
+end
-- 
cgit v1.2.3