Filter offer by organizations

Author: gmartincor

app/assets/javascripts/application/organizations_filter.js

@@ -0,0 +1,33 @@
+// app/assets/javascripts/application/organization_filter.js
+$(function() {
+    // Manejar cambios en las casillas de organizaciones
+    $(document).on('change', '.organization-checkbox', function() {
+      // Obtener valores actuales de la URL
+      var searchParams = new URLSearchParams(window.location.search);
+      var cat = searchParams.get('cat');
+      var q = searchParams.get('q');
+      var tag = searchParams.get('tag');
+      
+      var form = $(this).closest('form');
+      
+      // Mantener parámetros actuales
+      if (cat) {
+        if (form.find('input[name="cat"]').length === 0) {
+          form.append('<input type="hidden" name="cat" value="' + cat + '">');
+        }
+      }
+      
+      if (q) {
+        form.find('input[name="q"]').val(q);
+      }
+      
+      if (tag) {
+        if (form.find('input[name="tag"]').length === 0) {
+          form.append('<input type="hidden" name="tag" value="' + tag + '">');
+        }
+      }
+      
+      // Enviar el formulario
+      form.submit();
+    });
+  });

app/controllers/posts_controller.rb

@@ -6,12 +6,6 @@ class PostsController <  ApplicationController
   def index
     context = model.active.of_active_members
 
-    if current_organization.present?
-      context = context.where(
-        organization_id: current_organization.id
-      )
-    end
-
     posts = apply_scopes(context)
     posts = posts.search_by_query(params[:q]) if params[:q].present?
     posts = posts.page(params[:page]).per(25)

app/helpers/organizations_helper.rb

@@ -0,0 +1,17 @@
+module OrganizationsHelper
+  def filterable_organizations
+    Organization.all.order(:name)
+  end
+
+  def allied_organizations
+    return [] unless current_organization
+
+    allied_org_ids = current_organization.accepted_alliances.map do |alliance|
+      alliance.source_organization_id == current_organization.id ?
+        alliance.target_organization_id : alliance.source_organization_id
+    end
+
+    organizations = Organization.where(id: allied_org_ids + [current_organization.id])
+    organizations.order(:name)
+  end
+end

app/models/post.rb

@@ -30,6 +30,9 @@ class Post < ApplicationRecord
   scope :by_organization, ->(org) {
     where(organization_id: org) if org
   }
+  scope :by_organizations, ->(org_ids) {
+  where(organization_id: org_ids) if org_ids.present?
+  }
   scope :of_active_members, -> {
     with_member.where("members.active")
   }

app/views/inquiries/index.html.erb

@@ -11,7 +11,7 @@
   <%= render "shared/post_filters", base_path: inquiries_path %>
 
   <div class="col-md-4">
-    <% if current_user && current_organization && !params[:org] %>
+    <% if current_user && current_organization %>
       <ul class="nav navbar-nav text-end">
         <li class="nav-item">
           <%= link_to new_inquiry_path, class: 'nav-link text-primary' do %>

app/views/offers/index.html.erb

@@ -11,7 +11,7 @@
   <%= render "shared/post_filters", base_path: offers_path %>
 
   <div class="col-md-4">
-    <% if current_user && current_organization && !params[:org] %>
+    <% if current_user && current_organization %>
       <ul class="nav navbar-nav text-end">
         <li class="nav-item">
           <%= link_to new_offer_path, class: 'nav-link text-primary' do %>

app/views/shared/_post_filters.html.erb

@@ -1,4 +1,5 @@
 <% @category = Category.find_by(id: params[:cat]) %>
+<% selected_org = Organization.find_by(id: params[:org]) %>
 
 <div class="col-md-8">
   <form action="<%= base_path %>"
@@ -23,12 +24,18 @@
         </a>
         <ul class="dropdown-menu" role="menu">
           <li>
-            <%= link_to "× #{t('global.all')}", base_path, class: "dropdown-item" %>
+            <%= link_to "× #{t('global.all')}", base_path + (params[:org] ? "?org=#{params[:org]}" : ""), class: "dropdown-item" %>
           </li>
           <% all_categories.each do |c| %>
             <% next if c == @category %>
             <li>
-              <%= link_to "#{base_path}?cat=#{c.id}", class: "dropdown-item" do %>
+              <% 
+                query_params = {}
+                query_params[:cat] = c.id
+                query_params[:org] = params[:org] if params[:org].present?
+                link_path = "#{base_path}?#{query_params.to_query}"
+              %>
+              <%= link_to link_path, class: "dropdown-item" do %>
                 <%= category_icon(c) %>
                 <%= c.name %>
               <% end %>
@@ -37,5 +44,31 @@
         </ul>
       </li>
     </ul>
+    <ul class="nav navbar-nav d-none d-sm-flex">
+      <li class="dropdown nav-item">
+        <a class="dropdown-toggle nav-link text-primary" href="#" data-bs-toggle="dropdown" role="button" aria-expanded="false">
+          <%= selected_org ? selected_org.name : t("activerecord.models.organization.other") %>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+          <li>
+            <%= link_to "× #{t('global.all')}", base_path + (params[:cat] ? "?cat=#{params[:cat]}" : ""), class: "dropdown-item" %>
+          </li>
+          <% allied_organizations.each do |org| %>
+            <% next if org.id.to_s == params[:org] %>
+            <li>
+              <% 
+                query_params = {}
+                query_params[:org] = org.id
+                query_params[:cat] = params[:cat] if params[:cat].present?
+                link_path = "#{base_path}?#{query_params.to_query}"
+              %>
+              <%= link_to link_path, class: "dropdown-item" do %>
+                <%= org.name %>
+              <% end %>
+            </li>
+          <% end %>
+        </ul>
+      </li>
+    </ul>
   </form>
-</div>
+</div>

config/locales/en.yml

@@ -304,6 +304,7 @@ en:
     table:
       actions: Actions
     to: To
+    filter_by_organizations: "Filter by organizations"
   inquiries:
     edit:
       submit: Change request

config/locales/es.yml

@@ -101,8 +101,8 @@ es:
         one: Oferta
         other: Ofertas
       organization:
-        one: Banco de Tiempo
-        other: Bancos de Tiempo
+        one: Organización
+        other: Organizaciones
       post:
         one: Anuncio
         other: Anuncios
@@ -304,6 +304,7 @@ es:
     table:
       actions: Acciones
     to: a
+    filter_by_organizations: "Filtrar por organizaciones"
   inquiries:
     edit:
       submit: Cambiar demanda