From c27bb6176fb10a266ec391c0ef014b95ba489b67 Mon Sep 17 00:00:00 2001 From: Simon Reed Date: Wed, 31 Jul 2019 16:39:52 +0100 Subject: [PATCH] Handle adding response domain if none existed before #82 --- app/views/question_grids/show.json.jbuilder | 38 +++++++++------------ 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/app/views/question_grids/show.json.jbuilder b/app/views/question_grids/show.json.jbuilder index 349c442c..36624db5 100755 --- a/app/views/question_grids/show.json.jbuilder +++ b/app/views/question_grids/show.json.jbuilder @@ -1,26 +1,22 @@ json.extract! @object, :id, :label, :literal, :vertical_code_list_id, :horizontal_code_list_id, :roster_rows, :roster_label, :corner_label, :created_at, :updated_at json.type @object.class.name json.instruction @object.instruction.nil? ? '' : @object.instruction.text -begin - json.cols @object.horizontal_code_list.codes do |x| - json.label x.category.label - json.order x.order - json.value x.value - json.rd do - if @object.horizontal_code_list.codes.length > 1 - json.partial! 'response_domains/show', - rd: @object.rds_qs.find_by_code_id(x.value).nil? ? - nil : @object.rds_qs.find_by_code_id(x.value).response_domain - else - json.partial! 'response_domains/show', rd: @object.rds_qs.first.response_domain - end +json.cols @object.horizontal_code_list.codes do |x| + json.label x.category.label + json.order x.order + json.value x.value + json.rd do + if @object.horizontal_code_list.codes.length > 1 + json.partial! 'response_domains/show', + rd: @object.rds_qs.find_by_code_id(x.value).nil? ? + nil : @object.rds_qs.find_by_code_id(x.value).try(:response_domain) + else + json.partial! 'response_domains/show', rd: @object.rds_qs.first.try(:response_domain) end end - json.rows @object.vertical_code_list.codes do |y| - json.label y.category.label - json.order y.order - end - json.pretty_corner_label @object.pretty_corner_label -rescue - json.error true -end \ No newline at end of file +end +json.rows @object.vertical_code_list.codes do |y| + json.label y.category.label + json.order y.order +end +json.pretty_corner_label @object.pretty_corner_label