(#2960) Do not show progress bar on interim page actions

quince-science · Sep 6, 2024 · b6bae08 · b6bae08
1 parent 50951b6
commit b6bae08
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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) {