From abbc8fe803530bd013ca0b26430faee359539904 Mon Sep 17 00:00:00 2001 From: Neenu Chacko <45137335+neenu-chacko@users.noreply.github.com> Date: Fri, 18 Apr 2025 21:12:06 +0530 Subject: [PATCH 1/5] Added functionality to add donation site on the fly --- app/controllers/donation_sites_controller.rb | 7 +++++ app/javascript/utils/donations.js | 18 ++++++++++++- app/views/donation_sites/_form.html.erb | 2 +- app/views/donation_sites/_new_modal.html.erb | 27 ++++++++++++++++++++ app/views/donation_sites/create.js.erb | 6 +++++ app/views/donation_sites/new_modal.js.erb | 2 ++ app/views/donations/new.html.erb | 1 + 7 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 app/views/donation_sites/_new_modal.html.erb create mode 100644 app/views/donation_sites/create.js.erb create mode 100644 app/views/donation_sites/new_modal.js.erb diff --git a/app/controllers/donation_sites_controller.rb b/app/controllers/donation_sites_controller.rb index 0c1ffb476a..5f6aa5becb 100644 --- a/app/controllers/donation_sites_controller.rb +++ b/app/controllers/donation_sites_controller.rb @@ -22,17 +22,24 @@ def create redirect_to donation_sites_path, notice: "Donation site #{@donation_site.name} added!" end + format.js else format.html do flash.now[:error] = "Something didn't work quite right -- try again?" render action: :new end + format.js { render template: "donation_sites/new_modal" } end end end def new @donation_site = current_organization.donation_sites.new + if request.xhr? + respond_to do |format| + format.js { render template: "donation_sites/new_modal" } + end + end end def edit diff --git a/app/javascript/utils/donations.js b/app/javascript/utils/donations.js index 9c70c6efc0..6bf97daf56 100644 --- a/app/javascript/utils/donations.js +++ b/app/javascript/utils/donations.js @@ -5,6 +5,7 @@ $(function() { const product_drive_participant_id = "#donation_product_drive_participant_id"; const product_drive_id = "#donation_product_drive_id" const manufacturer_id = "#donation_manufacturer_id"; + const donation_site_id="#donation_donation_site_id" const donation_site_container_id = "div.donation_donation_site"; const product_drive_container_id = "div.donation_product_drive"; @@ -17,8 +18,8 @@ $(function() { const create_new_product_drive_text = "---Create new Product Drive---"; const create_new_product_drive_participant_text = "---Create new Participant---"; - const create_new_manufacturer_text = "---Create new Manufacturer---"; + const create_new_donation_site_text = "---Add New Donation Site---"; $(product_drive_id).append( @@ -32,6 +33,10 @@ $(function() { `` ); + $(donation_site_id).append( + `` + ) + $(document).on("change", product_drive_id, function(evt) { const selection = $(product_drive_id + " option") .filter(":selected") @@ -61,6 +66,17 @@ $(function() { } }); + $(document).on("change", donation_site_id, function(evt) { + const selection = $(donation_site_id + " option") + .filter(":selected") + .text(); + + if (selection === create_new_donation_site_text) { + document.getElementById("new_donation_site").click() + } + }); + + function handleSourceSelection() { const selection = $(control_id + " option") .filter(":selected") diff --git a/app/views/donation_sites/_form.html.erb b/app/views/donation_sites/_form.html.erb index 9e969ec3ef..d49942f00e 100644 --- a/app/views/donation_sites/_form.html.erb +++ b/app/views/donation_sites/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for form, html: {role: "form"} do |f| %> +<%= simple_form_for form, remote: request.xhr?, html: {role: "form"} do |f| %>
diff --git a/app/views/donation_sites/_new_modal.html.erb b/app/views/donation_sites/_new_modal.html.erb new file mode 100644 index 0000000000..11341ee469 --- /dev/null +++ b/app/views/donation_sites/_new_modal.html.erb @@ -0,0 +1,27 @@ +
+ + +
+
+ + +
+
+ <% flash.each do |key, value| %> +
+ <%= fa_icon('times') %> + <%= value %> +
+ <% end %> + + <%= render partial: "form", object: @donation_site %> + +
+
+ +
+
+ +
diff --git a/app/views/donation_sites/create.js.erb b/app/views/donation_sites/create.js.erb new file mode 100644 index 0000000000..4822f7aff9 --- /dev/null +++ b/app/views/donation_sites/create.js.erb @@ -0,0 +1,6 @@ +<% flash.discard %> +$("#modal_new").modal("hide"); +$("#donation_donation_site_id").empty(); +$("#donation_donation_site_id").html('<%= j options_from_collection_for_select(current_organization.donation_sites, :id, :name) %>'); +$("#donation_donation_site_id").append(''); +$("#donation_donation_site_id").val('<%= @donation_site[:id] %>'); diff --git a/app/views/donation_sites/new_modal.js.erb b/app/views/donation_sites/new_modal.js.erb new file mode 100644 index 0000000000..8e86b6d5f2 --- /dev/null +++ b/app/views/donation_sites/new_modal.js.erb @@ -0,0 +1,2 @@ +$("#modal_new").html("<%= j (render "donation_sites/new_modal") %>"); +$("#modal_new").modal("show"); diff --git a/app/views/donations/new.html.erb b/app/views/donations/new.html.erb index 8c0d065b25..1f03d4a7be 100644 --- a/app/views/donations/new.html.erb +++ b/app/views/donations/new.html.erb @@ -37,6 +37,7 @@ <%= link_to "Add product drive", new_product_drive_path, {:remote => true, "data-bs-target" => "#modal-window", id: "new_product_drive", "style" => "display: none;"} %> <%= link_to "Add product drive participant", new_product_drive_participant_path, {:remote => true, "data-bs-target" => "#modal-window", id: "new_participant", "style" => "display: none;"} %> <%= link_to "Add manufacturer", new_manufacturer_path, {:remote => true, "data-bs-target" => "#modal-window", id: "new_manufacturer", "style" => "display: none;"} %> + <%= link_to "Add donation site", new_donation_site_path, {:remote => true, "data-bs-target" => "#modal-window", id: "new_donation_site", "style" => "display: none;"} %>
From 654eaf17fd031bcaee9a25321cb83140982753e4 Mon Sep 17 00:00:00 2001 From: Neenu Chacko <45137335+neenu-chacko@users.noreply.github.com> Date: Fri, 18 Apr 2025 21:23:31 +0530 Subject: [PATCH 2/5] Fixed modal header alignment --- app/views/donation_sites/_new_modal.html.erb | 2 +- app/views/manufacturers/_new_modal.html.erb | 2 +- app/views/product_drives/_new_modal.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/donation_sites/_new_modal.html.erb b/app/views/donation_sites/_new_modal.html.erb index 11341ee469..1f60f456c3 100644 --- a/app/views/donation_sites/_new_modal.html.erb +++ b/app/views/donation_sites/_new_modal.html.erb @@ -3,10 +3,10 @@
- +
<% flash.each do |key, value| %> diff --git a/app/views/manufacturers/_new_modal.html.erb b/app/views/manufacturers/_new_modal.html.erb index bcd112c893..248b1798c5 100644 --- a/app/views/manufacturers/_new_modal.html.erb +++ b/app/views/manufacturers/_new_modal.html.erb @@ -3,10 +3,10 @@
- +
<% flash.each do |key, value| %> diff --git a/app/views/product_drives/_new_modal.html.erb b/app/views/product_drives/_new_modal.html.erb index aa4c7464c8..85b59311e1 100644 --- a/app/views/product_drives/_new_modal.html.erb +++ b/app/views/product_drives/_new_modal.html.erb @@ -3,10 +3,10 @@
- +
<% flash.each do |key, value| %> From 9c052a40d6b7545ecc678396711d1207db0040ab Mon Sep 17 00:00:00 2001 From: Neenu Chacko <45137335+neenu-chacko@users.noreply.github.com> Date: Sat, 19 Apr 2025 17:09:18 +0530 Subject: [PATCH 3/5] Added spec --- app/javascript/utils/donations.js | 2 +- app/views/donation_sites/_form.html.erb | 2 +- app/views/donation_sites/create.js.erb | 2 +- spec/system/donation_system_spec.rb | 13 +++++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/javascript/utils/donations.js b/app/javascript/utils/donations.js index 6bf97daf56..1a25d422cd 100644 --- a/app/javascript/utils/donations.js +++ b/app/javascript/utils/donations.js @@ -19,7 +19,7 @@ $(function() { const create_new_product_drive_text = "---Create new Product Drive---"; const create_new_product_drive_participant_text = "---Create new Participant---"; const create_new_manufacturer_text = "---Create new Manufacturer---"; - const create_new_donation_site_text = "---Add New Donation Site---"; + const create_new_donation_site_text = "---Create New Donation Site---"; $(product_drive_id).append( diff --git a/app/views/donation_sites/_form.html.erb b/app/views/donation_sites/_form.html.erb index d49942f00e..04f57c5d3a 100644 --- a/app/views/donation_sites/_form.html.erb +++ b/app/views/donation_sites/_form.html.erb @@ -37,7 +37,7 @@
- <%= submit_button %> + <%= submit_button({id: "donation-site-submit"}) %>
<% end %>
diff --git a/app/views/donation_sites/create.js.erb b/app/views/donation_sites/create.js.erb index 4822f7aff9..37311f998f 100644 --- a/app/views/donation_sites/create.js.erb +++ b/app/views/donation_sites/create.js.erb @@ -2,5 +2,5 @@ $("#modal_new").modal("hide"); $("#donation_donation_site_id").empty(); $("#donation_donation_site_id").html('<%= j options_from_collection_for_select(current_organization.donation_sites, :id, :name) %>'); -$("#donation_donation_site_id").append(''); +$("#donation_donation_site_id").append(''); $("#donation_donation_site_id").val('<%= @donation_site[:id] %>'); diff --git a/spec/system/donation_system_spec.rb b/spec/system/donation_system_spec.rb index e94e8789a7..10a23622f3 100644 --- a/spec/system/donation_system_spec.rb +++ b/spec/system/donation_system_spec.rb @@ -261,6 +261,19 @@ select "drivenametest", from: "donation_product_drive_id" end + it "Allows User to create a Donation Site from donation" do + select Donation::SOURCES[:donation_site], from: "donation_source" + select "---Create New Donation Site---", from: "donation_donation_site_id" + + find(".modal-content") + expect(page).to have_content("New Donation Site") + + fill_in "donation_site_name", with: "donationsitetest" + fill_in "donation_site_address", with: "1500 Remount Road, Front Royal, VA 22630" + click_on "donation-site-submit" + select "donationsitetest", from: "donation_donation_site_id" + end + it "Allows User to create a Product Drive Participant from donation" do select Donation::SOURCES[:product_drive], from: "donation_source" select "---Create new Participant---", from: "donation_product_drive_participant_id" From 41e292865ca81f9c79856aaad23ccf9cd1422a27 Mon Sep 17 00:00:00 2001 From: Neenu Chacko <45137335+neenu-chacko@users.noreply.github.com> Date: Sat, 19 Apr 2025 20:48:15 +0530 Subject: [PATCH 4/5] Updated documentation --- docs/user_guide/bank/essentials_donations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user_guide/bank/essentials_donations.md b/docs/user_guide/bank/essentials_donations.md index 8315229cf1..79f83025ca 100644 --- a/docs/user_guide/bank/essentials_donations.md +++ b/docs/user_guide/bank/essentials_donations.md @@ -67,7 +67,7 @@ For Product Drive, Manufacturer, or Donation Site, you will further specify the If you specify Product drive, you'll also need to specify the particular drive and participant for the Donation -- but you can enter them "on the fly", here. You can view summaries for the Product Drives in [Product Drives](product_drives.md), and manage the contact info for a Product Drive Participant under [Community -- Product Drive Participants](community_product_drive_participants.md). ##### *Donation Site Donation Site is meant to capture the concept of any place you have a more-or-less permanent place people can drop off donations at, such as your main office, or community locations such as fire halls, etc. -You can see the Donations for each Donation Site and manage their contact information under [Community -- Donation Sites](community_donation_sites.md). Unlike Product Drives, you can't create a new Donation Site 'on the fly' through the fields here +You can see the Donations for each Donation Site and manage their contact information under [Community -- Donation Sites](community_donation_sites.md). Like Product Drives, you can create a new Donation Site 'on the fly' through the fields here too. ##### *Manufacturer This is for the donations that come straight from a Manufacturer. You can view a breakdown of the Donations for each Manufacturer under [Community -- Manufacturers](community_manufacturers.md) ##### *Misc. Donation From 8865ce59cacb4d18a1aa55b18eb63b00fae77104 Mon Sep 17 00:00:00 2001 From: Neenu Chacko <45137335+neenu-chacko@users.noreply.github.com> Date: Sun, 27 Apr 2025 20:05:55 +0530 Subject: [PATCH 5/5] Removed extra check --- app/controllers/donation_sites_controller.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/donation_sites_controller.rb b/app/controllers/donation_sites_controller.rb index 5f6aa5becb..78e6a5d00c 100644 --- a/app/controllers/donation_sites_controller.rb +++ b/app/controllers/donation_sites_controller.rb @@ -35,10 +35,9 @@ def create def new @donation_site = current_organization.donation_sites.new - if request.xhr? - respond_to do |format| - format.js { render template: "donation_sites/new_modal" } - end + respond_to do |format| + format.html + format.js { render template: "donation_sites/new_modal" } end end