From 3d82644a477509fd5b61799e8def68590c87d13c Mon Sep 17 00:00:00 2001
From: Mark Williams <mark.williams@diamond.ac.uk>
Date: Thu, 1 Feb 2024 13:49:04 +0000
Subject: [PATCH] LIMS-904: Improve help text for internal transfer requests

---
 api/assets/emails/html/dewar-transfer.html     |  7 +------
 api/assets/emails/html/storage-rack.html       |  2 +-
 client/src/js/templates/shipment/transfer.html | 10 +---------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/api/assets/emails/html/dewar-transfer.html b/api/assets/emails/html/dewar-transfer.html
index 7be5954c1..7ba4c8253 100644
--- a/api/assets/emails/html/dewar-transfer.html
+++ b/api/assets/emails/html/dewar-transfer.html
@@ -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%">
@@ -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>
diff --git a/api/assets/emails/html/storage-rack.html b/api/assets/emails/html/storage-rack.html
index 7cc5800df..8cd98b031 100644
--- a/api/assets/emails/html/storage-rack.html
+++ b/api/assets/emails/html/storage-rack.html
@@ -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>
 
diff --git a/client/src/js/templates/shipment/transfer.html b/client/src/js/templates/shipment/transfer.html
index 3c603889a..ac37a96fc 100644
--- a/client/src/js/templates/shipment/transfer.html
+++ b/client/src/js/templates/shipment/transfer.html
@@ -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">Select "-" to return the dewar to the responsive scheduling queue</span>
                 </label>
                 <select name="NEXTVISIT"></select>
             </li>
@@ -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>