-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into develop-Y24-190
- Loading branch information
Showing
23 changed files
with
254 additions
and
81 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
3.56.0 | ||
3.56.1 |
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
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
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
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
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
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
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
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
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
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
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
29 changes: 29 additions & 0 deletions
29
app/models/presenters/pcr_with_primer_panel_plate_presenter.rb
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# frozen_string_literal: true | ||
|
||
module Presenters | ||
# This Presenter shows the PCR primer panel on the left along with the standard plate layout | ||
# view and summary information. This version allows you to fail wells on the plate. | ||
# | ||
# This was specifically requested by the lab team for the GBS pipleine PCR1 plate so they | ||
# could fail wells. If well failing functionality was allowed on stock plates in future, that would be a | ||
# preferable option for them and they could fail the wells on the parent plate, and the PCR1 plate could | ||
# be returned to using the MinimalPcrPlatePresenter. | ||
class PcrWithPrimerPanelPlatePresenter < StandardPresenter | ||
include HasPrimerPanel | ||
self.summary_partial = 'labware/plates/pcr_with_primer_panel_summary' | ||
self.state_transition_name_scope = :pcr | ||
|
||
# Initializes `summary_items` with a hash mapping display names to their corresponding plate attributes. | ||
# Used by the summary panel to display information about the plate in the GUI. | ||
self.summary_items = { | ||
'Barcode' => :barcode, | ||
'Number of wells' => :number_of_wells, | ||
'Plate type' => :purpose_name, | ||
'Primer panel' => :panel_name, | ||
'Current plate state' => :state, | ||
'Input plate barcode' => :input_barcode, | ||
'PCR Cycles' => :requested_pcr_cycles, | ||
'Created on' => :created_on | ||
} | ||
end | ||
end |
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
9 changes: 9 additions & 0 deletions
9
app/views/labware/plates/_pcr_with_primer_panel_summary.html.erb
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<div id="labware-summary-div" class="card-body text-white bg-info"> | ||
<dl> | ||
<dt>Primer Panel</dt><dd><%= presenter.panel_name %></dd> | ||
<dt>PCR Program</dt><dd><%= presenter.pcr_program %></dd> | ||
<dt>PCR Duration</dt><dd><%= presenter.pcr_duration %></dd> | ||
</dl> | ||
</div> | ||
|
||
<%= render partial: 'labware/plates/standard_summary', locals: { presenter: presenter } %> |
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
Oops, something went wrong.