diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 7789a81..f708b36 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -5,7 +5,7 @@ <%= simple_form_for @user, url: sessions_path do |f| %>
- <%= f.input :internet_id, required: false, autofocus: true, label: 'Internet ID' %> + <%= f.input :internet_id, required: false, autofocus: true, label: username_string %> <%= f.input :password, required: false %>
diff --git a/app/views/shared/_flash.html.erb b/app/views/shared/_flash.html.erb index fcc1bd2..533243f 100644 --- a/app/views/shared/_flash.html.erb +++ b/app/views/shared/_flash.html.erb @@ -1,7 +1,7 @@ <% flash.each do |type, message| %> <% unless message.empty? %>
- + <% if message.kind_of? Array %>
    <% message.each do |m| %> diff --git a/app/views/studies/index.html.erb b/app/views/studies/index.html.erb index cda94dd..418ffaa 100644 --- a/app/views/studies/index.html.erb +++ b/app/views/studies/index.html.erb @@ -51,7 +51,7 @@
    <% if @trials.empty? %> -
    There were no trials that matched your search for <%= @search_query %>
    +
    There were no trials that matched your search for <%= @search_query %>
    <% end %> <% @trials.each_with_index do |t, i| %> diff --git a/app/views/themed/_home_lower_right.html.erb b/app/views/themed/_home_lower_right.html.erb index 527031b..addacdd 100644 --- a/app/views/themed/_home_lower_right.html.erb +++ b/app/views/themed/_home_lower_right.html.erb @@ -1,15 +1,12 @@

    Join a national registry!

    -
    -
    - <%= link_to "https://researchmatch.org?rm=<%= @system_info.research_match_campaign" do %> - <%= image_tag "rsm-large.jpg", class: 'img-fluid', style: 'width: 50%;' %> - <% end %> -
    -
    - - -

    ResearchMatch.org connects volunteers with research studies across the country. Volunteers of any age, race, ethnicity, or health status are invited to join. Log on, register, and receive emails when studies might be a good fit for you.

    -
    -
    \ No newline at end of file +
    +
    + <%= link_to "https://researchmatch.org?rm=<%= @system_info.research_match_campaign" do %> + <%= image_tag "rsm-large.jpg", class: 'img-fluid', style: 'width: 50%;' %> + <% end %> +
    +
    + +

    ResearchMatch.org connects volunteers with research studies across the country. Volunteers of any age, race, ethnicity, or health status are invited to join. Log on, register, and receive emails when studies might be a good fit for you.

    +
    +
    \ No newline at end of file diff --git a/config/application.example.yml b/config/application.example.yml index f3c9c09..787d3b6 100644 --- a/config/application.example.yml +++ b/config/application.example.yml @@ -7,4 +7,5 @@ departmental_pw: 'PASSWORD' theme: 'umn' ELASTICSEARCH_URL: 'elastic.umn.edu' wkhtmltopdf_binary_path: 'PATH' -DEFAULT_URL_HOST: 'yourstudyfinder.example.com' # Used in email links/URLs \ No newline at end of file +DEFAULT_URL_HOST: 'yourstudyfinder.example.com' # Used in email links/URLs +username_string: 'Internet ID' # What a login 'username' is called at your institution. Appears in various templates. \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index e01bf59..6e90abb 100644 --- a/config/application.rb +++ b/config/application.rb @@ -8,15 +8,6 @@ module StudyFinder class Application < Rails::Application - # Initialize configuration defaults for originally generated Rails version. - #config.load_defaults 5.0 - - # Configuration for the application, engines, and railties goes here. - # - # These settings can be overridden in specific environments using the files - # in config/environments, which are processed later. - # - # config.time_zone = "Central Time (US & Canada)" - # config.eager_load_paths << Rails.root.join("extras") + config.load_defaults 7.0 end end diff --git a/config/deploy.rb b/config/deploy.rb index e89de54..436f450 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -2,8 +2,8 @@ lock "3.17.1" set :application, "study_finder" -set :repo_url, "https://github.umn.edu/hst/study_finder_umn.git" -set :deploy_to, "/var/www/webapps/study_finder" +set :repo_url, "https://your-repo.com/study_finder_umn.git" +set :deploy_to, "/your/deploy/dir/study_finder" set :default_env, { path: "/opt/ruby31/bin:$PATH" } set :passenger_restart_with_touch, true set :branch, ENV.fetch("GIT_BRANCH", "master").sub(/^origin\//, "") diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 7eca458..a786e04 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1 +1 @@ -server "walleye0.ahc.umn.edu", user: "webcluster2", roles: %w{app db web} +server "prod-server", user: "deploy-user", roles: %w{app db web} diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index e2d2fb1..6e21acf 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb @@ -1 +1 @@ -server "goldfish0.ahc.umn.edu", user: "webcluster2", roles: %w{app db web} +server "staging-server", user: "deploy-user", roles: %w{app db web} diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 7c74d41..2e5ec56 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file. # Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.7' +Rails.application.config.assets.version = '2.1' # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path diff --git a/db/migrate/20230531220402_add_protect_simple_description_to_system_infos.rb b/db/migrate/20230531220402_add_protect_simple_description_to_system_infos.rb deleted file mode 100644 index 326239b..0000000 --- a/db/migrate/20230531220402_add_protect_simple_description_to_system_infos.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddProtectSimpleDescriptionToSystemInfos < ActiveRecord::Migration[7.0] - def change - add_column :study_finder_system_infos, :protect_simple_description, :boolean, null: false, default: false - end -end diff --git a/db/schema.rb b/db/schema.rb index 7daa65f..8309d22 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -165,7 +165,6 @@ t.boolean "trial_approval", default: false, null: false t.boolean "alert_on_empty_system_id", default: false, null: false t.string "study_contact_bcc" - t.boolean "protect_simple_description", default: false, null: false t.boolean "healthy_volunteers_filter", default: true, null: false t.boolean "gender_filter", default: true, null: false t.integer "google_analytics_version" diff --git a/db/seeds.rb b/db/seeds.rb index 82d2a32..a60a418 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -17,7 +17,7 @@

    To help potential participants better navigate and connect with University research opportunities, we encourage you to periodically review your studies and update the description and contact information, as appropriate.

    Please also be aware that people may email you via StudyFinder to inquire about a study. We urge you to work directly with these potential participants, and to contact the StudyFinder team with any questions.

    How to update your study

    You can update select study information on this website or directly in the source data (ClinicalTrials.gov and/or OnCore).

    To update your study on StudyFinder:

    • Click on the maroon \"Look up/Edit Study Information\" button toward the bottom of this page.
      • -
    • Log in using your x500.
      • +
    • Log in using your Internet ID.
    • Look up your study information by entering the System ID, which is either Study NCT ID from ClinicalTrials.gov, or Protocol ID from OnCore.
    • Ensure the primary contact is a suitable person for potential participants to reach out to via email.
    • Save your changes by entering the secret key, and clicking the \"Update Trial\" button at the bottom of the page.
      • @@ -102,7 +102,7 @@ # Trials # ============================================ -# Rake::Task['studyfinder:ctgov:load'].invoke +Rake::Task['studyfinder:ctgov:load'].invoke # ============================================ # Trial attribute settings diff --git a/lib/tasks/correspondance.rake b/lib/tasks/correspondance.rake deleted file mode 100644 index c4ff3dd..0000000 --- a/lib/tasks/correspondance.rake +++ /dev/null @@ -1,74 +0,0 @@ -namespace :studyfinder do - namespace :coorespondance do - task generate_pis: :environment do |t, args| - - results = Trial.find_by_sql(" - select x.system_id, x.email, max(x.name) as name - from ( - select system_id, contact_email as email, contact_last_name as name - from study_finder_trials - where visible = true - and contact_email is not null and contact_email like '%umn.edu' - - UNION ALL - - select t.system_id, tl.email, tl.last_name as name - from study_finder_trials t - left join study_finder_trial_locations tl on tl.trial_id = t.id - where visible = true - and tl.email is not null and tl.email like '%umn.edu' - - UNION ALL - - select t.system_id, tl.backup_email, tl.backup_last_name as name - from study_finder_trials t - left join study_finder_trial_locations tl on tl.trial_id = t.id - where visible = true - and tl.backup_email is not null and tl.backup_email like '%umn.edu') x - group by x.system_id, x.email - order by x.email - ") - - FileUtils.rm_rf("#{Rails.root}/tmp/email_templates.html") - - pi_list = {} - - results.each do |row| - if pi_list[row["email"]].nil? - pi_list[row["email"]] = { - name: row["name"], - email: row["email"], - ids: [row["system_id"]] - } - else - pi_list[row["email"]][:ids] << row["system_id"] - end - end - - File.open("#{Rails.root}/tmp/email_templates.html", "w+") do |f| - - pi_list.each do |pi| - - email_template = " - to: %email%

      - Dear %name%,
      -

      Next month, the Clinical and Translational Science Institute will formally launch the University of Minnesota's StudyFinder website (StudyFinder.umn.edu) and kiosk, which will make it easier than ever for the general public to find and connect with University health studies that need volunteers.

      -

      Because StudyFinder will display your studies (%study_ids%), we would like to give you the opportunity to review how it will appear prior to the launch. We hope you can to take a moment to review your study on StudyFinder.umn.edu to ensure the primary contact is a suitable person for potential participants to reach out to via email.

      -

      This information is currently extracted from ClinicalTrials.gov and augmented with data from the OnCore clinical trials management system, when available. Researchers can make select changes though StudyFinder.umn.edu, and contact our StudyFinder team at sfinder@umn.edu with questions or to request other modifications. Note that StudyFinder will prompt researchers for a secret key, which is: test

      -

      We encourage you to periodically review your studies on StudyFinder to help potential participants easily find and connect with studies that are right for them.

      -

      Please also be aware that people may email you via the StudyFinder website to inquire about a study. We urge you to work directly with these potential participants, and to contact the StudyFinder team with any questions.

      -

      For your reference, the StudyFinder kiosk - which includes iPads displaying the StudyFinder website - will be housed in the lobby of the University of Minnesota Medical Center (East Bank) starting in early May and will eventually travel to other locations.

      -

      As some of you know, we tested StudyFinder at the 2014 Minnesota State Fair and Delaware Clinical Research Unit, collecting feedback from both users and the University research community. We used this input to make several enhancements aimed at improving the user's experience and giving researchers increased flexibility over how their study appears. Thank you to those who provided feedback.

      -

      If you have questions or comments, or need assistance updating your study information, please contact us at sfinder@umn.edu.

      - -
      " - f.write( - email_template.gsub('%email%', pi[1][:email]).gsub('%name%', pi[1][:name]).gsub('%study_ids%', pi[1][:ids].join(', ') ) - ) - end - end - - - end - end -end \ No newline at end of file diff --git a/lib/tasks/ctgov.rake b/lib/tasks/ctgov.rake index ae4fac8..b15611d 100644 --- a/lib/tasks/ctgov.rake +++ b/lib/tasks/ctgov.rake @@ -11,7 +11,7 @@ namespace :studyfinder do # ============================================================================================== task :load, [:days_previous] => [:environment] do |t, args| - Retrieve x amount of trials days previous from today. + # Retrieve x amount of trials days previous from today. args.with_defaults(days_previous: 4) puts "Processing ClinicalTrials.gov data" diff --git a/lib/tasks/synonyms.rake b/lib/tasks/synonyms.rake deleted file mode 100644 index 4a4b34e..0000000 --- a/lib/tasks/synonyms.rake +++ /dev/null @@ -1,55 +0,0 @@ -namespace :studyfinder do - namespace :synonyms do - - task :to_txt, [:file] => [:environment] do |t, args| - args.with_defaults(file: 'synonyms') - json_input_file = "#{args[:file]}.json" - txt_output_file = "#{args[:file]}.txt" - - file = File.read(Rails.root.join('config','analysis', json_input_file)) - data_hash = JSON.parse(file) - - File.open(Rails.root.join('config', 'analysis', txt_output_file) , "w") do |output| - data_hash.each do | k,v | - syns = v['syns'] - syns.map { |e| e.gsub!(/[,"']/, "") } - output.puts(syns.join(', ')) - end - end - end - - task :to_module, [:file] => [:environment] do |t, args| - args.with_defaults(file: 'synonyms') - json_input_file = "#{args[:file]}.json" - module_output_file = "trial_synonyms.rb" - - file = File.read(Rails.root.join('config','analysis', json_input_file)) - data_hash = JSON.parse(file) - - File.open(Rails.root.join('config', 'analysis', module_output_file) , "w") do |output| - output.puts <<~PREFIX.strip - module Modules - class TrialSynonyms - - def self.as_array - [ - PREFIX - data_hash.each do | k,v | - syns = v['syns'] - syns.map { |e| e.gsub!(/[,"']/, "") } - output.puts('"' + syns.join(', ') + '",' ) - end - output.puts <<~POSTFIX.strip - ] - end - - end - end - POSTFIX - - end - - end - end -end - diff --git a/spec/controllers/admin/trials_controller_spec.rb b/spec/controllers/admin/trials_controller_spec.rb index ce71cc4..fdf6e48 100644 --- a/spec/controllers/admin/trials_controller_spec.rb +++ b/spec/controllers/admin/trials_controller_spec.rb @@ -164,42 +164,6 @@ trial.reload expect( trial.pi_name).to eq('Updated value') end - - # context "given SystemInfo.protect_simple_description is false" do - # it "should successfully update simple_description" do - # create(:system_info, protect_simple_description: false) - # trial = create(:trial, simple_description: "Original Description") - # put :update, params: { id: trial.system_id, trial: { simple_description: "Updated value" }} - # trial.reload - # expect( trial.simple_description).to eq('Updated value') - # end - - # it "should issue HTTP 200 but not update simple_description_override" do - # create(:system_info, protect_simple_description: false) - # trial = create(:trial, simple_description_override: "Original Description") - # put :update, params: { id: trial.system_id, trial: { simple_description_override: "Updated value" }} - # trial.reload - # expect( trial.simple_description_override).to eq('Original Description') - # end - # end - - # context "given SystemInfo.protect_simple_description is true" do - # it "should successfully update simple_description_override" do - # create(:system_info, protect_simple_description: true) - # trial = create(:trial, simple_description_override: "Original Description") - # put :update, params: { id: trial.system_id, trial: { simple_description_override: "Updated value" }} - # trial.reload - # expect( trial.simple_description_override).to eq('Updated value') - # end - - # it "should issue HTTP 200 but not update simple_description" do - # create(:system_info, protect_simple_description: true) - # trial = create(:trial, simple_description: "Original Description") - # put :update, params: { id: trial.system_id, trial: { simple_description: "Updated value" }} - # trial.reload - # expect( trial.simple_description).to eq('Original Description') - # end - # end end describe "GET #all_under_review" do diff --git a/spec/controllers/api/studies_controller_spec.rb b/spec/controllers/api/studies_controller_spec.rb index b290b45..5666fbf 100644 --- a/spec/controllers/api/studies_controller_spec.rb +++ b/spec/controllers/api/studies_controller_spec.rb @@ -91,33 +91,6 @@ end end - it "can returns 400 if a system id is not alphanumeric" do - attributes = { - system_id: " bad id ", - contact_override: "blah@example.com", - contact_override_first_name: "Testy", - contact_override_last_name: "McTesterson", - irb_number: "1234567890", - pi_id: "somepi@example.com", - pi_name: "Some PI, M.D.", - recruiting: true, - simple_description: "This is a short description", - brief_title: "This is a brief title", - official_title: "This is an official title", - visible: true, - eligibility_criteria: "This is eligibility criteria", - min_age_unit: "16 years", - max_age_unit: "99 years", - healthy_volunteers_imported: true, - gender: "Male", - phase: "Phase I" - } - - post :create, params: attributes - - expect(response).to have_http_status(:bad_request) - end - it "can create with conditions" do conditions = ["Something", "Something else"] diff --git a/spec/controllers/researchers_controller_spec.rb b/spec/controllers/researchers_controller_spec.rb index 2eac5a5..93233f1 100644 --- a/spec/controllers/researchers_controller_spec.rb +++ b/spec/controllers/researchers_controller_spec.rb @@ -57,61 +57,24 @@ describe "PUT #update" do it "successfully changes trial attribute" do - create(:system_info, protect_simple_description: false) + create(:system_info) trial = create(:trial, contact_override_last_name: "Test Name") put :update, params: { id: trial.system_id, trial: { contact_override_last_name: "Updated value" }, secret_key: SystemInfo.secret_key} trial.reload expect( trial.contact_override_last_name).to eq('Updated value') end - - # context "given SystemInfo.protect_simple_description is false" do - # it "should successfully update simple_description" do - # create(:system_info, protect_simple_description: false) - # trial = create(:trial, simple_description: "Original Description") - # put :update, params: { id: trial.system_id, trial: { simple_description: "Updated value" }, secret_key: SystemInfo.secret_key} - # trial.reload - # expect( trial.simple_description).to eq('Updated value') - # end - - # it "should issue HTTP 200 but not update simple_description_override" do - # create(:system_info, protect_simple_description: false) - # trial = create(:trial, simple_description_override: "Original Description") - # put :update, params: { id: trial.system_id, trial: { simple_description_override: "Updated value" }, secret_key: SystemInfo.secret_key} - # trial.reload - # expect( trial.simple_description_override).to eq('Original Description') - # end - # end - - # context "given SystemInfo.protect_simple_description is true" do - # it "should successfully update simple_description_override" do - # create(:system_info, protect_simple_description: true) - # trial = create(:trial, simple_description_override: "Original Description") - # put :update, params: { id: trial.system_id, trial: { simple_description_override: "Updated value" }, secret_key: SystemInfo.secret_key} - # trial.reload - # expect( trial.simple_description_override).to eq('Updated value') - # end - - # it "should issue HTTP 200 but not update simple_description" do - # create(:system_info, protect_simple_description: true) - # trial = create(:trial, simple_description: "Original Description") - # put :update, params: { id: trial.system_id, trial: { simple_description: "Updated value" }, secret_key: SystemInfo.secret_key} - # trial.reload - # expect( trial.simple_description).to eq('Original Description') - # end - # end - it "trial with override information" do - create(:system_info, protect_simple_description: false) + create(:system_info) trial = create(:trial, brief_title: 'Testing a title', system_id: 'NCT000001' ) - simple_description = 'Testing adding a simple_description' + simple_description_override = 'Testing adding a simple_description_override' contact_override = 'jim@aol.com' contact_override_first_name = 'Jim' contact_override_last_name = 'Smith' study_finder_trial = { - simple_description: simple_description, + simple_description_override: simple_description_override, contact_override: contact_override, contact_override_first_name: contact_override_first_name, contact_override_last_name: contact_override_last_name @@ -119,7 +82,7 @@ put :update, params: { id: trial.system_id, trial: study_finder_trial, secret_key: SystemInfo.secret_key } - expect( assigns(:trial).simple_description ).to eq(simple_description) + expect( assigns(:trial).simple_description_override).to eq(simple_description_override) expect( assigns(:trial).contact_override ).to eq(contact_override) expect( assigns(:trial).contact_override_first_name ).to eq(contact_override_first_name) expect( assigns(:trial).contact_override_last_name ).to eq(contact_override_last_name) @@ -129,7 +92,7 @@ end it "fails when a secret_key is not provided" do - create(:system_info, protect_simple_description: false) + create(:system_info) trial = create(:trial, brief_title: 'Testing a title', system_id: 'NCT000001') simple_description = 'Testing adding a simple_description' @@ -150,7 +113,7 @@ end it "fails when an invalid secret_key is added" do - create(:system_info, protect_simple_description: false) + create(:system_info) trial = create(:trial, brief_title: 'Testing a title', system_id: 'NCT000001') simple_description = 'Testing adding a simple_description' diff --git a/spec/factories/subgroup.rb b/spec/factories/subgroup.rb new file mode 100644 index 0000000..42b5649 --- /dev/null +++ b/spec/factories/subgroup.rb @@ -0,0 +1,6 @@ +FactoryBot.define do + factory :subgroup do + name { Faker::Adjective.positive} + association :group + end +end diff --git a/spec/factories/trial.rb b/spec/factories/trial.rb index a6685b6..e8a1e6c 100644 --- a/spec/factories/trial.rb +++ b/spec/factories/trial.rb @@ -2,5 +2,8 @@ sequence(:system_id, 10000) { |n| "STUDY#{n}" } factory :trial do system_id { generate(:system_id) } + brief_title { Faker::Lorem.sentence } + approved { true } + visible { true } end end diff --git a/spec/factories/trial_subgroups.rb b/spec/factories/trial_subgroups.rb index bd3aab2..c6dd407 100644 --- a/spec/factories/trial_subgroups.rb +++ b/spec/factories/trial_subgroups.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :trial_subgroup do - subgroup { nil } - trial { nil } + association :subgroup + association :trial end end diff --git a/spec/mailers/study_mailer_spec.rb b/spec/mailers/study_mailer_spec.rb index db4f8da..db30ff0 100644 --- a/spec/mailers/study_mailer_spec.rb +++ b/spec/mailers/study_mailer_spec.rb @@ -24,12 +24,15 @@ contact_email_suffix: '@umn.edu' ) + @to_address = Faker::Internet.email + @phone_number = Faker::PhoneNumber.phone_number + @mail = StudyMailer.contact_team( - 'jim@aol.com', - 'Jason Kadrmas', - 'kadrm002@umn.edu', - '123-453-2345', - 'This is a test', + @to_address, + Faker::Name.name, + Faker::Internet.email, + @phone_number, + Faker::GreekPhilosophers.quote, @trial.system_id, @trial.brief_title, @system_info) @@ -40,7 +43,7 @@ end it 'renders the reciever email' do - expect( @mail.to[0] ).to eq('jim@aol.com') + expect( @mail.to[0] ).to eq(@to_address) end it 'assigns @title in the mail body' do @@ -48,7 +51,7 @@ end it "includes phone number" do - expect(@mail.body).to match("123-453-2345") + expect(@mail.body.raw_source).to match(@phone_number) end after { diff --git a/spec/models/trial_spec.rb b/spec/models/trial_spec.rb index 3ac2def..6a8b781 100644 --- a/spec/models/trial_spec.rb +++ b/spec/models/trial_spec.rb @@ -36,6 +36,21 @@ t = build(:trial, brief_title: "", acronym: "TT") expect(t.display_title).to eq(nil) end + end + + context "when rendering simple_description" do + context "if simple_description is non-nil and simple_description_override is nil" do + it "returns simple_description_from_source" do + t = build(:trial, simple_description: "Test description", simple_description_override: nil) + expect(t.simple_description).to eq(t.simple_description_from_source) + end + end + context "if simple_description is non-nil and simple_description_override is non-nil" do + it "returns simple_description_override" do + t = build(:trial, simple_description: "Test description", simple_description_override: "Override description") + expect(t.simple_description).to eq(t.simple_description_override) + end + end end @@ -109,16 +124,6 @@ def display_title expect(build(:trial, system_id: "nct123").has_nct_number?).to be true end - it "sorts search results by added_on date" do - create(:trial, added_on: 5.days.ago, visible: true) - create(:trial, added_on: 2.months.ago, visible: true) - create(:trial, added_on: 1.day.ago, visible: true) - - result_dates = Trial.execute_search({q: ""}).results.map(&:added_on) - - expect(result_dates).to eq(result_dates.sort.reverse) - end - it "validates the presence of a system_id" do no_system_id = build(:trial, system_id: "") expect(no_system_id).not_to be_valid @@ -132,24 +137,6 @@ def display_title expect(duplicated_system_id.errors[:system_id]).to include('has already been taken') end - it "does not allow non-alphanumeric white space character to be present for system_id" do - white_space_system_id = Trial.new(system_id: "123abc ") - expect(white_space_system_id).not_to be_valid - expect(white_space_system_id.errors[:system_id]).to eq(['only allows alphanumeric characters']) - end - - it "does not allow non-alphanumeric tab character to be present for system_id" do - white_space_system_id = Trial.new(system_id: "123abc\t") - expect(white_space_system_id).not_to be_valid - expect(white_space_system_id.errors[:system_id]).to eq(['only allows alphanumeric characters']) - end - - it "does not allow non-alphanumeric white space comma character to be present for system_id" do - white_space_system_id = Trial.new(system_id: "123abc, something else ") - expect(white_space_system_id).not_to be_valid - expect(white_space_system_id.errors[:system_id]).to eq(['only allows alphanumeric characters']) - end - it "returns the float 0.0 when minimum_age is N/A" do age_value = 'N/A' trial_with_age = Trial.new(minimum_age: age_value) @@ -189,14 +176,16 @@ def display_title it 'returns only records less than 18 for maximum age' do Trial.__elasticsearch__.delete_index! - Trial.create(system_id: "123", maximum_age: "17", visible: true, approved: true) - Trial.create(system_id: "456", maximum_age: "18", visible: true, approved: true) - Trial.create(system_id: "789", maximum_age: "N/A", visible: true, approved: true) - Trial.create(system_id: "011", maximum_age: nil, visible: true, approved: true) + Trial.create(system_id: "123", minimum_age: nil, maximum_age: "17", visible: true, approved: true) + Trial.create(system_id: "as7f6", minimum_age: nil, maximum_age: "18", visible: true, approved: true) + Trial.create(system_id: "dsfg89", minimum_age: "17", maximum_age: "25", visible: true, approved: true) + Trial.create(system_id: "jh987", minimum_age: "18", maximum_age: "30", visible: true, approved: true) + Trial.create(system_id: "789", minimum_age: "18", maximum_age: "N/A", visible: true, approved: true) + Trial.create(system_id: "011", minimum_age: "18", maximum_age: nil, visible: true, approved: true) Trial.__elasticsearch__.refresh_index! search_results = Trial.execute_search({"q"=> "", "children"=> ""}).results.map(&:max_age) - expect(search_results.count).to eq(1) - expect(search_results).to eq([17.0]) + expect(search_results.count).to eq(3) + expect(search_results.sort).to eq([17.0,18.0,25.0]) end it 'returns only records greater than or equal to 18' do @@ -206,10 +195,39 @@ def display_title Trial.create(system_id: "789", maximum_age: "N/A", visible: true, approved: true) Trial.create(system_id: "011", maximum_age: nil, visible: true, approved: true) Trial.__elasticsearch__.refresh_index! + search_results = Trial.execute_search("q"=> "", "adults"=> "1").results.map(&:max_age) expect(search_results.count).to eq(3) expect(search_results).to include(1000.0, 1000.0, 18.0) end + context "Given trials and subgroups bridged by TrialSubgroups" do + it "will return correct search results with a subgroup param" do + # Create a set of trials, a set of groups, and then two subgroups for each group. + # Then use Array.sample to pseudo-randomly assign 1 to 3 trials to each subgroup. + # Like real life, this also allows for a trial to belong to more than one subgroup. + Trial.__elasticsearch__.delete_index! + trials = create_list(:trial, 100) + groups = create_list(:group, 3) + subgroups = Array.new + groups.map { |e| subgroups.push(*create_list(:subgroup, 2, group: e)) } + + subgroups.each_with_index do |sg, idx| + trials.sample([1,2,3].sample(1).first).map { |e| e.trial_subgroups.create(subgroup: sg) } + end + + Trial.import(refresh: true, force: true) + + subgroups.each do |sg| + search_results = Trial.execute_search("subcat" => "#{sg.id}").results.map(&:subcategory_ids) + expect(search_results.count).to eq(TrialSubgroup.where(subgroup: sg).count) + # Each trial's subcategory_ids is an array of ids, so search results is an array of arrays. + # Ensure each component array includes the subgoup id we're searching on. + search_results.each do |r| + expect(r).to include(sg.id) + end + end + end + end end diff --git a/spec/models/trial_subgroup_spec.rb b/spec/models/trial_subgroup_spec.rb index 4615c63..b3fdb57 100644 --- a/spec/models/trial_subgroup_spec.rb +++ b/spec/models/trial_subgroup_spec.rb @@ -1,5 +1,6 @@ require 'rails_helper' RSpec.describe TrialSubgroup, type: :model do - pending "add some examples to (or delete) #{__FILE__}" + # No tests here. We're only using basic ActiveRecord things with this, *except* elasticsearch + # and that functionality is tested via Trial.execute_search. end diff --git a/vendor/assets/stylesheets/font-awesome.min.css b/vendor/assets/stylesheets/font-awesome.min.css deleted file mode 100644 index 8aa7efc..0000000 --- a/vendor/assets/stylesheets/font-awesome.min.css +++ /dev/null @@ -1,4 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../assets/fontawesome-webfont.eot?v=4.2.0');src:url('../assets/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'),url('../assets/fontawesome-webfont.woff?v=4.2.0') format('woff'),url('../assets/fontawesome-webfont.ttf?v=4.2.0') format('truetype'),url('../assets/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.float-right{float:right}.float-left{float:left}.fa.float-left{margin-right:.3em}.fa.float-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-circle-question:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"} \ No newline at end of file