Skip to content

v2.2.3 #636

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
merged 4 commits into from
Feb 16, 2021
Merged

v2.2.3 #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4933a8a
fix: Fixes sort issue on Questionnaires datatable
cbaudouinjr Feb 16, 2021
cb5b474
Merge pull request #634 from codeRIT/hm-633
cbaudouinjr Feb 16, 2021
269c898
Merge pull request #635 from codeRIT/v2.2.3
cbaudouinjr Feb 16, 2021
2ca546a
Merge branch 'master' into develop
cbaudouinjr Feb 16, 2021
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
2 changes: 0 additions & 2 deletions app/datatables/questionnaire_datatable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def view_columns
checked_in: { source: "Questionnaire.checked_in_at", searchable: false },
boarded_bus: { source: "Questionnaire.boarded_bus_at", searchable: false },
bus_captain: { source: "Questionnaire.is_bus_captain", searchable: false },
country: { source: "Questionnaire.country" },
school: { source: "School.name" },
created_at: { source: "Questionnaire.created_at", searchable: false },
dietary_restrictions: { source: "Questionnaire.dietary_restrictions", searchable: true },
Expand Down Expand Up @@ -63,7 +62,6 @@ def data
boarded_bus: yes_no_display(record.boarded_bus?),
bus_captain: bus_captain(record),
school: link_to(record.school.name, manage_school_path(record.school)),
country: record.country,
created_at: record.created_at.present? ? display_datetime(record.created_at) : "",
dietary_restrictions: record.dietary_restrictions,
special_needs: record.special_needs,
Expand Down
3 changes: 0 additions & 3 deletions app/views/manage/application/_questionnaire_datatable.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
%th{'data-table': { orderable: 'true', data: 'boarded_bus', visible: visible.call('boarded_bus', columns) }} Boarded bus
%th{'data-table': { orderable: 'true', data: 'bus_captain', visible: visible.call('bus_captain', columns) }} Bus captain
%th{'data-table': { orderable: 'true', data: 'school', visible: visible.call('school', columns) }} School
%th{'data-table': { orderable: 'true', data: 'country', visible: visible.call('country', columns) }} Country
%th{'data-table': { orderable: 'true', data: 'created_at', visible: visible.call('created_at', columns) }} Applied on
%th{'data-table': { orderable: 'true', data: 'dietary_restrictions', visible: visible.call('dietary_restrictions', columns) }} Dietary restrictions
%th{'data-table': { orderable: 'true', data: 'special_needs', visible: visible.call('special_needs', columns) }} Special needs
Expand Down Expand Up @@ -68,8 +67,6 @@
%th
%th
%input.form-control.form-control-sm{autocomplete: 'off', placeholder: 'School'}
%th
%input.form-control.form-control-sm{autocomplete: 'off', placeholder: 'Country'}
%th
%th
%input.form-control.form-control-sm{autocomplete: 'off', placeholder: 'Dietary restrictions'}
Expand Down