A
<% case sq.type %>
- <% when SurveyQuestion::Radio, SurveyQuestion::Select %>
+ <% when SurveyQuestion::Radio, SurveyQuestion::Select %>
<%= SurveysHelper.parse_value(@survey_answer[sq.id.to_s]) %>
<% when SurveyQuestion::Check %>
+ <% puts sq.id %>
<%= SurveysHelper.parse_checkbox_value_html(@survey_answer[sq.id.to_s]) %>
<% when SurveyQuestion::Radiogroup %>
diff --git a/app/views/admin/surveys/answer_sets.html.erb b/app/views/admin/surveys/answer_sets.html.erb
index ac0da0b..6e9508d 100644
--- a/app/views/admin/surveys/answer_sets.html.erb
+++ b/app/views/admin/surveys/answer_sets.html.erb
@@ -1,30 +1,131 @@
+
+
+
<%=
content_tag :div, class: "bottomnav clearfix" do
- content_tag :div, paginate(@survey_answers), class: "pagination pagination-centered"
+ content_tag :div, paginate((@survey_answer_groups || @survey_answers)), class: "pagination pagination-centered"
end
-%>
\ No newline at end of file
+%>
+
\ No newline at end of file
diff --git a/app/views/survey_export/export.xlsx.axlsx b/app/views/survey_export/export.xlsx.axlsx
index cd7e2f3..75a4919 100644
--- a/app/views/survey_export/export.xlsx.axlsx
+++ b/app/views/survey_export/export.xlsx.axlsx
@@ -1,29 +1,42 @@
# encoding: utf-8
-
+require 'axlsx'
wb = xlsx_package.workbook
-wb.add_worksheet(name: "WorkSheet1") do |sheet|
-
- row = []
+title = survey.title
+title = "WorkSheet1" if title.blank?
+wb.add_worksheet(name: title) do |sheet|
+ row = [I18n.t("survey.taken_by")]
+ row2 = [""]
survey_questions.each_with_index do |question, i|
- if question.type == 2 or question.type == 3 or question.type == 4
+ qnum = question.title.match(/^\d+./).nil? ? "#{i+1}. " : ""
+ start_col = row2.count
+ if question.type == 2 or question.type == 3 or question.type == 4
+ col_size = question.survey_question_options.count - 1
+ sheet.merge_cells "#{Axlsx::cell_r(start_col,0)}:#{Axlsx::cell_r(start_col+col_size,0)}"
question.survey_question_options.each do |option|
- row << "#{i+1}. #{question.title} - #{option.name}"
+ row << "#{qnum}#{question.title}"
+ row2 << "#{option.name}"
end
elsif question.type == 5
+ col_size = question.survey_question_options.count * question.survey_question_radiogroups.count - 1
+ sheet.merge_cells "#{Axlsx::cell_r(start_col,0)}:#{Axlsx::cell_r(start_col+col_size,0)}"
question.survey_question_options.each do |option|
question.survey_question_radiogroups.each do |radiogroup|
- row << "#{i+1}. #{question.title} - #{option.name} - #{radiogroup.name}"
+ row << "#{qnum}#{question.title}"
+ row2 << "#{option.name} - #{radiogroup.name}"
end
end
else
- row << "#{i+1}. #{question.title}"
+ row << "#{qnum}#{question.title}"
+ row2 << ""
end
if question.custom_option_new_option
- row << "#{i+1}. #{question.title} - #{t('survey_question.use_custom_option')}"
+ row << "#{qnum}#{question.title}"
+ row2 << "#{t('survey_question.use_custom_option')}"
end
end
sheet.add_row row
+ sheet.add_row row2
wrap = wb.styles.add_style alignment: {wrap_text: true}
survey_answers.each do |answer|
answer_row = []
diff --git a/app/views/surveys/my_record.html.erb b/app/views/surveys/my_record.html.erb
new file mode 100644
index 0000000..0c6a382
--- /dev/null
+++ b/app/views/surveys/my_record.html.erb
@@ -0,0 +1,63 @@
+<%
+ data = action_data
+ @survey = data["survey"]
+ @user = data["user"]
+ @survey_answers = data["survey_answers"]
+ @table_fields = data["table_fields"]
+ @is_answer_list = data["is_answer_list"]
+%>
+<% if @user.nil? %>
+
+
+
+ <%= create_pagination((@survey_answer_groups || @survey_answers).total_pages).html_safe %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/surveys/show.html.erb b/app/views/surveys/show.html.erb
index 1a8b49b..55c450f 100644
--- a/app/views/surveys/show.html.erb
+++ b/app/views/surveys/show.html.erb
@@ -33,8 +33,12 @@
s = qnums.index(-1)
e = @questions.count
len = e-s
- qnum_start = qnums[0...s].compact[-1] + 1
- qnums[s,len] = (qnum_start...(qnum_start+len)).to_a
+ qnum_start = qnums[0...s].compact[-1] + 1 rescue nil
+ if qnum_start
+ qnums[s,len] = (qnum_start...(qnum_start+len)).to_a
+ else
+ qnums[s,len] = (s+1..s+len).to_a
+ end
end
headers = @survey.survey_sections.pluck(:start_question)
footers = @survey.survey_sections.pluck(:end_question)
@@ -46,9 +50,9 @@
section_index = "[other]"
pagination_index = 0
qnum = 0
+ show_page_url = data["show_page_url"]
%>
-
<% if @survey.needs_login && current_user.nil? %>
+ <%= @survey.title %>
+
+ <% if @is_answer_list %>
+
<%=t('survey.taken_by')%>: <%=@user.member_name%>
+ <% else %> + + <% end %> +| <%= user.name %> | +<%= user.member_name rescue user.name %> | <% else %>NA | <% end %> -<%= sa.created_at.strftime("%h %d, %Y - %H:%M") rescue nil %> | -<%= t("survey.view_answers") %> | +<%= (@is_answer_list ? sa.updated_at : sa.last_modified).strftime("%h %d, %Y - %H:%M") rescue nil %> | ++ <% if @answer_repeat && !@is_answer_list %> + <%= t("survey.view") %>(<%=sa.survey_answer_ids.count%>) + + <% else %> + <%= t("survey.view_answers") %> + <% end %> + |
"><%=t("survey.please_login_first")%>
+ +<% else %> + +<%= @survey.title %>
+
+
+<%=t('survey.taken_by')%>: <%=@user.member_name%>
+| <%= user.member_name rescue user.name %> | + <% else %> +NA | + <% end %> +<%= (@is_answer_list ? sa.updated_at : sa.last_modified).strftime("%h %d, %Y - %H:%M") rescue nil %> | ++ <% if @answer_repeat && !@is_answer_list %> + "><%= t("survey.view") %>(<%=sa.survey_answer_ids.count%>) + + <% else %> + "><%= t("survey.view_answers") %> + <% end %> + | +