diff --git a/app/datatables/questionnaire_datatable.rb b/app/datatables/questionnaire_datatable.rb index a7dd56fb4..6ff70041c 100644 --- a/app/datatables/questionnaire_datatable.rb +++ b/app/datatables/questionnaire_datatable.rb @@ -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 }, @@ -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, diff --git a/app/views/manage/application/_questionnaire_datatable.html.haml b/app/views/manage/application/_questionnaire_datatable.html.haml index 1c829af33..a985b3d44 100644 --- a/app/views/manage/application/_questionnaire_datatable.html.haml +++ b/app/views/manage/application/_questionnaire_datatable.html.haml @@ -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 @@ -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'}