-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
Y24-099 plate split to racks #2028
Changes from 9 commits
b581f0d
b84e321
909255e
85b10fd
b8bc954
3f85856
ae959c0
2fa7b50
b394822
f64c55b
eb600c6
e29762a
4e5b29c
f2bf2d4
5708619
e934d73
bdd0c77
f414945
2c74086
715c7ea
456d986
c5bb206
4a329b2
f4eca57
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,6 +53,7 @@ def jumbotron(jumbotron_id = nil, options = {}, &) | |
# eg. state_badge('pending') | ||
# <span class="state-badge-pending">Pending</span> | ||
def state_badge(state) | ||
return if state.blank? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What happens if this returns There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This was temporary to get past the fact that the tube rack didn't have a state. And yes it doesn't show the state badge on the page. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can be removed once state for TubeRacks is fixed by another story. |
||
tag.span(state.titleize, class: "state-badge #{state}", title: 'Labware State', data: { toggle: 'tooltip' }) | ||
end | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,10 @@ def compatible_tube_purposes | |
construct_buttons(purposes_of_type('tube')) | ||
end | ||
|
||
def compatible_tube_rack_purposes | ||
construct_buttons(purposes_of_type('tube_rack')) | ||
end | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Feels like this wants to be refactored to:
But again, maybe we can save up refactoring ideas for another story to try to draw a line under this story! Will keep commenting them if I notice and we can decide what to do. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah. I think this is building the 'other actions' grey buttons. That could do with some better ordering/structuring in any case. |
||
private | ||
|
||
# Eventually this will end up on our labware_creators/creations module | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like some of this stuff could just be generic, like
.create-labware-button
orparams[:limber_labware_id]
in the above file. Let's not add refactoring to the scope of the story though!There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree, assuming the buttons don't have to have different text or some other difference.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Plus the suggested action Add button now looks like 'Add tube_rack' with an underscore which looks odd (works for tube and plate as they are single word classes).