From b6bae08a807520c2a8d0ccca0c8dd1fe37d7ab6c Mon Sep 17 00:00:00 2001
From: Steve Jones <steve@squaregoldfish.co.uk>
Date: Fri, 6 Sep 2024 14:51:58 +0200
Subject: [PATCH] (#2960) Do not show progress bar on interim page actions

---
 WebApp/WebContent/dataset/internal_calibration.xhtml |  4 ++--
 WebApp/WebContent/dataset/manual_qc.xhtml            |  4 ++--
 WebApp/WebContent/dataset/position_qc.xhtml          |  4 ++--
 WebApp/WebContent/resources/script/plotPage.js       | 12 ++++++++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/WebApp/WebContent/dataset/internal_calibration.xhtml b/WebApp/WebContent/dataset/internal_calibration.xhtml
index eb98e6653..d978b02a0 100644
--- a/WebApp/WebContent/dataset/internal_calibration.xhtml
+++ b/WebApp/WebContent/dataset/internal_calibration.xhtml
@@ -23,7 +23,7 @@
       partialSubmit="true"
       process="selectedColumn selectedRows"
       update=":plotPageForm:error :plot1Form:plot1Data :plot1Form:plot1Flags :plot2Form:plot2Data :plot2Form:plot2Flags :statusForm"
-      onstart="itemLoading(UPDATE_DATA)"
+      onstart="itemLoading(UPDATE_DATA, true)"
       oncomplete="calibrationUpdated()" />
 
     <p:remoteCommand name="generateUserQCComments"
@@ -36,7 +36,7 @@
       action="#{internalCalibrationBean.setCalibrationUse}"
       process="useCalibrations useCalibrationsMessage selectedColumn selectedRows"
       update=":plotPageForm:error :plot1Form:plot1Data :plot1Form:plot1Flags :plot2Form:plot2Data :plot2Form:plot2Flags :statusForm"
-      onstart="itemLoading(UPDATE_DATA)"
+      onstart="itemLoading(UPDATE_DATA, false)"
       oncomplete="calibrationUpdated()" />
   </ui:define>
 
diff --git a/WebApp/WebContent/dataset/manual_qc.xhtml b/WebApp/WebContent/dataset/manual_qc.xhtml
index d776b442f..2115ec761 100644
--- a/WebApp/WebContent/dataset/manual_qc.xhtml
+++ b/WebApp/WebContent/dataset/manual_qc.xhtml
@@ -23,7 +23,7 @@
       partialSubmit="true"
       process="selectedColumn selectedRows"
       update=":plotPageForm:error :plot1Form:plot1Data :plot1Form:plot1Flags :plot2Form:plot2Data :plot2Form:plot2Flags :statusForm"
-      onstart="itemLoading(UPDATE_DATA)"
+      onstart="itemLoading(UPDATE_DATA, true)"
       oncomplete="qcFlagsAccepted()" />
 
     <p:remoteCommand name="generateUserQCComments"
@@ -36,7 +36,7 @@
       action="#{sessionScope[beanName].applyManualFlag}"
       process="selectedColumn selectedRows manualFlag manualComment"
       update=":plotPageForm:error :plot1Form:plot1Data :plot1Form:plot1Flags :plot2Form:plot2Data :plot2Form:plot2Flags :statusForm"
-      onstart="itemLoading(UPDATE_DATA)"
+      onstart="itemLoading(UPDATE_DATA, false)"
       oncomplete="qcFlagsAccepted()" />
 
   </ui:define>
diff --git a/WebApp/WebContent/dataset/position_qc.xhtml b/WebApp/WebContent/dataset/position_qc.xhtml
index 174306346..1c6bc5c28 100644
--- a/WebApp/WebContent/dataset/position_qc.xhtml
+++ b/WebApp/WebContent/dataset/position_qc.xhtml
@@ -23,7 +23,7 @@
       partialSubmit="true"
       process="selectedColumn selectedRows"
       update=":plotPageForm:error :plot1Form:plot1Data :plot1Form:plot1Flags :plot2Form:plot2Data :plot2Form:plot2Flags :statusForm"
-      onstart="itemLoading(UPDATE_DATA)"
+      onstart="itemLoading(UPDATE_DATA, true)"
       oncomplete="qcFlagsAccepted()" />
 
     <p:remoteCommand name="generateUserQCComments"
@@ -36,7 +36,7 @@
       action="#{sessionScope[beanName].applyManualFlag}"
       process="selectedColumn selectedRows manualFlag manualComment"
       update=":plotPageForm:error :plot1Form:plot1Data :plot1Form:plot1Flags :plot2Form:plot2Data :plot2Form:plot2Flags :statusForm"
-      onstart="itemLoading(UPDATE_DATA)"
+      onstart="itemLoading(UPDATE_DATA, false)"
       oncomplete="qcFlagsAccepted()" />
 
   </ui:define>
diff --git a/WebApp/WebContent/resources/script/plotPage.js b/WebApp/WebContent/resources/script/plotPage.js
index f89e94242..9b472e7a5 100644
--- a/WebApp/WebContent/resources/script/plotPage.js
+++ b/WebApp/WebContent/resources/script/plotPage.js
@@ -30,13 +30,21 @@ function plotLoading(index, mode) {
     }
   }
 
-  itemLoading(item);
+  itemLoading(item, false);
 }
 
-function itemLoading(item) {
+function itemLoading(item, showProgressBar) {
   loadingItems = loadingItems | item;
   PF('pleaseWait').show();
+
+  if (showProgressBar) {
   startProgressBarUpdater();
+  $("#pleaseWaitForm\\:progressName").show();
+  PF('progressBar').jq.show();
+  } else {
+  $("#pleaseWaitForm\\:progressName").hide();
+  PF('progressBar').jq.hide();
+  }
 }
 
 function itemNotLoading(item) {