From 7d93d89e8e658f8f6b9fc9d1425a09fbb4e69c03 Mon Sep 17 00:00:00 2001 From: Bilal Date: Mon, 7 Sep 2020 12:54:00 +0300 Subject: [PATCH] improve Download button for Medical releases --- app/views/medical_releases/index.html.erb | 3 ++- app/views/medical_releases/index.js.erb | 2 ++ spec/jobs/generate_contracts_zip_job_spec.rb | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/medical_releases/index.html.erb b/app/views/medical_releases/index.html.erb index abba148..5519695 100644 --- a/app/views/medical_releases/index.html.erb +++ b/app/views/medical_releases/index.html.erb @@ -1,12 +1,13 @@
+ />
<% if @medical_releases.any? && policy(MedicalRelease).tag_multiple? %> <%= button_to_bulk_tagging(@project) %> <% end %> <% if @medical_releases.any? && policy(MedicalRelease).download_multiple? %> - <%= link_to "Download All", [@project, :contract_downloads, release_type: @medical_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: { + <%= button_to "Download", [@project, :contract_downloads, release_type: @medical_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: { disable_with: "Please wait..." } %> <% end %> diff --git a/app/views/medical_releases/index.js.erb b/app/views/medical_releases/index.js.erb index e720a01..e6d506c 100644 --- a/app/views/medical_releases/index.js.erb +++ b/app/views/medical_releases/index.js.erb @@ -1,3 +1,5 @@ $("#medical_releases").html("<%= j render(@medical_releases) %>"); $("form input[type='search']").val("<%= params[:query] %>"); $("#medical_releases_pagination").html("<%= j will_paginate(@medical_releases) %>"); +$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([])); +$("#total_entries").val(<%= @medical_releases.total_entries %>); \ No newline at end of file diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb index dc20325..2a4f77c 100644 --- a/spec/jobs/generate_contracts_zip_job_spec.rb +++ b/spec/jobs/generate_contracts_zip_job_spec.rb @@ -206,10 +206,13 @@ describe GenerateContractsZipJob do end context "generates ZIP for medical releases" do - let(:release) { create(:medical_release_with_contract_template, :native, project: project) } + let(:release) { create(:medical_release_with_contract_template, :native, project: project, person_name: "John Doe") } + let(:release2) { create(:medical_release_with_contract_template, :native, project: project, person_name: "Jane Doe") } + let(:release3) { create(:medical_release_with_contract_template, :native, project: project, person_name: "Brad Doe") } subject { 'MedicalRelease' } it_behaves_like "generates ZIP containig CSV file with all releases data" + it_behaves_like "generates ZIP containig CSV file with specific releases data" end context "generates ZIP for misc releases" do