Skip to content
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

Jump to bottom

Djhoward12 naaps 10 app rackgroup assignment #96

Merged
merged 15 commits into from
Jul 10, 2024
Merged

Djhoward12 naaps 10 app rackgroup assignment #96

merged 15 commits into from
Jul 10, 2024

Conversation

djhoward12
Copy link
Collaborator

@djhoward12 djhoward12 commented Jun 25, 2024 •
edited by joewesch
Loading

Added the ability to assign RackGroups and Status tiles to span multiple spaces and place a Rack tile on top of a group of tiles.

Closes: #10

@djhoward12 djhoward12 marked this pull request as draft June 25, 2024 18:54
@djhoward12 djhoward12 marked this pull request as ready for review June 25, 2024 18:54
glennmatthews
glennmatthews reviewed Jun 25, 2024
View reviewed changes
Copy link
Collaborator

@glennmatthews glennmatthews left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good stuff!

nautobot_floor_plan/choices.py Outdated Show resolved Hide resolved
nautobot_floor_plan/migrations/0005_auto_20240621_1852.py Outdated Show resolved Hide resolved
nautobot_floor_plan/models.py Outdated Show resolved Hide resolved
nautobot_floor_plan/models.py Show resolved Hide resolved
nautobot_floor_plan/models.py Outdated Show resolved Hide resolved
nautobot_floor_plan/svg.py Outdated Show resolved Hide resolved
nautobot_floor_plan/svg.py Outdated Show resolved Hide resolved
nautobot_floor_plan/svg.py Outdated Show resolved Hide resolved
nautobot_floor_plan/tests/test_api_views.py Outdated Show resolved Hide resolved
nautobot_floor_plan/tests/test_models.py Show resolved Hide resolved
@joewesch
Copy link
Contributor

So when you have a Floor Tile "group" that is bigger than a rack within that group (left side of first image) it makes sense to have an edit for both the rack tile and the group tile. However, if the tile takes up the same spaces (right side of first image and second image) then can we hide one of the sets of Edit/Delete buttons since they seem to take you to the same form/page?

Screenshot 2024-06-26 at 3 28 55 PM
Screenshot 2024-06-26 at 3 31 16 PM

Addressing comments from initial PR. Removing edit and delete buttons…
9dca8d6 
… for single rack tiles that are not on group tiles. Removing status box from rack tiles that are on group tiles.
@djhoward12
Copy link
Collaborator Author

So when you have a Floor Tile "group" that is bigger than a rack within that group (left side of first image) it makes sense to have an edit for both the rack tile and the group tile. However, if the tile takes up the same spaces (right side of first image and second image) then can we hide one of the sets of Edit/Delete buttons since they seem to take you to the same form/page?

Screenshot 2024-06-26 at 3 28 55 PM Screenshot 2024-06-26 at 3 31 16 PM

This has been resolved with the latest update.

Added the ability to ignore the rack_group form field assignment for …
7e32cfc 
…a rack if the rack.rack_group is the same as the underlying rack_group assigned to the group tile.
@djhoward12 djhoward12 marked this pull request as draft June 28, 2024 12:48
Fixed a bug that allowed rackgroup tiles to overlay racks that were n…
0152a7d 
…ot in the correct rack group. Working on rendering of tiles still.
@djhoward12 @joewesch
Update nautobot_floor_plan/forms.py
36a84a0 
Filter rackgroup field to only display the rackgroup the rack is in.

Co-authored-by: Joe Wesch <10467633+joewesch@users.noreply.github.com>
@djhoward12 djhoward12 marked this pull request as ready for review June 28, 2024 21:16
@djhoward12 @joewesch
Update nautobot_floor_plan/templates/nautobot_floor_plan/floorplantil…
baea29c 
…e_retrieve.html

Co-authored-by: Joe Wesch <10467633+joewesch@users.noreply.github.com>
joewesch
joewesch approved these changes Jul 2, 2024
View reviewed changes
Copy link
Contributor

@joewesch joewesch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Thanks for all your work @djhoward12.

@joewesch joewesch requested a review from glennmatthews July 3, 2024 13:40
glennmatthews
glennmatthews approved these changes Jul 10, 2024
View reviewed changes
docs/user/app_getting_started.md Outdated Show resolved Hide resolved
nautobot_floor_plan/models.py Show resolved Hide resolved
nautobot_floor_plan/models.py Outdated Show resolved Hide resolved
nautobot_floor_plan/models.py Outdated Show resolved Hide resolved
nautobot_floor_plan/templates/nautobot_floor_plan/floorplantile_retrieve.html Outdated Show resolved Hide resolved
nautobot_floor_plan/templates/nautobot_floor_plan/floorplantile_retrieve.html Outdated Show resolved Hide resolved
nautobot_floor_plan/choices.py Outdated Show resolved Hide resolved
djhoward12 and others added 5 commits July 10, 2024 17:12
@djhoward12 @glennmatthews
Update docs/user/app_getting_started.md
fdd0d3f 
Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
@djhoward12 @glennmatthews
Update nautobot_floor_plan/models.py
ac5698b 
Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
@djhoward12 @glennmatthews
Update nautobot_floor_plan/choices.py
28257ea 
Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
@djhoward12 @glennmatthews
Update nautobot_floor_plan/templates/nautobot_floor_plan/floorplantil…
0c02ec7 
…e_retrieve.html

Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
updated ruff to use output_format full, added help_text to allocation…
8d7266e 
…_type and on_group_tile fields in models.py. Removed null=True for on_group_tile, and changed Tile Type to Allocation type on floorplantile_retrieve.html
@joewesch joewesch merged commit fec12a1 into nautobot:develop Jul 10, 2024
16 checks passed
@djhoward12 djhoward12 deleted the djhoward12-naaps-10-app-rackgroup-assignment branch July 11, 2024 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joewesch joewesch joewesch approved these changes

@glennmatthews glennmatthews glennmatthews approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Assign RackGroups to a range of coordinates
3 participants
@djhoward12 @joewesch @glennmatthews