9 files changed, 39 insertions, 31 deletions
diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index 2c32ed3a5..c359dfd6d 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -44,9 +44,9 @@ class CompaniesController < ChouetteController
     ids = @q.result(:distinct => true).pluck(:id)
     scope = scope.where(id: ids)
     if sort_column && sort_direction
-      @companies ||= scope.order(sort_column + ' ' + sort_direction).paginate(:page => params[:page])
+      @companies ||= scope.order("lower(#{sort_column})" + ' ' + sort_direction).paginate(:page => params[:page])
     else
-      @companies ||= scope.order(:name).paginate(:page => params[:page])
+      @companies ||= scope.order('lower(name)').paginate(:page => params[:page])
     end
   end
 
diff --git a/app/controllers/compliance_check_messages_controller.rb b/app/controllers/compliance_check_messages_controller.rb
index 36745981e..db551cca5 100644
--- a/app/controllers/compliance_check_messages_controller.rb
+++ b/app/controllers/compliance_check_messages_controller.rb
@@ -7,7 +7,7 @@ class ComplianceCheckMessagesController < ChouetteController
   def index
     index! do |format|
       format.csv {
-        send_data ComplianceCheckMessageExport.new(compliance_check_messages: collection).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true, server_url: request.base_url) , :filename => "compliance_check_set_errors_#{line_code}_#{Date.today.to_s}.csv"
+        send_data ComplianceCheckMessageExport.new(compliance_check_messages: collection).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true, server_url: request.base_url) , :filename => "#{t('compliance_check_messages.compliance_check_set_errors')}_#{line_code}_#{Time.now.strftime('%d-%m-%Y_%H-%M')}.csv"
       }
     end
   end
@@ -22,10 +22,10 @@ class ComplianceCheckMessagesController < ChouetteController
   end
 
   def compliance_check_resource
-    ComplianceCheckResource.find(params[:compliance_check_resource_id]) 
+    ComplianceCheckResource.find(params[:compliance_check_resource_id])
   end
 
-  private 
+  private
 
   def line_code
     Chouette::Line.find_by_objectid("#{compliance_check_resource.reference}").get_objectid.local_id
diff --git a/app/controllers/import_messages_controller.rb b/app/controllers/import_messages_controller.rb
index e9a071177..9f61940a3 100644
--- a/app/controllers/import_messages_controller.rb
+++ b/app/controllers/import_messages_controller.rb
@@ -9,7 +9,7 @@ class ImportMessagesController < ChouetteController
   def index
     index! do |format|
       format.csv {
-        send_data Import::MessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "import_errors_#{@import_resource.name.gsub('.xml', '')}_#{Date.today.to_s}.csv"
+        send_data Import::MessageExport.new(:import_messages => @import_messages).to_csv(:col_sep => "\;", :quote_char=>'"', force_quotes: true) , :filename => "#{t('import_messages.import_errors')}_#{@import_resource.name.gsub('.xml', '')}_#{Time.now.strftime("%d-%m-%Y_%H-%M")}.csv"
       }
     end
   end
diff --git a/app/controllers/import_resources_controller.rb b/app/controllers/import_resources_controller.rb
index 1535fd171..46f8f0337 100644
--- a/app/controllers/import_resources_controller.rb
+++ b/app/controllers/import_resources_controller.rb
@@ -24,6 +24,15 @@ class ImportResourcesController < ChouetteController
     @import_resources ||= parent.resources
   end
 
+  def resource
+    @import ||= Import::Base.find params[:import_id]
+    @import_resource ||= begin
+      import_resource = Import::Resource.find params[:id]
+      raise ActiveRecord::RecordNotFound unless import_resource.import == @import
+      import_resource
+    end
+  end
+
   private
 
   def decorate_import_resources(import_resources)
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 8d7a723a0..b98d7da8d 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -4,6 +4,7 @@ class ImportsController < ChouetteController
   include IevInterfaces
   skip_before_action :authenticate_user!, only: [:download]
   defaults resource_class: Import::Base, collection_name: 'imports', instance_name: 'import'
+  before_action :notify_parents
 
   def download
     if params[:token] == resource.token_download
@@ -18,7 +19,7 @@ class ImportsController < ChouetteController
   def index_model
     Import::Workbench
   end
-  
+
   def build_resource
     @import ||= Import::Workbench.new(*resource_params) do |import|
       import.workbench = parent
@@ -43,4 +44,10 @@ class ImportsController < ChouetteController
       }
     )
   end
+
+  def notify_parents
+    if Rails.env.development?
+      ParentNotifier.new(Import::Base).notify_when_finished
+    end
+  end
 end
diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb
index 14f7909b9..111d39c2b 100644
--- a/app/controllers/referential_vehicle_journeys_controller.rb
+++ b/app/controllers/referential_vehicle_journeys_controller.rb
@@ -42,9 +42,9 @@ class ReferentialVehicleJourneysController < ChouetteController
     @q = @q.ransack(params[:q])
     @vehicle_journeys ||= @q.result
     @vehicle_journeys = parse_order @vehicle_journeys
-    @vehicle_journeys = @vehicle_journeys.paginate page: params[:page], per_page: params[:per_page] || 10
     @all_companies = Chouette::Company.where("id IN (#{@referential.vehicle_journeys.select(:company_id).to_sql})").distinct
-
+    @consolidated = ReferentialConsolidated.new @vehicle_journeys, params
+    @vehicle_journeys = @vehicle_journeys.paginate page: params[:page], per_page: params[:per_page] || 10
   end
 
   def parse_order scope
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 734152c64..38363e8ef 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -120,7 +120,6 @@ class StopAreasController < ChouetteController
 
   def collection
     scope = parent.present? ? parent.stop_areas : referential.stop_areas
-    scope = ransack_status(scope)
     @q = scope.search(params[:q])
 
     if sort_column && sort_direction
@@ -206,24 +205,4 @@ class StopAreasController < ChouetteController
     ] + permitted_custom_fields_params(Chouette::StopArea.custom_fields(stop_area_referential.workgroup))
     params.require(:stop_area).permit(fields)
   end
-
-   # Fake ransack filter
-  def ransack_status scope
-    return scope unless params[:q].try(:[], :status)
-    return scope if params[:q][:status].values.uniq.length == 1
-
-    @status = {
-      in_creation: params[:q][:status]['in_creation'] == 'true',
-      confirmed: params[:q][:status]['confirmed'] == 'true',
-      deactivated: params[:q][:status]['deactivated'] == 'true',
-    }
-
-    scope = Chouette::StopArea.where(
-      "confirmed_at #{(@status[:confirmed] || @status[:deactivated]) ? "IS NOT NULL" : "IS NULL"}
-      AND deleted_at #{@status[:deactivated] ? "IS NOT NULL" : "IS NULL"}"
-      )
-
-    params[:q].delete :status
-    scope
-  end
 end
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb
index 43415ff60..d4dfdebe3 100644
--- a/app/controllers/workbenches_controller.rb
+++ b/app/controllers/workbenches_controller.rb
@@ -42,7 +42,7 @@ class WorkbenchesController < ChouetteController
   private
 
   def workbench_params
-    params.require(:workbench).permit(:import_compliance_control_set_id, :merge_compliance_control_set_id)
+    params.require(:workbench).permit(compliance_control_set_ids: @workbench.workgroup.compliance_control_sets_by_workbench.keys)
   end
 
   def resource
diff --git a/app/controllers/workgroups_controller.rb b/app/controllers/workgroups_controller.rb
new file mode 100644
index 000000000..3acea248d
--- /dev/null
+++ b/app/controllers/workgroups_controller.rb
@@ -0,0 +1,13 @@
+class WorkgroupsController < ChouetteController
+  defaults resource_class: Workgroup
+
+  include PolicyChecker
+
+  def show
+    redirect_to "/"
+  end
+
+  def workgroup_params
+    params[:workgroup].permit(workbenches_attributes: [:id, compliance_control_set_ids: @workgroup.compliance_control_sets_by_workgroup.keys])
+  end
+end