jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert maxes changes

Browse source
This commit is contained in:
FrankRua 2022-02-23 15:56:03 -05:00
parent 213090b863
commit 8e1c5fef34
2 changed files with 130 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/common-components/button-question/button-question.vue
View file

@ -7,7 +7,32 @@
<fieldset class="w-100" :class="getFieldSetClasses" role="radiogroup" :aria-labelledby="groupName ? groupName + '-radio-group' : ''"> <fieldset class="w-100" :class="getFieldSetClasses" role="radiogroup" :aria-labelledby="groupName ? groupName + '-radio-group' : ''">
<legend class="sr-only">{{groupName}}</legend> <legend class="sr-only">{{groupName}}</legend>
<div :class="getComponentWrapperClasses"> <div :class="getComponentWrapperClasses">
<component :is="buttonType" v-for="answer in answers" :key="answer.Name ? answer.Name : answer" @isCheckedChanged="handleCheckedChanged" :buttonID="answer.Name ? groupName + '-' + answer.Name : groupName + '-' + answer" :value="answer.Name ? answer.Name : answer" :buttonLabel="answer.Text ? answer.Text : answer" :buttonLabelSubCopy="answer.SubText" :textPosition="textPosition" :isMultiSelect="isMultiSelect" :groupName="groupName" :selectingInitiatesLoad="selectingInitiatesLoad" :loaderColor="loaderColor" :loaderPosition="loaderPosition" :isWide=isWide :isRequired=isRequired :buttonImage="answer.AnswerImageUrl" :buttonImageId="answer.ImageId" :altText="answer.Name ? answer.Name : answer" screenReaderOnlyText="(opens new window)" :colLength="getColLength" :selectedValues="selectedValues" data-test="button" :validationRules="validationRules" /> <component
:is="buttonType"
v-for="answer in answers"
:key="answer.Name ? answer.Name : answer"
@isCheckedChanged="handleCheckedChanged"
:buttonID="answer.Name ? groupName + '-' + answer.Name : groupName + '-' + answer"
:value="answer.Name ? answer.Name : answer"
:buttonLabel="answer.Text ? answer.Text : answer"
:buttonLabelSubCopy="answer.SubText"
:textPosition="textPosition"
:isMultiSelect="isMultiSelect"
:groupName="groupName"
:selectingInitiatesLoad="selectingInitiatesLoad"
:loaderColor="loaderColor"
:loaderPosition="loaderPosition"
:isWide=isWide
:isRequired=isRequired
:buttonImage="answer.AnswerImageUrl"
:buttonImageId="answer.ImageId"
:altText="answer.Name ? answer.Name : answer"
screenReaderOnlyText="(opens new window)"
:colLength="getColLength"
:selectedValues="selectedValues"
data-test="button"
:validationRules="validationRules"
/>
</div> </div>
</fieldset> </fieldset>
</div> </div>
@ -21,9 +46,7 @@
import listButton from "@/ux-components/list-button/list-button"; import listButton from "@/ux-components/list-button/list-button";
import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal"; import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
import listCard from "@/ux-components/list-card/list-card"; import listCard from "@/ux-components/list-card/list-card";
import { import { ErrorMessage } from 'vee-validate';
ErrorMessage
} from 'vee-validate';
import radio from "@/ux-components/radio/radio"; import radio from "@/ux-components/radio/radio";
export default { export default {
@ -59,9 +82,9 @@ export default {
}, },
computed: { computed: {
getFieldSetClasses() { getFieldSetClasses() {
return this.isOverflowScrollable ? return this.isOverflowScrollable
"container-fluid overflow-scroll position-absolute px-5 pt-1 py-0" : ? "container-fluid overflow-scroll position-absolute px-5 pt-1 py-0"
""; : "";
}, },
getComponentWrapperClasses() { getComponentWrapperClasses() {
let classes; let classes;
@ -99,34 +122,16 @@ export default {
}, },
methods: { methods: {
handleCheckedChanged(val) { handleCheckedChanged(val) {
const newSelectedValues = this.selectedValues;
if(this.isMultiSelect && this.selectedValues) { if(this.isMultiSelect && this.selectedValues) {
// Add or remove item to array of data to emit // Add or remove item to array of data to emit
if(Array.isArray(this.selectedValues)) { if(Array.isArray(this.selectedValues)) {
const newSelectedValues = this.selectedValues;
val.checkValue ? newSelectedValues.push(val.value) : newSelectedValues.splice(newSelectedValues.indexOf(val.value), 1); val.checkValue ? newSelectedValues.push(val.value) : newSelectedValues.splice(newSelectedValues.indexOf(val.value), 1);
this.selectedValues = newSelectedValues; this.selectedValues = newSelectedValues;
} }
} else { } else {
if (Array.isArray(this.selectedValues)) { this.selectedValues = [val.value];
newSelectedValues.splice(0, newSelectedValues.length);
newSelectedValues.push(val.value);
this.selectedValues = newSelectedValues;
} }
}
// handleCheckedChanged(val) {
// if(this.isMultiSelect && this.selectedValues) {
// // Add or remove item to array of data to emit
// if(Array.isArray(this.selectedValues)) {
// const newSelectedValues = this.selectedValues;
// val.checkValue ? newSelectedValues.push(val.value) : newSelectedValues.splice(newSelectedValues.indexOf(val.value), 1);
// this.selectedValues = newSelectedValues;
// }
// } else {
// this.selectedValues = [val.value];
// }
// },
}, },
}, },
components: { components: {

2
src/ux-components/radio/radio.vue
View file

@ -63,7 +63,7 @@ export default {
}; };
this.$emit("isCheckedChanged", emitEvent); this.$emit("isCheckedChanged", emitEvent);
//this.$emit("update:modelValue", emitEvent); this.$emit("update:modelValue", emitEvent);
} }
}, },
}, },