Skip to content

Commit

Permalink
LIMS-904: Improve help text for internal transfer requests (#722)
Browse files Browse the repository at this point in the history
* LIMS-904: Improve help text for internal transfer requests

* LIMS-904: Improve wording

---------

Co-authored-by: Mark Williams <[email protected]>
  • Loading branch information
ndg63276 and Mark Williams authored Feb 6, 2024
1 parent b7f98d6 commit 0540533
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 16 deletions.
7 changes: 1 addition & 6 deletions api/assets/emails/html/dewar-transfer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ <h1 style="font-size: 16px; font-weight: normal; border-bottom: 1px solid #000;

<div class="inset" style="margin: 1%; padding: 1%; margin-bottom: 2%; border-radius: 5px; background: #82d180">
<h2>Local Contact: <?php echo $data['LOCALCONTACT'] ?> <?php echo $data['LCEMAIL'] ?></h2>
<p><?php echo $data['GIVENNAME'] ?> <?php echo $data['FAMILYNAME'] ?> from visit <?php echo $data['VISIT'] ?> requested an internal transfer for his/her dewar(s). Please print this e-mail and affix it on the shipping case.</p>
<p><?php echo $data['GIVENNAME'] ?> <?php echo $data['FAMILYNAME'] ?> from visit <?php echo $data['VISIT'] ?> requested an internal transfer for his/her dewar(s).</p>
</div>

<table class="details" style="background: #f4f4f4; margin: 1%">
Expand Down Expand Up @@ -53,10 +53,5 @@ <h2>Local Contact: <?php echo $data['LOCALCONTACT'] ?> <?php echo $data['LCEMAIL
<td style="padding: 1.5%; font-weight: bold">Lab / Company Name</td>
<td><?php echo $data['LABNAME'] ?></td>
</tr>

<tr>
<td style="padding: 1.5%; font-weight: bold">Comments</td>
<td><?php echo nl2br($data['COMMENTS']) ?></td>
</tr>
</tbody>
</table>
2 changes: 1 addition & 1 deletion api/assets/emails/html/storage-rack.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2>Dear <?php echo $data['LCRET'] ?></h2>
</ul>
<?php } ?>
<p>Please either fill out the dewar dispatch form if you would like your dewar to be returned to you:<br /><a href="https://ispyb.diamond.ac.uk/dewars/dispatch/<?php echo $data['DEWARID'] ?>">https://ispyb.diamond.ac.uk/dewars/dispatch/<?php echo $data['DEWARID'] ?></a></p>
<p>Or fill out the dewar transfer form if you would like it to be transferred to another beamline for another visit:<br /><a href="https://ispyb.diamond.ac.uk/dewars/transfer/<?php echo $data['DEWARID'] ?>">https://ispyb.diamond.ac.uk/dewars/transfer/<?php echo $data['DEWARID'] ?></a></p>
<p>Or fill out the dewar transfer form if you require more data collection time:<br /><a href="https://ispyb.diamond.ac.uk/dewars/transfer/<?php echo $data['DEWARID'] ?>">https://ispyb.diamond.ac.uk/dewars/transfer/<?php echo $data['DEWARID'] ?></a></p>
<p>Your dewar will be topped up with liquid nitrogen in the meantime.</p>
</div>

Expand Down
10 changes: 1 addition & 9 deletions client/src/js/templates/shipment/transfer.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ <h1>Request Internal Dewar Transfer</h1>
<li class="head">Next Visit Details</li>
<li>
<label>Next Visit
<span class="small">The next visit the dewar is going to be used for</span>
<span class="small">Leave blank to return the dewar to the responsive scheduling queue</span>
</label>
<select name="NEXTVISIT"></select>
</li>
Expand All @@ -100,14 +100,6 @@ <h1>Request Internal Dewar Transfer</h1>
<input type="text" name="NEXTLOCATION" />
</li>


<li>
<label>Comments
<span class="small">Comment for the shipment</span>
</label>
<textarea name="COMMENTS"></textarea>
</li>

<button name="submit" value="1" type="submit" class="button submit">Request Dewar Transfer</button>


Expand Down

0 comments on commit 0540533

Please sign in to comment.