3 files changed, 32 insertions, 5 deletions
diff --git a/app/controllers/referential_companies_controller.rb b/app/controllers/referential_companies_controller.rb
index 0966389b4..e8b104d14 100644
--- a/app/controllers/referential_companies_controller.rb
+++ b/app/controllers/referential_companies_controller.rb
@@ -27,7 +27,12 @@ class ReferentialCompaniesController < ChouetteController
   end
 
   def collection
-    @q = referential.workbench.companies.search(params[:q])
+    scope = referential.line_referential.companies
+    if params[:line_id]
+      scope = referential.line_referential.lines.find(params[:line_id]).companies
+    end
+
+    @q = scope.search(params[:q])
 
     if sort_column && sort_direction
       @companies ||= @q.result(:distinct => true).order(sort_column + ' ' + sort_direction).paginate(:page => params[:page])
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 50c925eac..cb7c96e03 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -18,6 +18,11 @@ class TimeTablesController < ChouetteController
     end
   end
 
+  def month
+    @date = params['date'] ? Date.parse(params['date']) : Date.today
+    @time_table = resource
+  end
+
   def new
     @autocomplete_items = ActsAsTaggableOn::Tag.all
     new! do
@@ -90,17 +95,24 @@ class TimeTablesController < ChouetteController
   def collection
     ransack_params = params[:q]
     # Hack to delete params can't be used by ransack
-    tag_search = ransack_params["tag_search"].split(",").collect(&:strip) if ransack_params.present? && ransack_params["tag_search"].present?
+    tag_search = ransack_params["tag_search"] if ransack_params.present? && ransack_params["tag_search"].present?
     ransack_params.delete("tag_search") if ransack_params.present?
 
     selected_time_tables = tag_search ? select_time_tables.tagged_with(tag_search, :wild => true, :any => true) : select_time_tables
+
     @q = selected_time_tables.search(ransack_params)
-    @time_tables ||= @q.result(:distinct => true).order(:comment).paginate(:page => params[:page])
+
+    if sort_column && sort_direction
+      @time_tables ||= @q.result(:distinct => true).order("#{sort_column} #{sort_direction}")
+    else
+      @time_tables ||= @q.result(:distinct => true).order(:comment)
+    end
+    @time_tables = @time_tables.paginate(page: params[:page], per_page: 10)
   end
 
   def select_time_tables
     if params[:route_id]
-      referential.time_tables.joins( vehicle_journeys: :route).where( "routes.id IN (#{params[:route_id]})")
+      referential.time_tables.joins(vehicle_journeys: :route).where( "routes.id IN (#{params[:route_id]})")
    else
       referential.time_tables
    end
@@ -115,6 +127,12 @@ class TimeTablesController < ChouetteController
   end
 
   private
+  def sort_column
+    referential.time_tables.column_names.include?(params[:sort]) ? params[:sort] : 'comment'
+  end
+  def sort_direction
+    %w[asc desc].include?(params[:direction]) ?  params[:direction] : 'asc'
+  end
 
   def time_table_params
     params.require(:time_table).permit(
@@ -122,7 +140,7 @@ class TimeTablesController < ChouetteController
       :object_version,
       :creator_id,
       :calendar_id,
-      :version, :comment,
+      :version, :comment, :color,
       :int_day_types,
       :monday,
       :tuesday,
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 5199d8632..5382b1d4c 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -128,6 +128,10 @@ class VehicleJourneysController < ChouetteController
         time = params[:q]["vehicle_journey_at_stops_#{filter}"]
         params[:q]["vehicle_journey_at_stops_#{filter}"] = "2000-01-01 #{time}:00 UTC"
       end
+
+      if params[:q]['vehicle_journey_without_departure_time'] == 'false'
+        params[:q]["vehicle_journey_at_stops_departure_time_not_eq"] = '2000-01-01 00:00 UTC'
+      end
     end
   end