Merge branch 'main' into 4517-inactive-items-in-distribution-reports

Author: DasTapan

.prettierignore

@@ -0,0 +1 @@
+**

app/assets/stylesheets/custom.scss

@@ -112,3 +112,7 @@
     max-width: 100%;
   }
 }
+
+.cursor-default {
+    cursor: default !important;
+}

app/controllers/admin/users_controller.rb

@@ -87,6 +87,12 @@ def add_role
     redirect_back(fallback_location: admin_users_path, notice: "Role added!")
   end
 
+  def resend_invitation
+    user = User.find(params[:user_id])
+    user.invite!
+    redirect_back(fallback_location: admin_users_path, notice: "#{user.name} reinvited!")
+  end
+
   def remove_role
     RemoveRoleService.call(user_id: params[:user_id], role_id: params[:role_id])
     redirect_back(fallback_location: admin_users_path, notice: "Role removed!")

app/controllers/donation_sites_controller.rb

@@ -18,13 +18,18 @@ def create
     @donation_site = current_organization.donation_sites.new(donation_site_params)
     respond_to do |format|
       if @donation_site.save
+        format.turbo_stream
         format.html do
           redirect_to donation_sites_path,
                       notice: "Donation site #{@donation_site.name} added!"
         end
       else
+        flash.now[:error] = "Something didn't work quite right -- try again?"
+        if request.format.turbo_stream?
+          format.html { render partial: "donation_sites/new_modal", status: :unprocessable_entity }
+        end
+
         format.html do
-          flash.now[:error] = "Something didn't work quite right -- try again?"
           render action: :new
         end
       end
@@ -33,6 +38,11 @@ def create
 
   def new
     @donation_site = current_organization.donation_sites.new
+    if turbo_frame_request?
+      render partial: "donation_sites/new_modal", layout: false
+    else
+      render :new
+    end
   end
 
   def edit

app/controllers/donations_controller.rb

@@ -18,40 +18,14 @@ def print
   def index
     setup_date_range_picker
 
-    @donations = current_organization.donations
-                                     .includes(:storage_location, :donation_site, :product_drive, :product_drive_participant, :manufacturer, line_items: [:item])
-                                     .order(created_at: :desc)
-                                     .class_filter(filter_params)
-                                     .during(helpers.selected_range)
-    @item_categories = current_organization.item_categories.pluck(:name).uniq
-    @paginated_donations = @donations.page(params[:page])
-
-    @product_drives = current_organization.product_drives.alphabetized
-    @product_drive_participants = current_organization.product_drive_participants.alphabetized
-
-    # Are these going to be inefficient with large datasets?
-    # Using the @donations allows drilling down instead of always starting with the total dataset
-    @donations_quantity = @donations.collect(&:total_quantity).sum
-    @paginated_donations_quantity = @paginated_donations.collect(&:total_quantity).sum
-    @total_value_all_donations = total_value(@donations)
-    @paginated_in_kind_value = total_value(@paginated_donations)
-    @total_money_raised = total_money_raised(@donations)
-    @storage_locations = @donations.filter_map { |donation| donation.storage_location if !donation.storage_location.discarded_at }.compact.uniq.sort
-    @selected_storage_location = filter_params[:at_storage_location]
-    @sources = @donations.collect(&:source).uniq.sort
-    @selected_source = filter_params[:by_source]
-    @selected_item_category = filter_params[:by_category]
-    @donation_sites = @donations.collect(&:donation_site).compact.uniq.sort_by { |site| site.name.downcase }
-    @selected_donation_site = filter_params[:from_donation_site]
-    @selected_product_drive = filter_params[:by_product_drive]
-    @selected_product_drive_participant = filter_params[:by_product_drive_participant]
-    @manufacturers = @donations.collect(&:manufacturer).compact.uniq.sort
-    @selected_manufacturer = filter_params[:from_manufacturer]
+    @donation_info = View::Donations.from_params(params: params, organization: current_organization, helpers: helpers)
 
     respond_to do |format|
       format.html
       format.csv do
-        send_data Exports::ExportDonationsCSVService.new(donation_ids: @donations.map(&:id), organization: current_organization).generate_csv, filename: "Donations-#{Time.zone.today}.csv"
+        send_data Exports::ExportDonationsCSVService.new(donation_ids: @donation_info.donations.map(&:id),
+          organization: current_organization).generate_csv,
+          filename: "Donations-#{Time.zone.today}.csv"
       end
     end
   end
@@ -177,16 +151,4 @@ def compact_line_items
     params[:donation][:line_items_attributes].delete_if { |_row, data| data["quantity"].blank? && data["item_id"].blank? }
     params
   end
-
-  def total_value(donations)
-    total_value_all_donations = 0
-    donations.each do |donation|
-      total_value_all_donations += donation.value_per_itemizable
-    end
-    total_value_all_donations
-  end
-
-  def total_money_raised(donations)
-    donations.sum { |d| d.money_raised.to_i }
-  end
 end

app/controllers/requests_controller.rb

@@ -8,7 +8,7 @@ def index
                 .undiscarded
                 .during(helpers.selected_range)
                 .class_filter(filter_params)
-    @unfulfilled_requests_count = current_organization.requests.where(status: [:pending, :started]).count
+    @unfulfilled_requests_count = current_organization.requests.where(status: [:pending, :started]).during(helpers.selected_range).class_filter(filter_params).count
     @paginated_requests = @requests.includes(:partner).page(params[:page])
     @calculate_product_totals = RequestsTotalItemsService.new(requests: @requests).calculate
     @items = current_organization.items.alphabetized.select(:id, :name)
@@ -65,6 +65,8 @@ def print_unfulfilled
       .includes(:item_requests, partner: [:profile])
       .where(status: [:pending, :started])
       .order(created_at: :desc)
+      .during(helpers.selected_range)
+      .class_filter(filter_params)
 
     respond_to do |format|
       format.any do

app/helpers/donations_helper.rb

@@ -21,6 +21,12 @@ def total_number_of_drives(range = selected_range)
     current_organization.product_drives.within_date_range(formatted_range).count
   end
 
+  def options_with_new(records)
+    model_class = records.klass
+    label = "---Create New #{model_class.model_name.human}---"
+    records.map { |record| [record.name, record.id] } << [label, "new"]
+  end
+
   private
 
   def total_received_donations_unformatted(range = selected_range)

app/helpers/partners_helper.rb

@@ -50,4 +50,22 @@ def partner_status_badge(partner)
       tag.span partner.display_status, class: %w(badge badge-pill badge-info bg-info float-right)
     end
   end
+
+  def partner_status_label(status)
+    status_options = {
+      "uninvited" => {icon: "exclamation-circle"},
+      "invited" => {icon: "check", type: "info"},
+      "awaiting_review" => {icon: "check", type: "warning"},
+      "approved" => {icon: "check", type: "success"},
+      "recertification_required" => {icon: "minus", type: "danger"},
+      "deactivated" => {icon: "minus", type: "secondary"}
+    }
+    return content_tag :span, "Errored", class: "label label-teal" unless status_options[status]
+
+    status_label(
+      status.humanize,
+      status_options[status][:icon],
+      status_options[status][:type] || "default"
+    )
+  end
 end

app/helpers/ui_helper.rb

@@ -148,6 +148,13 @@ def view_button_to(link, options = {})
     _link_to link, { icon: "search", type: "info", text: "View", size: "xs" }.merge(options)
   end
 
+  def status_label(text, icon, type)
+    css_class = "cursor-default btn btn-xs btn-#{type}"
+    content_tag :span, class: css_class do
+      fa_icon icon, text: text
+    end
+  end
+
   def invite_button_to(link, options = {}, properties = {})
     properties = { method: options[:method]&.to_sym || :post, rel: "nofollow", data: { confirm: options[:confirm] || "Are you sure?" } }.merge(properties)
     _link_to link, { icon: "envelope", type: "warning", text: "Invite", size: "xs" }.merge(options), properties

app/javascript/controllers/donations_modal_controller.js

@@ -0,0 +1,35 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  connect() {
+    document.addEventListener("turbo:frame-render", this.openModalHandler)
+    document.addEventListener("turbo:submit-end", this.closeModalHandler)
+  }
+
+  disconnect() {
+    document.removeEventListener("turbo:frame-render", this.openModalHandler)
+    document.removeEventListener("turbo:submit-end", this.closeModalHandler)
+  }
+
+  handleNewSelect(event) {
+    const value = event.target.value
+    if (value === "new") {
+      const url = event.target.dataset.url
+      Turbo.visit(url, { frame: 'modal-new' })
+    }
+  }
+
+  openModalHandler = () => {
+    const modal = document.getElementById("modal-new")
+    const instance = bootstrap.Modal.getOrCreateInstance(modal)
+    instance.show()
+  }
+
+  closeModalHandler = (event) => {
+    if (event.detail.success) {
+      const modal = document.getElementById("modal-new")
+      const instance = bootstrap.Modal.getOrCreateInstance(modal)
+      instance.hide()
+    }
+  }
+}