EVSREPEXP-508 Update Template Options

NCIEVS · Mar 28, 2024 · caf9c0c · caf9c0c
1 parent 96b1c87
commit caf9c0c
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/clientui/src/components/ReadCodeEntry.vue b/clientui/src/components/ReadCodeEntry.vue
@@ -413,9 +413,9 @@ export default {
                     }
                   } else {
                     tempStatus = data[x].queryStatus
-                    this.tags.push(tag + ":" + "");   //Vue 3 used for testing take out after testing
-                    this.newTag = ""                  //Vue 3 used for testing take out after testing
-                    this.tagCounter = this.tagCounter + 1;  //Vue 3 used for testing take out after testing
+                  //  this.tags.push(tag + ":" + "");   //Vue 3 used for testing take out after testing
+                  //  this.newTag = ""                  //Vue 3 used for testing take out after testing
+                  //  this.tagCounter = this.tagCounter + 1;  //Vue 3 used for testing take out after testing
                     //Vue 3 error message if invalid entity code is entered
                     this.$notify({
                       group: 'app',
@@ -434,9 +434,9 @@ export default {
                   this.newTag = [];
                   dupTagCheck = false;
                 } else {
-                  this.tags.push(tag + ":" + "");   //take out after testing
-                  this.newTag = ""                  //take out after testing
-                  this.tagCounter = this.tagCounter + 1;  //take out after testing
+                //  this.tags.push(tag + ":" + "");   //take out after testing
+                //  this.newTag = ""                  //take out after testing
+                //  this.tagCounter = this.tagCounter + 1;  //take out after testing
                   //Vue 3 error message if invalid entity code is entered
                   this.$notify({
                     group: 'app',
@@ -619,13 +619,18 @@ export default {
             }
           }
 
-          if (this.templateYesNoFlag === "No")
+          if (this.templateYesNoFlag === "No" && this.rightOptions.length < 1)
           {
             this.templateCodeDesc = this.tags + ", " + this.templatePropertiesValue
             this.templateSelectedValue = this.templateCodeDesc
-            this.selectedPropertiesWindow = this.templateCodeDesc
+            this.selectedPropertiesWindow = ""
+            this.selectedPropertiesWindowCt = 0
           }
 
+        //  if (this.rightOptions.length < 1){
+        //    this.selectedPropertiesWindow = ""
+        //    this.selectedPropertiesWindowCt = 0
+        //  }
           selectNextOptionBTN_counter = selectNextOptionBTN_counter + 1  // Counter controls navigating between steps 1 -3
           this.WaitTimeIndicatorPause()
         }
@@ -767,6 +772,8 @@ export default {
         //  this.selectedPropertiesWindow = this.templateSelectedOptions
           this.selectedPropertiesWindow = this.tags + ", " + this.templatePropertiesValue
           this.selectedPropertiesWindowCt = this.templateValueCount
+          this.templateCodeDesc = this.tags + ", " + this.templatePropertiesValue
+          this.templateSelectedValue = this.templateCodeDesc
         }
       }
 
@@ -779,6 +786,11 @@ export default {
           this.selectedPropertiesWindow = this.rightOptions
           this.selectedPropertiesWindowCt = Object.keys(this.selectedPropertiesWindow).length
         }
+
+        if (this.rightOptions.length < 1){
+          this.selectedPropertiesWindow = ""
+          this.selectedPropertiesWindowCt = 0
+        }
       }
     },