Skip to content

Commit

Permalink
LIMS-1185: Fix incorrect total dose displayed
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Williams committed Jan 26, 2024
1 parent 1d10ac9 commit de897ec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion api/src/Page/DC.php
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ function _data_collections($single = null)

// Data collections
if ($dc['TYPE'] == 'data') {
$nf = array(1 => array('AXISSTART'), 2 => array('RESOLUTION', 'TRANSMISSION', 'AXISRANGE'), 4 => array('WAVELENGTH', 'EXPOSURETIME'));
$nf = array(1 => array('AXISSTART'), 2 => array('RESOLUTION', 'TRANSMISSION', 'AXISRANGE', 'TOTALDOSE'), 4 => array('WAVELENGTH', 'EXPOSURETIME'));

$dc['DIRFULL'] = $dc['DIR'];
$dc['DIR'] = preg_replace('/.*\/' . $this->arg('prop') . '-' . $dc['VN'] . '\//', '', $dc['DIR']);
Expand Down
2 changes: 1 addition & 1 deletion client/src/js/templates/dc/dc.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1 class="title"></h1>
<% if (DCT == 'SAD' || DCT == 'OSC' || DCT == 'Diamond Anvil High Pressure') { %>
<%if (TOTALABSDOSE) { %>
<%if (DCC > 1) { %>
<li data-testid="dc-dose">Total Dose: <%-TOTALABSDOSE * DCC%>MGy</li>
<li data-testid="dc-dose">Total Dose: <%-TOTALDOSE%>MGy</li>
<% } else { %>
<li data-testid="dc-dose">Dose: <%-TOTALABSDOSE%>MGy</li>
<% } } }%>
Expand Down

0 comments on commit de897ec

Please sign in to comment.