Align the button and error-panel timing.

Author: labkey-bpatel

ehr/resources/web/ehr/panel/DataEntryErrorPanel.js

@@ -19,6 +19,7 @@ Ext4.define('EHR.panel.DataEntryErrorPanel', {
         this.callParent(arguments);
 
         this.mon(this.storeCollection, 'validation', this.updateErrorMessages, this, {buffer: 1000});
+        this.mon(this.storeCollection, 'validationcomplete', this.updateErrorMessages, this, {buffer: 50});
         this.mon(this.storeCollection, 'commitcomplete', this.updateErrorMessages, this, {buffer: 200});
         this.mon(this.storeCollection, 'commitexception', this.updateErrorMessages, this, {buffer: 200});
     },

ehr/resources/web/ehr/panel/DataEntryPanel.js

@@ -124,6 +124,13 @@ Ext4.define('EHR.panel.DataEntryPanel', {
     onValidationComplete: function(){
         this.validationInProgress = false;
         this.setValidationIndicatorVisible(false);
+
+        var errorPanel = this.getErrorPanel();
+        if (errorPanel){
+            errorPanel.updateErrorMessages();
+        }
+
+        this.onStoreCollectionValidation(this.storeCollection);
     },
 
     onStoreCollectionValidation: function(sc){
@@ -133,6 +140,10 @@ Ext4.define('EHR.panel.DataEntryPanel', {
 
         this.updateDirtyStateMessage();
 
+        if (this.storeCollection && this.storeCollection.validationRequestsInFlight > 0){
+            return;
+        }
+
         var maxSeverity = sc.getMaxErrorSeverity();
 
         if(EHR.debug && maxSeverity)
@@ -552,6 +563,14 @@ Ext4.define('EHR.panel.DataEntryPanel', {
         return this.dirtyStateArea;
     },
 
+    getErrorPanel: function(){
+        if (!this.errorPanel || this.errorPanel.isDestroyed){
+            this.errorPanel = this.down('#errorPanel');
+        }
+
+        return this.errorPanel;
+    },
+
     getValidationIndicator: function(){
         if (!this.validationIndicator || this.validationIndicator.isDestroyed){
             this.validationIndicator = this.down('#validationIndicator');