Skip to content

LIMS-2387: Add units to molecular mass field #1095

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

Merged
ndg63276 merged 1 commit into from
Oct 6, 2026
Merged

LIMS-2387: Add units to molecular mass field #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 api/src/Page/Proposal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ function _get_visits($visit = null, $output = true)
}

if ($this->has_arg('cm')) {
$where .= " AND p.proposalcode LIKE :" . (sizeof($args) + 1) . " AND s.startdate <= SYSDATE";
$where .= " AND p.proposalcode LIKE :" . (sizeof($args) + 1) . " AND s.startdate <= SYSDATE AND s.enddate >= SYSDATE";
array_push($args, $commissioning_code);
}

Expand Down
7 changes: 6 additions & 1 deletion client/src/css/partials/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ div.form {
float: left;
display: block;
font-size: 12px;


span.label {
display: block;
width: 100%;
}

span.small {
display: block;
font-size: 10px;
Expand Down
7 changes: 5 additions & 2 deletions client/src/js/templates/samples/protein.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ <h1 data-testid="protein-header">View Protein</h1>
<span class="label">Acronym</span>
<span data-testid="protein-acronym" class="ACRONYM"><%-ACRONYM%></span>
</li>

<li>
<span class="label">Molecular Mass</span>
<label>
<span class="label">Molecular Mass (Da)</span>
<span class="small">This may be used for dose calculations on some beamlines</span>
</label>
<span data-testid="protein-molecular-mass" class="MOLECULARMASS"><%-MOLECULARMASS%></span>
</li>

Expand Down
Loading