diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index edbf96178..2cc32535d 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -33,6 +33,11 @@ class Form::Question
delegate :subsection, to: :page
delegate :form, to: :subsection
+ def get_answer_label(case_log)
+ answer = answer_label(case_log)
+ answer.present? ? [prefix, answer_label(case_log), suffix].join("") : ""
+ end
+
def answer_label(case_log)
return checkbox_answer_label(case_log) if type == "checkbox"
return case_log[id].strftime("%d %b %Y") if type == "date"
diff --git a/app/views/form/_check_answers_table.html.erb b/app/views/form/_check_answers_table.html.erb
index c0bc32cba..79a723ef8 100644
--- a/app/views/form/_check_answers_table.html.erb
+++ b/app/views/form/_check_answers_table.html.erb
@@ -3,9 +3,7 @@
<%= question.check_answer_label.to_s.present? ? question.check_answer_label.to_s : question.header.to_s %>
- <%= question.prefix.present? ? " " + question.prefix : ""%>
- <%= question.answer_label(@case_log) %>
- <%= question.suffix.present? ? " " + question.suffix : "" %>
+ <%= question.get_answer_label(@case_log) %>
<% question.get_inferred_answers(@case_log).each do |inferred_answer| %>
<%= inferred_answer %>
<% end %>
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 848060e4b..cfd55faf1 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1872,7 +1872,7 @@
"step": "1",
"width": 5,
"prefix": "£",
- "suffix": "every week"
+ "suffix": " every week"
}
},
"soft_validations": {
@@ -1899,7 +1899,7 @@
"step": "1",
"width": 5,
"prefix": "£",
- "suffix": "every month"
+ "suffix": " every month"
}
},
"soft_validations": {
@@ -1926,7 +1926,7 @@
"step": "1",
"width": 5,
"prefix": "£",
- "suffix": "every year"
+ "suffix": " every year"
}
},
"soft_validations": {
@@ -2049,7 +2049,7 @@
"type": "numeric",
"width": 5,
"prefix": "£",
- "suffix": "every week"
+ "suffix": " every week"
}
},
"depends_on" : [{
@@ -2227,7 +2227,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every week",
+ "suffix": " every week",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2240,7 +2240,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every week",
+ "suffix": " every week",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2253,7 +2253,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every week",
+ "suffix": " every week",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2266,7 +2266,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every week",
+ "suffix": " every week",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2279,7 +2279,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every week",
+ "suffix": " every week",
"readonly": true,
"requires_js": true
}
@@ -2397,7 +2397,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 2 weeks",
+ "suffix": " every 2 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2410,7 +2410,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 2 weeks",
+ "suffix": " every 2 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2423,7 +2423,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 2 weeks",
+ "suffix": " every 2 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2436,7 +2436,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 2 weeks",
+ "suffix": " every 2 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2449,7 +2449,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 2 weeks",
+ "suffix": " every 2 weeks",
"readonly": true,
"requires_js": true
}
@@ -2486,7 +2486,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 4 weeks",
+ "suffix": " every 4 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2499,7 +2499,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 4 weeks",
+ "suffix": " every 4 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2512,7 +2512,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 4 weeks",
+ "suffix": " every 4 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2525,7 +2525,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 4 weeks",
+ "suffix": " every 4 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2538,7 +2538,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every 4 weeks",
+ "suffix": " every 4 weeks",
"readonly": true,
"requires_js": true
}
@@ -2575,7 +2575,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every month",
+ "suffix": " every month",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2588,7 +2588,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every month",
+ "suffix": " every month",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2601,7 +2601,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every month",
+ "suffix": " every month",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2614,7 +2614,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every month",
+ "suffix": " every month",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@@ -2627,7 +2627,7 @@
"step": 1,
"width": 5,
"prefix": "£",
- "suffix": "every month",
+ "suffix": " every month",
"readonly": true,
"requires_js": true
}