From 730d6b896a6c0077f002e3aaedbfdf289a16f00e Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 15 Nov 2016 19:33:12 +0800
Subject: [PATCH] added custom fields for radio group and added to answer sets.
 now answer sets can be viewed also for login not required surveys

---
 app/assets/javascripts/survey.js             |  3 ++-
 app/controllers/surveys_controller.rb        |  5 +++++
 app/models/survey_question_radiogroup.rb     |  2 +-
 app/views/admin/surveys/_index.html.erb      | 11 ++++++-----
 app/views/admin/surveys/answer_set.html.erb  |  6 +++++-
 app/views/admin/surveys/answer_sets.html.erb |  4 ++--
 app/views/surveys/show.html.erb              | 14 ++++++++++++--
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/survey.js b/app/assets/javascripts/survey.js
index e266e46..5bc2d49 100644
--- a/app/assets/javascripts/survey.js
+++ b/app/assets/javascripts/survey.js
@@ -149,10 +149,11 @@ function onQuestionTypeChanged ( $fieldType, _val ){
 		$fieldType.fadeOut(300);
 	} else {
 		$fieldType.fadeIn(300);
+
 		if(_val < 5) {
 			$fieldType.find('.rgl, hr').addClass('hide').siblings('.allow').removeClass('hide');
 		} else {
-			$fieldType.find('.rgl, hr').removeClass('hide').siblings('.allow').addClass('hide');
+			$fieldType.find('.rgl, hr').removeClass('hide').siblings('.allow').removeClass('hide');
 		}
 	};
 }
diff --git a/app/controllers/surveys_controller.rb b/app/controllers/surveys_controller.rb
index 83e13c7..a8d1efb 100644
--- a/app/controllers/surveys_controller.rb
+++ b/app/controllers/surveys_controller.rb
@@ -159,6 +159,11 @@ class SurveysController < ApplicationController
                   @answer_model.errors.add question.title, t('survey_question.required_error')
                 end
               end
+              if question.custom_option
+                unless answer[oid]["custom_group_field"].blank?
+                  @answer_model[qid]["#{oid}_custom_group_field"] = answer[oid]["custom_group_field"]
+                end
+              end
             end
             individual_total << t
           end
diff --git a/app/models/survey_question_radiogroup.rb b/app/models/survey_question_radiogroup.rb
index 05d4fcf..1c582e9 100644
--- a/app/models/survey_question_radiogroup.rb
+++ b/app/models/survey_question_radiogroup.rb
@@ -2,6 +2,6 @@ class SurveyQuestionRadiogroup
   include Mongoid::Document
 
   field :name, :localize => true
-
+  
   embedded_in :survey_question
 end
\ No newline at end of file
diff --git a/app/views/admin/surveys/_index.html.erb b/app/views/admin/surveys/_index.html.erb
index 19e4135..8731df0 100644
--- a/app/views/admin/surveys/_index.html.erb
+++ b/app/views/admin/surveys/_index.html.erb
@@ -40,11 +40,12 @@
         <td><%= (survey.postdate) ? (format_value survey.postdate) : t(:no_deadline) %></td>
         <td><%= (survey.deadline) ? (format_value survey.deadline) : t(:no_deadline) %></td>
         <td>
-          <% if survey.needs_login %>
-            <a href="/admin/surveys/<%=survey.id.to_s%>/answer_sets">  <%= survey.survey_answers.count %></a>
-          <% else %>
-            <%= survey.survey_answers.count %>
-          <% end %>
+          <a href="/admin/surveys/<%=survey.id.to_s%>/answer_sets">  <%= survey.survey_answers.count %></a>
+          <%# if survey.needs_login %>
+            <!-- <a href="/admin/surveys/<%=survey.id.to_s%>/answer_sets">  <%#= survey.survey_answers.count %></a> -->
+          <%# else %>
+            <%#= survey.survey_answers.count %>
+          <%# end %>
         </td>
         <td><%= survey.update_user.user_name rescue ''%></td>
       </tr>
diff --git a/app/views/admin/surveys/answer_set.html.erb b/app/views/admin/surveys/answer_set.html.erb
index 47b351e..d27b871 100644
--- a/app/views/admin/surveys/answer_set.html.erb
+++ b/app/views/admin/surveys/answer_set.html.erb
@@ -69,7 +69,11 @@
  						<div class="radiogroup">
  						<% sq.survey_question_options.each do |sqo| %>
  							<% if !@survey_answer[sq.id.to_s].nil? %>
- 								<%= sqo.name %> : <%= @survey_answer[sq.id.to_s][sqo.id.to_s] %> <br />
+ 								<% if sq.custom_option %>
+									<%= @survey_answer[sq.id.to_s]["#{sqo.id}_custom_group_field"].blank? ? sqo.name : @survey_answer[sq.id.to_s]["#{sqo.id}_custom_group_field"]  %> : <%= @survey_answer[sq.id.to_s][sqo.id.to_s] %> <br />
+ 								<% else %>
+ 									<%= sqo.name %> : <%= @survey_answer[sq.id.to_s][sqo.id.to_s] %> <br />
+ 								<% end %>
  							<% end %>
  						<% end %>
  						</div>
diff --git a/app/views/admin/surveys/answer_sets.html.erb b/app/views/admin/surveys/answer_sets.html.erb
index 027f2a8..ac0da0b 100644
--- a/app/views/admin/surveys/answer_sets.html.erb
+++ b/app/views/admin/surveys/answer_sets.html.erb
@@ -15,9 +15,9 @@
   	<% if !user.nil? %>
 		<td><%= user.name %></td>
   	<% else %>
-  		<td>&nbsp;</td>
+  		<td>NA</td>
   	<% end %>
-  	<td><%= sa.created_at.strftime("%y-%M-%d %h:%m") rescue nil %></td>
+  	<td><%= sa.created_at.strftime("%h %d, %Y  -  %H:%M") rescue nil %></td>
   	<td><a href="/admin/surveys/<%= sa.id.to_s %>/answer_set"><%= t("survey.view_answers") %></a></td>
   	</tr>
   <% end %>
diff --git a/app/views/surveys/show.html.erb b/app/views/surveys/show.html.erb
index 2b0d0c3..65dd450 100644
--- a/app/views/surveys/show.html.erb
+++ b/app/views/surveys/show.html.erb
@@ -106,6 +106,9 @@
 					<thead>
 					  <tr>
 						<th></th>
+						<% if question.custom_option %>
+							<th></th>
+						<% end %>
 						<% question.survey_question_radiogroups.each do |radiogroup| %>
 						  <th>
 							<%= radiogroup.name %>
@@ -119,6 +122,13 @@
 						  <th class="o-question-title">
 							<%= option.name %>
 						  </th>
+						  <% if question.custom_option %>
+							  <%= f.fields_for "#{option.id}" do |oid| %>
+								  <td>
+								  	<%= oid.text_field "custom_group_field"  %>
+								  </td>
+							  <% end %>
+							<% end %>
 						  <% question.survey_question_radiogroups.each do |radiogroup| %>
 							<td>
 							  <%= rgf.radio_button option.id, radiogroup.id %>
@@ -147,8 +157,8 @@
 	<script type="text/javascript">
 	 
 	<% if @survey.jump_mode %>
-	  var answers = <%== @answers.to_json %>;
-	  var jump_tos_map = <%== @jump_tos_map.to_json %>;
+	  var answers = <%= @answers.to_json %>;
+	  var jump_tos_map = <%= @jump_tos_map.to_json %>;
 	  var $current_question = $('.question-item').eq(0);
 	  var current_index = parseInt($current_question.attr('data-index'));
 	  $current_question.removeClass('hide');