Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Make columns of user and ordergroup lists sortable

Browse source 
This commit implements the sort functionality for the user lists (by name, email, last_activity) and ordergroup lists (by name).
It is a first attempt addressing issue #560.
This commit is contained in:
Harald Reingruber 2022-05-27 17:06:25 +02:00 • committed by GitHub
parent 8f94403ccf
commit 0a6345c60b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 278 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/admin/ordergroups/_ordergroups.html.haml
View file

@ -4,10 +4,11 @@
%table.table.table-striped
%thead
%tr
%th= heading_helper Ordergroup, :name
%th= heading_helper Ordergroup, :user_tokens
%th= sort_link_helper heading_helper(Ordergroup, :name), "name"
%th= sort_link_helper heading_helper(Ordergroup, :user_tokens), "members_count"
%th= heading_helper Ordergroup, :contact_address
%th= heading_helper Ordergroup, :last_user_activity
%th= sort_link_helper heading_helper(Ordergroup, :last_user_activity), "last_user_activity"
%th= sort_link_helper heading_helper(Ordergroup, :last_order), "last_order"
%th= t 'ui.actions'
%tbody
- for ordergroup in @ordergroups
@ -17,6 +18,7 @@
%abbr{title: ordergroup_members_title(ordergroup)}= ordergroup.users.size
%td= link_to_gmaps ordergroup.contact_address
%td= format_date ordergroup.last_user_activity
%td= format_date ordergroup.last_order.try(:starts)
%td
= link_to t('ui.edit'), edit_admin_ordergroup_path(ordergroup), class: 'btn btn-mini'
= link_to t('ui.delete'), [:admin, ordergroup], :data => {:confirm => t('ui.confirm_delete', name: ordergroup.name)},

8
app/views/admin/users/_users.html.haml
View file

@ -5,11 +5,11 @@
%thead
%tr
- if FoodsoftConfig[:use_nick]
%th= heading_helper User, :nick
%th= heading_helper User, :name
%th= heading_helper User, :email
%th= sort_link_helper heading_helper(User, :nick), "nick"
%th= sort_link_helper heading_helper(User, :name), "name"
%th= sort_link_helper heading_helper(User, :email), "email"
%th= t 'admin.access_to'
%th= heading_helper User, :last_activity
%th= sort_link_helper heading_helper(User, :last_activity), "last_activity"
%th(colspan="2")= t 'ui.actions'
%tbody
- for user in @users

6
app/views/foodcoop/ordergroups/_ordergroups.html.haml
View file

@ -5,11 +5,11 @@
%table.table.table-striped
%thead
%tr
%th= heading_helper Ordergroup, :name
%th= sort_link_helper heading_helper(Ordergroup, :name), "name"
%th= heading_helper Ordergroup, :user_tokens
%th= heading_helper Ordergroup, :break
%th= heading_helper Ordergroup, :last_user_activity
%th= heading_helper Ordergroup, :last_order
%th= sort_link_helper heading_helper(Ordergroup, :last_user_activity), "last_user_activity"
%th= sort_link_helper heading_helper(Ordergroup, :last_order), "last_order"
%tbody
- for ordergroup in @ordergroups

10
app/views/foodcoop/users/_users.html.haml
View file

@ -5,11 +5,11 @@
%thead
%tr
- if FoodsoftConfig[:use_nick]
%th= heading_helper User, :nick
%th= heading_helper User, :name
%th= heading_helper User, :email
%th= heading_helper User, :phone
%th= heading_helper User, :ordergroup
%th= sort_link_helper heading_helper(User, :nick), "nick"
%th= sort_link_helper heading_helper(User, :name), "name"
%th= sort_link_helper heading_helper(User, :email), "email"
%th= sort_link_helper heading_helper(User, :phone), "phone"
%th= sort_link_helper heading_helper(User, :ordergroup), "ordergroup"
%th= heading_helper User, :workgroup, count: 3
%tbody
- for user in @users