Add laboratory location to instruments pages. #653
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
marked this pull request as ready for review
nerdstrike
requested changes
Jan 5, 2022
nerdstrike
requested changes
Jan 10, 2022
lib/npg/model/instrument_format.pm
Outdated
|
|
||
| if(!$self->{'current_instruments'}) { | ||
| my $pkg = 'npg::model::instrument'; | ||
| my $query = qq(SELECT @{[join q(, ), $pkg->fields()]} |
There was a problem hiding this comment.
I'm pretty sure this query belongs in npg::model::instrument. Defer to @mgcam on whether it's worth sorting out all this query copy-pasting that predates this PR. I'd favour npg::model::instrument($instrument_format, $lab) function with SQL construction based on arguments, unless there's something better in the base package.
There was a problem hiding this comment.
I agree. Let's leave this till the very end and assess then. Not sure how much code will need refactoring.
Softer colours are used. Following user evaluation, lab legend is added to the instrument status legend. Code refactored to create a more direct mapping of lab locations to colours and to create a single point for lab names listing.
Refactored the code to remove code repetition as requested by the reviewer. Made the code testable and added unit tests for the new functionality.
nerdstrike
approved these changes
Jan 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add:
Resolves: #634