diff --git a/app/controllers/benefit_forms_controller.rb b/app/controllers/benefit_forms_controller.rb index 97721c9..1524cfc 100644 --- a/app/controllers/benefit_forms_controller.rb +++ b/app/controllers/benefit_forms_controller.rb @@ -3,6 +3,7 @@ class BenefitFormsController < ApplicationController def index @benefits = Benefits.new + load_uploaded_files end def download @@ -17,13 +18,58 @@ class BenefitFormsController < ApplicationController def upload file = params[:benefits][:upload] - if file - flash[:success] = "File Successfully Uploaded!" - Benefits.save(file, params[:benefits][:backup]) - else - flash[:error] = "Something went wrong" + + if file.nil? + flash.now[:error] = "Please select a file to upload" + @benefits = Benefits.new + load_uploaded_files + render :index + return end + + # Validate file type + allowed_extensions = %w[.pdf .doc .docx .jpg .jpeg .png] + file_extension = File.extname(file.original_filename).downcase + + unless allowed_extensions.include?(file_extension) + flash.now[:error] = "Invalid file type. Accepted formats: PDF, DOC, DOCX, JPG, PNG. You uploaded: #{file_extension}" + @benefits = Benefits.new + load_uploaded_files + render :index + return + end + + # Validate file size (10MB max) + max_size = 10.megabytes + if file.size > max_size + flash.now[:error] = "File too large. Maximum size: 10MB. Your file: #{(file.size / 1.megabyte.to_f).round(2)}MB" + @benefits = Benefits.new + load_uploaded_files + render :index + return + end + + begin + Benefits.save(file, params[:benefits][:backup]) + flash[:success] = "File '#{file.original_filename}' uploaded successfully!" + rescue => e + flash[:error] = "Failed to upload file: #{e.message}" + end + redirect_to user_benefit_forms_path(user_id: current_user.id) end + private + + def load_uploaded_files + data_path = Rails.root.join("public", "data") + @uploaded_files = Dir.glob("#{data_path}/*").reject { |f| File.directory?(f) || File.basename(f) == '.gitkeep' }.map do |file| + { + name: File.basename(file), + size: File.size(file), + modified: File.mtime(file) + } + end.sort_by { |f| f[:modified] }.reverse + end + end diff --git a/app/views/benefit_forms/index.html.erb b/app/views/benefit_forms/index.html.erb index 14920ad..5ae8a50 100644 --- a/app/views/benefit_forms/index.html.erb +++ b/app/views/benefit_forms/index.html.erb @@ -118,6 +118,58 @@ + + <% if @uploaded_files.any? %> +
+
+
+
+

+ Uploaded Files +

+
+
+
+ + + + + + + + + + + <% @uploaded_files.each do |file| %> + + + + + + + <% end %> + +
File Name Size UploadedActions
+ <% icon_class = case File.extname(file[:name]).downcase + when '.pdf' then 'bi-file-earmark-pdf text-danger' + when '.doc', '.docx' then 'bi-file-earmark-word text-primary' + when '.jpg', '.jpeg', '.png' then 'bi-file-earmark-image text-success' + else 'bi-file-earmark' + end %> + + <%= file[:name] %> + <%= number_to_human_size(file[:size]) %><%= file[:modified].strftime("%b %d, %Y at %I:%M %p") %> + <%= link_to download_path(type: "File", name: "public/data/#{file[:name]}"), class: "btn btn-sm btn-outline-primary" do %> + Download + <% end %> +
+
+
+
+
+
+ <% end %> +