15 files changed, 81 insertions, 26 deletions
diff --git a/app/controllers/autocomplete_stop_areas_controller.rb b/app/controllers/autocomplete_stop_areas_controller.rb
index d82fa316a..79154a6e0 100644
--- a/app/controllers/autocomplete_stop_areas_controller.rb
+++ b/app/controllers/autocomplete_stop_areas_controller.rb
@@ -21,7 +21,7 @@ class AutocompleteStopAreasController < ChouetteController
       scope = StopAreaPolicy::Scope.new(current_user, scope).search_scope(search_scope)
     end
     args = [].tap{|arg| 4.times{arg << "%#{params[:q]}%"}}
-    @stop_areas = scope.where("unaccent(name) ILIKE unaccent(?) OR unaccent(city_name) ILIKE unaccent(?) OR registration_number ILIKE ? OR objectid ILIKE ?", *args).limit(50)
+    @stop_areas = scope.where("unaccent(stop_areas.name) ILIKE unaccent(?) OR unaccent(stop_areas.city_name) ILIKE unaccent(?) OR stop_areas.registration_number ILIKE ? OR stop_areas.objectid ILIKE ?", *args).limit(50)
     @stop_areas
   end
 
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index ae1d01feb..8f9251155 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -7,10 +7,8 @@ class ComplianceControlSetsController < ChouetteController
 
   def index
     index! do |format|
-      scope = self.ransack_period_range(scope: @compliance_control_sets, error_message: t('imports.filters.error_period_filter'), query: :where_updated_at_between)
-      @q_for_form = scope.ransack(params[:q])
       format.html {
-        @compliance_control_sets = decorate_compliance_control_sets(@q_for_form.result.paginate(page: params[:page], per_page: 30))
+        @compliance_control_sets = decorate_compliance_control_sets(@compliance_control_sets)
       }
     end
   end
@@ -37,6 +35,14 @@ class ComplianceControlSetsController < ChouetteController
 
   private
 
+  def collection
+    scope = self.ransack_period_range(scope: ComplianceControlSet.all, error_message: t('imports.filters.error_period_filter'), query: :where_updated_at_between)
+    @q_for_form = scope.ransack(params[:q])
+    compliance_control_sets = @q_for_form.result
+    compliance_control_sets = joins_with_associated_objects(compliance_control_sets).order(sort_column + ' ' + sort_direction) if sort_column && sort_direction
+    @compliance_control_sets = compliance_control_sets.paginate(page: params[:page], per_page: 30)
+  end
+
   def decorate_compliance_control_sets(compliance_control_sets)
     ComplianceControlSetDecorator.decorate(compliance_control_sets)
   end
@@ -58,4 +64,32 @@ class ComplianceControlSetsController < ChouetteController
     @direct_compliance_controls        = compliance_controls.delete nil
     @blocks_to_compliance_controls_map = compliance_controls
   end
+
+  def sort_column
+    case params[:sort]
+      when 'name' then 'lower(compliance_control_sets.name)'
+      when 'owner_jdc' then 'lower(organisations.name)'
+      when 'control_numbers' then 'COUNT(compliance_controls.id)'
+      else
+        ComplianceControlSet.column_names.include?(params[:sort]) ? params[:sort] : 'lower(compliance_control_sets.name)'
+    end
+  end
+
+  def joins_with_associated_objects(collection)
+
+    # dont know if this is the right way to do it but since we need to join table deoending of the params
+    # it was to avoid loading associated objects if we don't need them
+    case params[:sort]
+      when 'owner_jdc'
+        collection.joins("LEFT JOIN organisations ON compliance_control_sets.organisation_id = organisations.id")
+      when 'control_numbers' 
+        collection.joins("LEFT JOIN compliance_controls ON compliance_controls.compliance_control_set_id = compliance_control_sets.id").group(:id)
+      else 
+        collection
+    end
+  end
+
+  def sort_direction
+    %w[asc desc].include?(params[:direction]) ?  params[:direction] : 'asc'
+  end
 end
diff --git a/app/decorators/compliance_control_set_decorator.rb b/app/decorators/compliance_control_set_decorator.rb
index 387822c67..b16a06886 100644
--- a/app/decorators/compliance_control_set_decorator.rb
+++ b/app/decorators/compliance_control_set_decorator.rb
@@ -6,6 +6,8 @@ class ComplianceControlSetDecorator < AF83::Decorator
   end
 
   with_instance_decorator do |instance_decorator|
+    instance_decorator.show_action_link
+
     instance_decorator.edit_action_link do |l|
       l.content t('compliance_control_sets.actions.edit')
     end
diff --git a/app/models/referential.rb b/app/models/referential.rb
index baaa354da..f64db4ebf 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -153,10 +153,6 @@ class Referential < ActiveRecord::Base
     end
   end
 
-  def stop_areas
-    Chouette::StopArea.all
-  end
-
   def access_points
     Chouette::AccessPoint.all
   end
diff --git a/app/views/calendars/_filters.html.slim b/app/views/calendars/_filters.html.slim
index 35441b053..8bfe1974e 100644
--- a/app/views/calendars/_filters.html.slim
+++ b/app/views/calendars/_filters.html.slim
@@ -1,4 +1,4 @@
-= search_form_for @q, url: workgroup_calendars_path(current_workgroup), builder: SimpleForm::FormBuilder, html: { method: :get, class: 'form form-filter' } do |f|
+= search_form_for @q, url: workgroup_calendars_path(@workgroup), builder: SimpleForm::FormBuilder, html: { method: :get, class: 'form form-filter' } do |f|
   .ffg-row
     .input-group.search_bar class=filter_item_class(params[:q], :name_or_short_name_cont)
       = f.search_field :name_or_short_name_cont, class: 'form-control', placeholder: 'Indiquez un nom/nom court de calendrier...'
@@ -18,5 +18,5 @@
       = f.input :contains_date, as: :date, label: false, wrapper_html: { class: 'date smart_date' }, class: 'form-control', include_blank: true
 
   .actions
-    = link_to 'Effacer', workgroup_calendars_path(current_workgroup), class: 'btn btn-link'
+    = link_to 'Effacer', workgroup_calendars_path(@workgroup), class: 'btn btn-link'
     = f.submit 'Filtrer', id: 'calendar_filter_btn', class: 'btn btn-default'
diff --git a/config/deploy.rb b/config/deploy.rb
index fc60113ce..098a0233c 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -78,7 +78,8 @@ namespace :deploy do
     run "ln -nfs #{shared_path}/tmp/imports #{release_path}/tmp/imports"
   end
   after 'deploy:update_code', 'deploy:symlink_shared'
-  before 'deploy:assets:precompile', 'deploy:symlink_shared', "deploy:i18n_js_export"
+  before 'deploy:assets:precompile', 'deploy:symlink_shared'
+  after 'deploy:assets:precompile', "deploy:i18n_js_export"
 
   desc "Make group writable all deployed files"
   task :group_writable do
@@ -92,8 +93,13 @@ namespace :deploy do
   end
   after "deploy:restart", "deploy:sidekiq_restart"
 
+  desc "Run i18n:js:export"
+  task :i18n_js_export do
+    run "cd #{release_path} && RAILS_ENV=#{rails_env} #{rake} i18n:js:export"
+  end
+
   desc "Run db:seed"
   task :seed do
-    run "cd #{current_path} && #{rake} db:seed RAILS_ENV=#{rails_env}"
+    run "cd #{release_path} && RAILS_ENV=#{rails_env} #{rake} db:seed"
   end
 end
diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml
index 6bf167234..1034a3fba 100644
--- a/config/locales/vehicle_journeys.fr.yml
+++ b/config/locales/vehicle_journeys.fr.yml
@@ -124,7 +124,7 @@ fr:
         published_journey_name: "Nom public"
         purchase_window: "Disponibilité commerciale"
         regular_fs: "Service régulier"
-        route: "Séquence d'arrêt"
+        route: "Itinéraire"
         status_value: "Etat de trafic"
         time_slot: "Fréquence"
         time_table_ids: "Liste des calendriers"
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index c46cf7416..89f9aa9c8 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -40,11 +40,13 @@ namespace :ci do
   end
 
   task :jest do
-    sh "node_modules/.bin/jest" unless ["CHOUETTE_JEST_DISABLED"]
+    sh "node_modules/.bin/jest" unless ENV["CHOUETTE_JEST_DISABLED"]
   end
 
   desc "Deploy after CI"
   task :deploy do
+    return if ENV["CHOUETTE_DEPLOY_DISABLED"]
+
     if deploy_env
       sh "cap #{deploy_env} deploy:migrations"
     else
diff --git a/package.json b/package.json
index 25b158e3d..1a63eeac3 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "redux-logger": "3.0.6",
     "redux-promise": "0.5.3",
     "redux-thunk": "2.2.0",
+    "uglify-js": "3.3.2",
     "whatwg-fetch": "2.0.3"
   },
   "license": "MIT",
@@ -41,7 +42,6 @@
     "react-addons-test-utils": "15.6.2",
     "react-test-renderer": "^16.2.0",
     "sinon": "4.1.3",
-    "uglify-js": "3.3.2",
     "webpack-dev-server": "2.9.7"
   },
   "jest": {
diff --git a/spec/controllers/api/v1/stop_area_controller_spec.rb b/spec/controllers/api/v1/stop_area_controller_spec.rb
index eb0c87661..1ad71a95a 100644
--- a/spec/controllers/api/v1/stop_area_controller_spec.rb
+++ b/spec/controllers/api/v1/stop_area_controller_spec.rb
@@ -18,16 +18,15 @@ describe Api::V1::StopAreasController, :type => :controller do
     end
   end
   describe "GET #index, :q => { :name_cont => 'aa'}" do
-    let!(:sa1) { create(:stop_area, :name => "aaa") }
-    let!(:sa2) { create(:stop_area, :name => "aab") }
-    let!(:sa3) { create(:stop_area, :name => "abb") }
+    let!(:sa1) { create(:stop_area, :name => "aaa", stop_area_referential: referential.stop_area_referential) }
+    let!(:sa2) { create(:stop_area, :name => "aab", stop_area_referential: referential.stop_area_referential) }
+    let!(:sa3) { create(:stop_area, :name => "abb", stop_area_referential: referential.stop_area_referential) }
     before :each do
       config_formatted_request_with_authorization( "application/json")
-      get :index, :q => { :name_cont => "aa"} 
+      get :index, :q => { :name_cont => "aa"}
     end
     it "should assign expected stop_areas" do
       expect(assigns[:stop_areas].map(&:name).sort).to eq([ sa1.name, sa2.name])
     end
   end
 end
-
diff --git a/spec/controllers/autocomplete_stop_areas_controller_spec.rb b/spec/controllers/autocomplete_stop_areas_controller_spec.rb
index 2af471361..e0d1cd714 100644
--- a/spec/controllers/autocomplete_stop_areas_controller_spec.rb
+++ b/spec/controllers/autocomplete_stop_areas_controller_spec.rb
@@ -4,9 +4,11 @@ RSpec.describe AutocompleteStopAreasController, type: :controller do
   login_user
 
   let(:referential) { Referential.first }
-  let!(:stop_area) { create :stop_area, name: 'écolà militaire' }
-  let!(:zdep_stop_area) { create :stop_area, area_type: "zdep" }
-  let!(:not_zdep_stop_area) { create :stop_area, area_type: "lda" }
+  let(:other_referential) { create :referential }
+  let!(:stop_area) { create :stop_area, name: 'écolà militaire', referential: referential }
+  let!(:other_referential_stop_area) { create :stop_area, name: 'écolà militaire', referential: other_referential }
+  let!(:zdep_stop_area) { create :stop_area, area_type: "zdep", referential: referential }
+  let!(:not_zdep_stop_area) { create :stop_area, area_type: "lda", referential: referential }
 
   describe 'GET #index' do
     it 'should be successful' do
@@ -14,6 +16,12 @@ RSpec.describe AutocompleteStopAreasController, type: :controller do
       expect(response).to be_success
     end
 
+    it "should filter stop areas based on referential" do
+      get :index, referential_id: referential.id
+      expect(assigns(:stop_areas)).to include(stop_area)
+      expect(assigns(:stop_areas)).to_not include(other_referential_stop_area)
+    end
+
     context 'search by name' do
       it 'should be successful' do
         get :index, referential_id: referential.id, q: 'écolà', :format => :json
diff --git a/spec/factories/chouette_stop_areas.rb b/spec/factories/chouette_stop_areas.rb
index 9b4764781..dab135ca6 100644
--- a/spec/factories/chouette_stop_areas.rb
+++ b/spec/factories/chouette_stop_areas.rb
@@ -10,6 +10,14 @@ FactoryGirl.define do
 
     association :stop_area_referential
 
+    transient do
+      referential nil
+    end
+
+    before(:create) do |stop_area, evaluator|
+      stop_area.stop_area_referential = evaluator.referential.stop_area_referential if evaluator.referential
+    end
+
     trait :deactivated do
       deleted_at { 1.hour.ago }
     end
diff --git a/spec/features/access_points_spec.rb b/spec/features/access_points_spec.rb
index c16039d67..890906de7 100644
--- a/spec/features/access_points_spec.rb
+++ b/spec/features/access_points_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 describe "Access points", :type => :feature do
   login_user
 
-  let!(:stop_area) { create(:stop_area) }
+  let!(:stop_area) { create(:stop_area, stop_area_referential: referential.stop_area_referential) }
   let!(:access_points) { Array.new(2) { create(:access_point, :stop_area => stop_area) } }
   subject { access_points.first }
 
diff --git a/spec/features/referential_stop_areas_spec.rb b/spec/features/referential_stop_areas_spec.rb
index 0dc7951a7..5e70857e7 100644
--- a/spec/features/referential_stop_areas_spec.rb
+++ b/spec/features/referential_stop_areas_spec.rb
@@ -5,7 +5,7 @@ describe 'ReferentialStopAreas', type: :feature do
   login_user
 
   let(:referential) { Referential.first }
-  let(:stop_area_referential) { create :stop_area_referential }
+  let(:stop_area_referential) { referential.stop_area_referential }
   let!(:stop_areas) { Array.new(2) { create :stop_area, stop_area_referential: stop_area_referential } }
 
   describe 'index' do
diff --git a/spec/models/calendar_spec.rb b/spec/models/calendar_spec.rb
index 3cffd0f8a..a5c0a7471 100644
--- a/spec/models/calendar_spec.rb
+++ b/spec/models/calendar_spec.rb
@@ -36,7 +36,7 @@ RSpec.describe Calendar, :type => :model do
     end
 
     it 'validates that dates and date_ranges do not overlap but allow for days not in the list' do
-      expect(build(:calendar, dates: [Date.today.beginning_of_week], date_ranges: [Date.today.beginning_of_week..Date.today], int_day_types: Calendar::THURSDAY)).to be_valid
+      expect(build(:calendar, dates: [Date.today.beginning_of_week - 1.week], date_ranges: [(Date.today.beginning_of_week - 1.week)..Date.today], int_day_types: Calendar::THURSDAY)).to be_valid
     end
 
     it 'validates that there are no duplicates in dates' do