From 689f17592b5a6d405b75c39f55f201ec252e49c4 Mon Sep 17 00:00:00 2001
From: Saagar Arya <saagar.arya@mcin.ca>
Date: Fri, 2 Feb 2024 10:57:42 -0500
Subject: [PATCH 1/7] [Instrument List] Refresh on Stage Update

---
 .../instrument_list_controlpanel.tpl          | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/modules/instrument_list/templates/instrument_list_controlpanel.tpl b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
index 9f459ce74d2..c4d9229a022 100644
--- a/modules/instrument_list/templates/instrument_list_controlpanel.tpl
+++ b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
@@ -16,13 +16,13 @@
 		{section name=item loop=$status}
 		<li>
 			{if $access.status and $status[item].showlink|default}
-                        	<span class="fa-li"><i class="{$status[item].icon|default:'far fa-square'}"></i></span><a href="?candID={$candID}&sessionID={$sessionID}&setStageUpdate={$status[item].label}">{$status[item].label}</a>
+				{assign var="onclickValue" value="{$status[item].label}"}
+                <span class="fa-li"><i class="{$status[item].icon|default:'far fa-square'}"></i></span><a onclick="setStageAndUpdate('{$onclickValue}')">{$status[item].label}</a>
 			{else}
-                        	<span class="fa-li"><i class="{$status[item].icon|default:'far fa-square'}"></i></span>{$status[item].label}
+                <span class="fa-li"><i class="{$status[item].icon|default:'far fa-square'}"></i></span>{$status[item].label}
 			{/if}
 		</li>
 		{/section}
-
 	</ul>
 
 	<h3 class="controlPanelSection">Send Time Point</h3>
@@ -90,3 +90,23 @@
 			{/if}
 		</li>
 	</ul>
+
+<script>
+	function setStageAndUpdate(stageLabel) {
+		// Make an AJAX request to the endpoint
+		var xhr = new XMLHttpRequest();
+		xhr.open('GET', '?candID={$candID}&sessionID={$sessionID}&setStageUpdate=' + encodeURIComponent(stageLabel), true);
+
+		xhr.onload = function () {
+			if (xhr.status >= 200 && xhr.status < 300) {
+				console.log('Request successful');
+				window.location.reload(true);
+			} else {
+				// Request failed, handle errors if needed
+				console.error('Request failed with status ' + xhr.status);
+			}
+		};
+
+		xhr.send();
+	}
+</script>
\ No newline at end of file

From 370f60771b77d9c3656d8119e36cfe3749a1e193 Mon Sep 17 00:00:00 2001
From: Saagar Arya <51128536+skarya22@users.noreply.github.com>
Date: Mon, 5 Feb 2024 10:20:19 -0500
Subject: [PATCH 2/7] Change cursor to pointer

---
 .../templates/instrument_list_controlpanel.tpl         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/instrument_list/templates/instrument_list_controlpanel.tpl b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
index c4d9229a022..7a6a1663251 100644
--- a/modules/instrument_list/templates/instrument_list_controlpanel.tpl
+++ b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
@@ -17,7 +17,15 @@
 		<li>
 			{if $access.status and $status[item].showlink|default}
 				{assign var="onclickValue" value="{$status[item].label}"}
-                <span class="fa-li"><i class="{$status[item].icon|default:'far fa-square'}"></i></span><a onclick="setStageAndUpdate('{$onclickValue}')">{$status[item].label}</a>
+                <span class="fa-li">
+					<i class="{$status[item].icon|default:'far fa-square'}"></i>
+				</span>
+				<a
+					onclick="setStageAndUpdate('{$onclickValue}')"
+					style="cursor: pointer;"
+				>
+					{$status[item].label}
+				</a>
 			{else}
                 <span class="fa-li"><i class="{$status[item].icon|default:'far fa-square'}"></i></span>{$status[item].label}
 			{/if}

From a1fa55d803f9b5c370ecadd9a8f34a44ed6109f2 Mon Sep 17 00:00:00 2001
From: Saagar Arya <51128536+skarya22@users.noreply.github.com>
Date: Thu, 8 Feb 2024 09:50:03 -0500
Subject: [PATCH 3/7] Requested Changes

---
 .../instrument_list_controlpanel.tpl          | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/modules/instrument_list/templates/instrument_list_controlpanel.tpl b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
index 7a6a1663251..99980d40bea 100644
--- a/modules/instrument_list/templates/instrument_list_controlpanel.tpl
+++ b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
@@ -100,21 +100,24 @@
 	</ul>
 
 <script>
-	function setStageAndUpdate(stageLabel) {
-		// Make an AJAX request to the endpoint
-		var xhr = new XMLHttpRequest();
-		xhr.open('GET', '?candID={$candID}&sessionID={$sessionID}&setStageUpdate=' + encodeURIComponent(stageLabel), true);
-
-		xhr.onload = function () {
-			if (xhr.status >= 200 && xhr.status < 300) {
-				console.log('Request successful');
+	async function setStageAndUpdate(stageLabel) {
+		let url = loris.BaseURL + "/instrument_list/?candID={$candID}&sessionID={$sessionID}&setStageUpdate=" + stageLabel;
+		let response;
+		try {
+			response = await fetch(url, {credentials: 'same-origin'});
+			if (response.ok) {
 				window.location.reload(true);
+			}
+		} catch (e) {
+			let errorMessage;
+			if (response.status) {
+				// Error from the response.
+				errorMessage = "An error occurred: " + response.status;
 			} else {
-				// Request failed, handle errors if needed
-				console.error('Request failed with status ' + xhr.status);
+				// All other possible errors.
+				errorMessage = "An error occurred: " + e.message;
 			}
-		};
-
-		xhr.send();
+			console.log(errorMessage);
+		}
 	}
 </script>
\ No newline at end of file

From 247ab0a25b915d6c699ac5ef5e2746ae4f30e9ee Mon Sep 17 00:00:00 2001
From: Saagar Arya <51128536+skarya22@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:05:45 -0500
Subject: [PATCH 4/7] Remove async function

---
 .../templates/instrument_list_controlpanel.tpl              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/instrument_list/templates/instrument_list_controlpanel.tpl b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
index 99980d40bea..657878df252 100644
--- a/modules/instrument_list/templates/instrument_list_controlpanel.tpl
+++ b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
@@ -100,11 +100,13 @@
 	</ul>
 
 <script>
-	async function setStageAndUpdate(stageLabel) {
+	function setStageAndUpdate(stageLabel) {
 		let url = loris.BaseURL + "/instrument_list/?candID={$candID}&sessionID={$sessionID}&setStageUpdate=" + stageLabel;
 		let response;
 		try {
-			response = await fetch(url, {credentials: 'same-origin'});
+			fetch(url, {credentials: 'same-origin'}).then((res) {
+				response = res;
+			});
 			if (response.ok) {
 				window.location.reload(true);
 			}

From 7ede977d3109c7078bbd2ec052ff159633daa70c Mon Sep 17 00:00:00 2001
From: Saagar Arya <saagar.arya@mcin.ca>
Date: Thu, 8 Feb 2024 12:20:58 -0500
Subject: [PATCH 5/7] Missing expected value

---
 .../instrument_list/templates/instrument_list_controlpanel.tpl  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/instrument_list/templates/instrument_list_controlpanel.tpl b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
index 657878df252..3c1afc4b5b0 100644
--- a/modules/instrument_list/templates/instrument_list_controlpanel.tpl
+++ b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
@@ -104,7 +104,7 @@
 		let url = loris.BaseURL + "/instrument_list/?candID={$candID}&sessionID={$sessionID}&setStageUpdate=" + stageLabel;
 		let response;
 		try {
-			fetch(url, {credentials: 'same-origin'}).then((res) {
+			fetch(url, {credentials: 'same-origin'}).then((res) => {
 				response = res;
 			});
 			if (response.ok) {

From 455b236eef53158d10583b3d0f06ec3af3ac3f83 Mon Sep 17 00:00:00 2001
From: Saagar Arya <saagar.arya@mcin.ca>
Date: Thu, 8 Feb 2024 12:58:07 -0500
Subject: [PATCH 6/7] Fix fetch

---
 .../instrument_list_controlpanel.tpl          | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/modules/instrument_list/templates/instrument_list_controlpanel.tpl b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
index 3c1afc4b5b0..7a0cbdc076f 100644
--- a/modules/instrument_list/templates/instrument_list_controlpanel.tpl
+++ b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
@@ -101,25 +101,15 @@
 
 <script>
 	function setStageAndUpdate(stageLabel) {
-		let url = loris.BaseURL + "/instrument_list/?candID={$candID}&sessionID={$sessionID}&setStageUpdate=" + stageLabel;
-		let response;
+		var url = loris.BaseURL + "/instrument_list/?candID={$candID}&sessionID={$sessionID}&setStageUpdate=" + stageLabel;
 		try {
-			fetch(url, {credentials: 'same-origin'}).then((res) => {
-				response = res;
-			});
-			if (response.ok) {
-				window.location.reload(true);
-			}
+			fetch(url, {}).then((response) => {
+				if (response.ok) {
+					window.location.reload(true);
+				}
+			})
 		} catch (e) {
-			let errorMessage;
-			if (response.status) {
-				// Error from the response.
-				errorMessage = "An error occurred: " + response.status;
-			} else {
-				// All other possible errors.
-				errorMessage = "An error occurred: " + e.message;
-			}
-			console.log(errorMessage);
+			console.log("An error occurred: " + e.message);
 		}
 	}
 </script>
\ No newline at end of file

From 25993b697b7d984c781723e7b7df60ecc6c4fab2 Mon Sep 17 00:00:00 2001
From: Dave MacFarlane <driusan@gmail.com>
Date: Tue, 13 Feb 2024 09:15:42 -0500
Subject: [PATCH 7/7] Use console.error for error

---
 .../instrument_list/templates/instrument_list_controlpanel.tpl  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/instrument_list/templates/instrument_list_controlpanel.tpl b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
index 7a0cbdc076f..aa76f55fd48 100644
--- a/modules/instrument_list/templates/instrument_list_controlpanel.tpl
+++ b/modules/instrument_list/templates/instrument_list_controlpanel.tpl
@@ -109,7 +109,7 @@
 				}
 			})
 		} catch (e) {
-			console.log("An error occurred: " + e.message);
+			console.error("An error occurred: " + e.message);
 		}
 	}
 </script>
\ No newline at end of file