From 8f5b89506fbc7470facd5e2579263f51abf3d817 Mon Sep 17 00:00:00 2001
From: Mark Williams <mark.williams@diamond.ac.uk>
Date: Wed, 11 Dec 2024 10:15:51 +0000
Subject: [PATCH] LIMS-867: Improve 'Add Lab Contact' page

---
 .../src/js/modules/contact/views/addcontact.js  | 17 +++++++++++++++++
 client/src/js/templates/contact/contactadd.html | 11 +++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/client/src/js/modules/contact/views/addcontact.js b/client/src/js/modules/contact/views/addcontact.js
index 45f61414a..25eca2a5d 100644
--- a/client/src/js/modules/contact/views/addcontact.js
+++ b/client/src/js/modules/contact/views/addcontact.js
@@ -28,10 +28,24 @@ define(['views/form',
             ad: 'textarea[name=ADDRESS]',
             ci: 'input[name=CITY]',
             pc: 'input[name=POSTCODE]',
+            lb: '.leaveblank',
         },
 
         events: {
             'change @ui.pid': 'fillUserInfo',
+            'change @ui.country': 'onCountryChange',
+        },
+
+        onCountryChange: function() {
+            let country = this.ui.country.val()
+            if (
+                app.options.get('facility_courier_countries').indexOf(country) > -1 ||
+                app.options.get('facility_courier_countries_nde').indexOf(country) > -1
+            ) {
+                this.ui.lb.html('<br />Academic users from '+country+' can leave this blank to use the facility courier.')
+            } else {
+                this.ui.lb.html('')
+            }
         },
 
         fillUserInfo: function() {
@@ -65,7 +79,10 @@ define(['views/form',
             Promise.all([this.countries.fetch(), this.users.fetch()]).then(() => {
                 this.populateCountries();
                 this.populateUsers();
+                this.onCountryChange();
             })
+            this.ui.ad.css('height', '100px')
+            this.ui.ad.css('width', '50%')
         },
 
         populateCountries: function() {
diff --git a/client/src/js/templates/contact/contactadd.html b/client/src/js/templates/contact/contactadd.html
index 6aee6dc98..217b2d4d3 100644
--- a/client/src/js/templates/contact/contactadd.html
+++ b/client/src/js/templates/contact/contactadd.html
@@ -10,7 +10,7 @@ <h1>Add New Home Lab Contact</h1>
 
             <li>
                 <label>Card Name
-                    <span class="small">Name for the Contact Card</span>
+                    <span class="small">Choose a name you will recognise from a list</span>
                 </label>
                 <input type="text" name="CARDNAME" />
             </li>
@@ -37,7 +37,9 @@ <h1>Add New Home Lab Contact</h1>
             </li>
 
             <li>
-                <label>Telephone Number</label>
+                <label>Telephone Number
+                    <span class="small">You can add more than one number separated by a space</span>
+                </label>
                 <input type="text" name="PHONENUMBER" />
             </li>
 
@@ -58,7 +60,7 @@ <h1>Add New Home Lab Contact</h1>
 
             <li>
                 <label>Street Address
-                    <span class="small">Address for courier <br/>Exclude post code and city</span>
+                    <span class="small">Pickup/delivery address for couriers <br/>Exclude city and postcode <br />Max 3 lines</span>
                 </label>
                 <textarea name="ADDRESS"></textarea>
             </li>
@@ -80,7 +82,8 @@ <h1>Add New Home Lab Contact</h1>
 
             <li class="head">
                 <label>Dewar Return Details
-                    <span class="small">The following information is used for each shipment associated with this contact</span>
+                    <span class="small">The following information is used for each shipment associated with this contact.
+                    <span class="leaveblank"></span></span>
                 </label>
             </li>