Skip to content

186 scraping room fix #280

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

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

186 scraping room fix #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a74731
fix scraping rooms for people
leanmas Feb 15, 2022
023ae1e
Merge dev into 186-scraping-room-fix
leanmas Feb 15, 2022
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: 1 addition & 1 deletion app/models/room.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Room < SearchableRecord
has_and_belongs_to_many :tags
has_many :people, dependent: :nullify
has_many :courses, dependent: :nullify
belongs_to :floor
belongs_to :floor, optional: true
belongs_to :outer_shape, class_name: 'Polyline'
has_and_belongs_to_many :walls
has_and_belongs_to_many :points
Expand Down
8 changes: 5 additions & 3 deletions app/views/rooms/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
<div class='col-3'>
floor
</div>
<div class='col'>
<%= @room.floor.name %>
</div>
<% if @room.floor.present? %>
<div class='col'>
<%= @room.floor.name %>
</div>
<% end %>
</div>
<% if @room.chairs.present? %>
<div class='row'>
Expand Down
2 changes: 1 addition & 1 deletion db/schema.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions lib/scraping/scraper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def self.build_info_if_not_exists(person, item, key, problem_checker)

# Save room on person
def self.add_room(person, room, problem_checker)
room = Room.find_or_create_by(number: room)
person.room = room unless problem_checker.check_for_conflict(person, "room")
room_obj = Room.find_or_create_by(full_name: room)
person.room = room_obj unless problem_checker.check_for_conflict(person, "room_id")
end
end