Skip to content

Commit

Permalink
Merge 63b0c57 into a7466d8
Browse files Browse the repository at this point in the history
  • Loading branch information
bmorri3 committed Mar 25, 2024
2 parents a7466d8 + 63b0c57 commit 5c786ad
Show file tree
Hide file tree
Showing 5 changed files with 526 additions and 239 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,9 @@ pg_data
.ruby-version
mysql2psql.yml
*.pem
t.csv
t.csv

# Output for answer_tags_controller_spec.rb
answer_tags_controller_rspec_output.txt
# Output for tag_prompt_deployment_spec.rb
tag_prompt_deployment_spec_output.txt
3 changes: 2 additions & 1 deletion app/models/tag_prompt_deployment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ def get_number_of_taggable_answers(user_id)

answers = Answer.where(question_id: questions_ids, response_id: responses_ids)

answers = answers.where(conditions: "length(comments) < #{answer_length_threshold}") unless answer_length_threshold.nil?
# answers = answers.where(conditions: "length(comments) < #{answer_length_threshold}") unless answer_length_threshold.nil?
answers = answers.where(conditions: "length(comments) < #{self.answer_length_threshold}" ) unless self.answer_length_threshold.nil?
return answers.count
end
0
Expand Down
2 changes: 1 addition & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@
t.float "Hamer", limit: 24, default: 1.0
t.float "Lauw", limit: 24, default: 0.0
t.integer "duty_id"
t.boolean "can_mentor"
t.boolean "can_mentor", default: false
t.index ["duty_id"], name: "index_participants_on_duty_id"
t.index ["user_id"], name: "fk_participant_users"
end
Expand Down
Loading

0 comments on commit 5c786ad

Please sign in to comment.