add a warning during export generation

This commit is contained in:
clemkeirua 2019-10-24 15:50:43 +02:00 committed by simon lehericey
parent cb5f922bb6
commit d9e993571c
2 changed files with 17 additions and 2 deletions

View file

@ -207,16 +207,19 @@ module Instructeurs
def download_export def download_export
export_format = params[:export_format] export_format = params[:export_format]
notice_message = "Nous générons cet export. Lorsque celui-ci sera disponible, vous recevrez une notification par email accompagnée d'un lien de téléchargement."
if procedure.should_generate_export?(export_format) if procedure.should_generate_export?(export_format)
procedure.queue_export(current_instructeur, export_format) procedure.queue_export(current_instructeur, export_format)
respond_to do |format| respond_to do |format|
format.js do format.js do
flash.notice = "Nous générons cet export. Lorsque celui-ci sera disponible, vous recevrez une notification par email accompagnée d'un lien de téléchargement." flash.notice = notice_message
@procedure = procedure @procedure = procedure
end end
end end
elsif procedure.export_queued?(export_format)
flash.notice = notice_message
redirect_to procedure
else else
redirect_to url_for(procedure.export_file(export_format)) redirect_to url_for(procedure.export_file(export_format))
end end

View file

@ -145,6 +145,18 @@ class Procedure < ApplicationRecord
!ods_export_file.attached? || ods_export_file.created_at < MAX_DUREE_CONSERVATION_EXPORT.ago !ods_export_file.attached? || ods_export_file.created_at < MAX_DUREE_CONSERVATION_EXPORT.ago
end end
def export_queued?(format)
case format.to_sym
when :csv
return csv_export_queued?
when :xlsx
return xlsx_export_queued?
when :ods
return ods_export_queued?
end
false
end
def should_generate_export?(format) def should_generate_export?(format)
case format.to_sym case format.to_sym
when :csv when :csv