Browse Source

Show processing bulk uploads with processing status

pull/2653/head
Manny Dinssa 2 years ago
parent
commit
cd372d2013
  1. 2
      app/controllers/lettings_logs_controller.rb
  2. 2
      app/controllers/sales_logs_controller.rb
  3. 3
      app/models/bulk_upload.rb

2
app/controllers/lettings_logs_controller.rb

@ -124,7 +124,7 @@ class LettingsLogsController < LogsController
redirect_to clear_filters_path(filter_type: @filter_type, organisation_id: params[:organisation_id]) and return redirect_to clear_filters_path(filter_type: @filter_type, organisation_id: params[:organisation_id]) and return
end end
uploads = BulkUpload.lettings.visible.where("created_at >= ?", 30.days.ago) uploads = BulkUpload.lettings.where("created_at >= ?", 30.days.ago)
unpaginated_filtered_uploads = filter_manager.filtered_uploads(uploads, search_term, filter_manager.session_filters) unpaginated_filtered_uploads = filter_manager.filtered_uploads(uploads, search_term, filter_manager.session_filters)
@pagy, @bulk_uploads = pagy(unpaginated_filtered_uploads) @pagy, @bulk_uploads = pagy(unpaginated_filtered_uploads)

2
app/controllers/sales_logs_controller.rb

@ -94,7 +94,7 @@ class SalesLogsController < LogsController
redirect_to clear_filters_path(filter_type: @filter_type, organisation_id: params[:organisation_id]) and return redirect_to clear_filters_path(filter_type: @filter_type, organisation_id: params[:organisation_id]) and return
end end
uploads = BulkUpload.sales.visible.where("created_at >= ?", 30.days.ago) uploads = BulkUpload.sales.where("created_at >= ?", 30.days.ago)
unpaginated_filtered_uploads = filter_manager.filtered_uploads(uploads, search_term, session_filters) unpaginated_filtered_uploads = filter_manager.filtered_uploads(uploads, search_term, session_filters)
@pagy, @bulk_uploads = pagy(unpaginated_filtered_uploads) @pagy, @bulk_uploads = pagy(unpaginated_filtered_uploads)

3
app/models/bulk_upload.rb

@ -12,8 +12,6 @@ class BulkUpload < ApplicationRecord
after_initialize :generate_identifier, unless: :identifier after_initialize :generate_identifier, unless: :identifier
scope :visible, -> { where.not(processing: true) }
scope :search_by_filename, ->(filename) { where("filename ILIKE ?", "%#{filename}%") } scope :search_by_filename, ->(filename) { where("filename ILIKE ?", "%#{filename}%") }
scope :search_by_user_name, ->(name) { where(user_id: User.where("name ILIKE ?", "%#{name}%").select(:id)) } scope :search_by_user_name, ->(name) { where(user_id: User.where("name ILIKE ?", "%#{name}%").select(:id)) }
scope :search_by_user_email, ->(email) { where(user_id: User.where("email ILIKE ?", "%#{email}%").select(:id)) } scope :search_by_user_email, ->(email) { where(user_id: User.where("email ILIKE ?", "%#{email}%").select(:id)) }
@ -44,6 +42,7 @@ class BulkUpload < ApplicationRecord
end end
def status def status
return :processing if processing
return :blank_template if failed == "blank_template" return :blank_template if failed == "blank_template"
return :wrong_template if failed == "wrong_template" return :wrong_template if failed == "wrong_template"

Loading…
Cancel
Save