Skip to content

#5150 - Switch order of page totals and grand totals throughout the app #5191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cielf merged 2 commits into from
May 12, 2025
Merged

#5150 - Switch order of page totals and grand totals throughout the app #5191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00e8373
Updated paginate order
neenu-chacko May 11, 2025
91f0ec5
Merge branch 'main' into 5150-switch-pagination-order
neenu-chacko May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/views/distributions/_distribution_total.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<td></td>
<td></td>
<td class="overall-total-items text-right">
<%= number_with_delimiter(@total_items_all_distributions, :delimiter => ',') %> (Total)
<br>
<%= number_with_delimiter(@total_items_paginated_distributions, :delimiter => ',') %> (This page)
<br>
<%= number_with_delimiter(@total_items_all_distributions, :delimiter => ',') %> (Total)
</td>
<td class="overall-total-value text-right">
<strong><%= dollar_value(@total_value_all_distributions) %></strong> (Total)
<br>
<strong><%= dollar_value(@total_value_paginated_distributions) %></strong> (This page)
<br>
<strong><%= dollar_value(@total_value_all_distributions) %></strong> (Total)
</td>
<td>
</td>
Expand Down
16 changes: 8 additions & 8 deletions app/views/donations/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,25 +124,25 @@
<td></td>
<td></td>
<td class="text-left numeric">
<%= @paginated_donations_quantity %>
<br>
(This page)
<br>
<strong id="donation_quantity">
<%= @donations_quantity %>
<br>
(Total)
</strong>
<br>
<%= @paginated_donations_quantity %>
<br>
(This page)
</td>
<td class="text-left numeric"><strong><%= dollar_value(@total_money_raised) %></strong></td>
<td class="text-left numeric in-kind">
<strong>
<%= dollar_value(@total_value_all_donations) %> (Total)
</strong>
<br>
<%= dollar_value(@paginated_in_kind_value) %>
<br>
(This page)
<br>
<strong>
<%= dollar_value(@total_value_all_donations) %> (Total)
</strong>
</td>
</tr>
</tfoot>
Expand Down
12 changes: 6 additions & 6 deletions app/views/purchases/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,26 +95,26 @@
<tr>
<td colspan="2" style="text-align: left"><strong>Total</strong></td>
<td class="numeric">
<%= @paginated_purchases_quantity %> (This page)
<br>
<strong id="purchase_quantity">
<%= @purchases_quantity %> (Total)
</strong>
<br>
<%= @paginated_purchases_quantity %> (This page)
</td>
<td></td>
<td class="numeric">
<%= dollar_value(@paginated_purchases_value) %> (This page)
<br>
<strong>
<%= dollar_value(@total_value_all_purchases) %> (Total)
</strong>
<br>
<%= dollar_value(@paginated_purchases_value) %> (This page)
</td>
<td class="numeric">
<%= dollar_value(@paginated_fair_market_values) %> (This page)
<br>
<strong>
<%= dollar_value(@total_fair_market_values) %> (Total)
</strong>
<br>
<%= dollar_value(@paginated_fair_market_values) %> (This page)
</td>
<td></td>
</tr>
Expand Down