Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EAR 1948 add option values for rad cb sel answers #182

Merged
merged 8 commits into from
Oct 30, 2024
Merged

EAR 1948 add option values for rad cb sel answers #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75fe863
Revert "Revert "EAR 1948 add option values for rad cb sel answers""
jchapman68 Aug 23, 2023
90aa9e9
Merge branch 'master' into revert-181-revert-170-ear-1948-option-valu…
sudeepkunhis Feb 1, 2024
a1d0b04
Merge branch 'master' into revert-181-revert-170-ear-1948-option-valu…
sudeepkunhis Mar 18, 2024
3d079c9
Merge branch 'master' into revert-181-revert-170-ear-1948-option-valu…
martyncolmer Apr 16, 2024
ba40593
Ensure there's a condition where option value routing is value when i…
Farhanam76 Apr 18, 2024
fcb64db
Merge pull request #214 from ONSdigital/EAR-2401-Option-value-routing
Farhanam76 Apr 18, 2024
c6f3b4a
Merge branch 'master' of github.com:ONSdigital/eq-publisher-v3 into r…
farres1 Oct 30, 2024
028cb63
Add line space
farres1 Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/eq_schema/builders/routing2/newRoutingDestination/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@ const getOptionValues = (optionIds, questionnaire) => {
const optionResults = optionIds.map((id) => {
const option = find(options, { id });

const updatedLabel = option.label
const optionContent = option.value
? option.value.trim()
: option.label.trim();

const updatedContent = optionContent
.replace(/'/g, `\u2019`)
.replace(/'/g, `\u2019`)
.replace(/‘/g, `\u2019`);

return updatedLabel.trim();
return updatedContent.trim();
});

if (optionResults === undefined || optionResults.length < 0) {
Expand Down
6 changes: 4 additions & 2 deletions src/eq_schema/schema/Answer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,14 @@ class Answer {
}

static buildOption(
{ label, description, additionalAnswer, qCode: q_code },
{ label, description, additionalAnswer, qCode: q_code, value },
{ properties, type },
ctx
) {
const optionValue = value ? value : label;
const option = {
label: buildContents(label, ctx, true),
value: buildContents(label, ctx, true),
value: buildContents(optionValue, ctx, true),
};

if (q_code) {
Expand All @@ -279,6 +280,7 @@ class Answer {
}
}
}

return option;
}
}
Expand Down
Loading