From 318484051d3e6503b0b7bcda90b3db4c816d00b7 Mon Sep 17 00:00:00 2001
From: JP <85654561+jp524@users.noreply.github.com>
Date: Sun, 20 Apr 2025 10:35:49 -0500
Subject: [PATCH 1/5] Partner dashboard: add 'comment and sender' to Requests
in Progress
---
app/views/partners/dashboards/_requests_in_progress.html.erb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/app/views/partners/dashboards/_requests_in_progress.html.erb b/app/views/partners/dashboards/_requests_in_progress.html.erb
index aca6f70f7d..30cbf0b0b1 100644
--- a/app/views/partners/dashboards/_requests_in_progress.html.erb
+++ b/app/views/partners/dashboards/_requests_in_progress.html.erb
@@ -7,6 +7,7 @@
Request Date |
Number of Items Requested |
Items Requested |
+ Comment and Sender |
@@ -33,6 +34,10 @@
<% end %>
+
+ <%= request.comments %>
+ <%= request.requester.email %>
+ |
<% end %>
From 7cf9c71c1288d08d4282de83a4b3cec1c4bc6711 Mon Sep 17 00:00:00 2001
From: JP <85654561+jp524@users.noreply.github.com>
Date: Sun, 20 Apr 2025 10:56:02 -0500
Subject: [PATCH 2/5] Comment is truncated to 20 chars; rest displayed via
tooltip
---
.../dashboards/_requests_in_progress.html.erb | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/app/views/partners/dashboards/_requests_in_progress.html.erb b/app/views/partners/dashboards/_requests_in_progress.html.erb
index 30cbf0b0b1..54cb17c16b 100644
--- a/app/views/partners/dashboards/_requests_in_progress.html.erb
+++ b/app/views/partners/dashboards/_requests_in_progress.html.erb
@@ -35,7 +35,12 @@
<% end %>
- <%= request.comments %>
+ <% comment = request.comments %>
+ <% if comment.present? %>
+
+ <%= truncate(comment, length: 20) %>
+
+ <% end %>
<%= request.requester.email %>
|
@@ -43,3 +48,10 @@
+
+
From de2e7a326620c89cdbc7f6737ae691355d3468ac Mon Sep 17 00:00:00 2001
From: JP <85654561+jp524@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:01:08 -0500
Subject: [PATCH 3/5] Partner requests: add 'comment and sender' to Request
History
---
app/views/partners/requests/_history.html.erb | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/app/views/partners/requests/_history.html.erb b/app/views/partners/requests/_history.html.erb
index bc2048fce0..946eb88c34 100644
--- a/app/views/partners/requests/_history.html.erb
+++ b/app/views/partners/requests/_history.html.erb
@@ -5,7 +5,9 @@
| Request Date |
+ Number of Items Requested |
Items Requested |
+ Comment and Sender |
@@ -23,8 +25,24 @@
<% end %>
+
+ <% comment = partner_request.comments %>
+ <% if comment.present? %>
+
+ <%= truncate(comment, length: 20) %>
+
+ <% end %>
+ <%= partner_request.requester.email %>
+ |
<% end %>
+
+
From 30052dc7683e81b0b5b52d9b062cf1b05016d20d Mon Sep 17 00:00:00 2001
From: JP <85654561+jp524@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:08:50 -0500
Subject: [PATCH 4/5] Add specs
---
spec/requests/partners/dashboard_requests_spec.rb | 10 ++++++++++
spec/requests/partners/requests_spec.rb | 7 +++++++
2 files changed, 17 insertions(+)
diff --git a/spec/requests/partners/dashboard_requests_spec.rb b/spec/requests/partners/dashboard_requests_spec.rb
index b800f4f776..66f45ba0b3 100644
--- a/spec/requests/partners/dashboard_requests_spec.rb
+++ b/spec/requests/partners/dashboard_requests_spec.rb
@@ -59,6 +59,16 @@
expect(response.body).to match(/7\s+#{item1.name}/m)
end
+
+ it "displays comment and sender" do
+ request = create(:request, :pending, partner:, request_items: [])
+ create(:item_request, request:, quantity: 16, item: item1)
+
+ get partners_dashboard_path
+
+ expect(response.body).to include(request.comments)
+ expect(response.body).to include(request.requester.email)
+ end
end
it "displays upcoming distributions" do
diff --git a/spec/requests/partners/requests_spec.rb b/spec/requests/partners/requests_spec.rb
index d3bb1e0229..644aa62fc7 100644
--- a/spec/requests/partners/requests_spec.rb
+++ b/spec/requests/partners/requests_spec.rb
@@ -30,6 +30,13 @@
subject.call
expect(response.body).to include("684")
end
+
+ it "displays comment and sender" do
+ request = create(:request, partner_id: partner.id, request_items: [{item_id: item1.id, quantity: '125'}])
+ subject.call
+ expect(response.body).to include(request.comments)
+ expect(response.body).to include(request.requester.email)
+ end
end
describe "GET #new" do
From cdaf6c4effe13604c18bd76ed381686f819db82c Mon Sep 17 00:00:00 2001
From: JP <85654561+jp524@users.noreply.github.com>
Date: Wed, 23 Apr 2025 17:51:11 -0500
Subject: [PATCH 5/5] Refactor script for tooltip
---
app/views/partners/dashboards/_requests_in_progress.html.erb | 4 ++--
app/views/partners/requests/_history.html.erb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/views/partners/dashboards/_requests_in_progress.html.erb b/app/views/partners/dashboards/_requests_in_progress.html.erb
index 54cb17c16b..71a2f84151 100644
--- a/app/views/partners/dashboards/_requests_in_progress.html.erb
+++ b/app/views/partners/dashboards/_requests_in_progress.html.erb
@@ -51,7 +51,7 @@
diff --git a/app/views/partners/requests/_history.html.erb b/app/views/partners/requests/_history.html.erb
index 946eb88c34..a0c96501bb 100644
--- a/app/views/partners/requests/_history.html.erb
+++ b/app/views/partners/requests/_history.html.erb
@@ -42,7 +42,7 @@