Merge pull request #581 from coopdevs/post_id_report

Add post ID to offers/inquiries reports
coopdevs · Jan 8, 2021 · 439b11c · 439b11c
2 parents 640cd29 + 9079c42
commit 439b11c
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 52 deletions.
diff --git a/app/decorators/post_report_decorator.rb b/app/decorators/post_report_decorator.rb
@@ -14,6 +14,7 @@ def name(extension)
 
   def headers
     [
+      "",
       @type.model_name.human,
       User.model_name.human
     ]
@@ -23,10 +24,11 @@ def rows
     grouped_rows = []
 
     @collection.each do |category, posts|
-      grouped_rows << [category.try(:name) || "-", ""]
+      grouped_rows << ["", category.try(:name) || "-", ""]
 
       posts.each do |post|
         grouped_rows << [
+          post.id,
           post.title,
           "#{post.user} (#{post.member_uid})"
         ]

diff --git a/app/views/application/_navbar.html.erb b/app/views/application/_navbar.html.erb
@@ -52,11 +52,31 @@
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
           <ul class="nav nav-pills actions-menu">
-            <%= render 'application/menus/user_list_link' %>
-            <%= render 'application/menus/offers_list_link' %>
-            <%= render 'application/menus/inquiries_list_link' %>
+            <li class="<%= "active" if current_page?(users_path) %>">
+              <%= link_to users_path do %>
+                <%= glyph :user %>
+                <%= t("users.index.members") %>
+              <% end %>
+            </li>
+            <li class="<%= "active" if current_page?(offers_path) %>">
+              <%= link_to offers_path do %>
+                <%= glyph :offer %>
+                <%= Offer.model_name.human(count: :many) %>
+              <% end %>
+            </li>
+            <li class="<%= "active" if current_page?(inquiries_path) %>">
+              <%= link_to inquiries_path do %>
+                <%= glyph :inquiry %>
+                <%= Inquiry.model_name.human(count: :many) %>
+              <% end %>
+            </li>
             <% if current_user.manages? current_organization %>
-              <%= render 'application/menus/offers_by_tag_link' %>
+              <li class="<%= "active" if current_page?(alpha_grouped_index_tags_path(post_type: "offer")) %>">
+                <%= link_to alpha_grouped_index_tags_path(post_type: "offer") do %>
+                  <%= glyph :tags %>
+                  <%= t ".tags" %>
+                <% end %>
+              </li>
               <%= render 'application/menus/organization_reports_menu' %>
               <%= render 'application/menus/organization_statistics_menu' %>
               <%= render 'application/menus/organization_listings_menu' %>

diff --git a/app/views/application/menus/_inquiries_list_link.html.erb b/app/views/application/menus/_inquiries_list_link.html.erb
diff --git a/app/views/application/menus/_offers_by_tag_link.html.erb b/app/views/application/menus/_offers_by_tag_link.html.erb
diff --git a/app/views/application/menus/_offers_list_link.html.erb b/app/views/application/menus/_offers_list_link.html.erb
diff --git a/app/views/application/menus/_organization_switcher.html.erb b/app/views/application/menus/_organization_switcher.html.erb
diff --git a/app/views/application/menus/_user_admin_menu_items.html.erb b/app/views/application/menus/_user_admin_menu_items.html.erb
@@ -1,5 +1,16 @@
 <% if current_user.organizations.count > 1 %>
-  <%= render 'application/menus/organization_switcher' %>
+  <li class="disabled">
+    <a href="#"><%= current_organization.name %></a>
+  </li>
+  <% (current_user.organizations - [current_organization]).each do |org| %>
+    <li>
+      <%= link_to set_current_organization_path(org), method: :post do %>
+        <%= glyph(:retweet) %>
+        <%= org.name %>
+      <% end %>
+    </li>
+  <% end %>
+
   <li class="divider" role="presentation"></li>
 <% end %>
 

diff --git a/app/views/application/menus/_user_list_link.html.erb b/app/views/application/menus/_user_list_link.html.erb
diff --git a/app/views/inquiries/index.js.erb b/app/views/inquiries/index.js.erb
diff --git a/app/views/offers/index.js.erb b/app/views/offers/index.js.erb
diff --git a/app/views/reports/post_list.html.erb b/app/views/reports/post_list.html.erb
@@ -6,17 +6,19 @@
     </colgroup>
     <thead>
       <tr>
+        <th></th>
         <th><%= @post_type.model_name.human %></th>
         <th><%= User.model_name.human %></th>
       </tr>
     </thead>
     <tbody>
       <% @posts.each do |cat, ps| %>
-        <tr class="success">
-          <td colspan="2"><h4><%= cat || '—' %></h4></td>
+        <tr class="info">
+          <td colspan="3"><h4><%= cat || '—' %></h4></td>
         </tr>
         <% ps.each do |post| %>
           <tr>
+            <td><%= post.id %></td>
             <td><strong><%= post.title %></strong></td>
             <td><%= "#{post.user} (#{post.member_uid})" %></td>
           </tr>

diff --git a/app/views/reports/user_list.html.erb b/app/views/reports/user_list.html.erb
@@ -2,8 +2,6 @@
   <table class="table table-condensed table-bordered table-striped">
     <thead>
       <tr>
-        <!-- %th= User.human_attribute_name(:registration_number)
-        -->
         <th>N</th>
         <th><%= User.human_attribute_name :username %></th>
         <th><%= User.human_attribute_name :email %></th>
@@ -22,6 +20,5 @@
         </tr>
       <% end %>
     </tbody>
-    <tfoot></tfoot>
   </table>
 </div>
diff --git a/spec/decorators/post_report_decorator_spec.rb b/spec/decorators/post_report_decorator_spec.rb
@@ -24,6 +24,7 @@
 
   it "#headers" do
     expect(decorator.headers).to eq([
+      "",
       Offer.model_name.human,
       User.model_name.human
     ])
@@ -34,8 +35,8 @@
     offer = org.offers.of_active_members.active.first
 
     expect(decorator.rows).to eq([
-      [category.name, ""],
-      [offer.title, "#{offer.user} (#{offer.member_uid})"]
+      ["", category.name, ""],
+      [offer.id, offer.title, "#{offer.user} (#{offer.member_uid})"]
     ])
   end
 end