From caf9c0c5170dc52f2825667e00d94c57cab5f68b Mon Sep 17 00:00:00 2001 From: amoore2020 <110399572+amoore2020@users.noreply.github.com> Date: Wed, 27 Mar 2024 23:33:01 -0400 Subject: [PATCH] EVSREPEXP-508 Update Template Options --- clientui/src/components/ReadCodeEntry.vue | 28 ++++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/clientui/src/components/ReadCodeEntry.vue b/clientui/src/components/ReadCodeEntry.vue index 3c3edcfb..95596726 100644 --- 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 + } } },