diff --git a/app/views/partners/dashboards/_requests_in_progress.html.erb b/app/views/partners/dashboards/_requests_in_progress.html.erb index aca6f70f7d..71a2f84151 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,8 +34,24 @@ <% end %> + + <% comment = request.comments %> + <% if comment.present? %> +
+ <%= truncate(comment, length: 20) %> +
+ <% end %> + <%= request.requester.email %> + <% end %> + + diff --git a/app/views/partners/requests/_history.html.erb b/app/views/partners/requests/_history.html.erb index bc2048fce0..a0c96501bb 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 %> + + 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