From f433786c61bef85e85dad2364e5742edd028d992 Mon Sep 17 00:00:00 2001
From: Shyukri Shyukriev <shshyukriev@suse.com>
Date: Thu, 30 Jun 2016 14:52:43 +0200
Subject: [PATCH] Changing form for surveys

---
 .../admin/surveys/_survey_question.html.haml  | 20 +++++++++----------
 app/views/survey/show.html.haml               | 11 ++++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/views/admin/surveys/_survey_question.html.haml b/app/views/admin/surveys/_survey_question.html.haml
index 067f0374..f1ab664e 100644
--- a/app/views/admin/surveys/_survey_question.html.haml
+++ b/app/views/admin/surveys/_survey_question.html.haml
@@ -22,30 +22,28 @@
           %span.fa.fa-times
   .panel-body
     - if survey_question.boolean?
-      %input{type: 'radio', name: 'radio'}
-        Yes
+      = f.input "survey_question_#{survey_question.id}", as: :radio, name: 'Yes'
       %br
-      %input{type: 'radio', name: 'radio'}
-        No
+      = f.input "survey_question_#{survey_question.id}", as: :radio, name: 'No'
     - elsif survey_question.choice?
       - survey_question.possible_answers.split(',').map(&:strip).each do |option|
         - if survey_question.single_choice?
-          %input{ type: 'radio', name: 'radio' }
+          %input{ type: 'radio', name: "survey_question_#{survey_question.id}" }
             = option
           %br
         - else
-          %input{ type: 'checkbox', name: 'checkbox' }
+          %input{ type: 'checkbox', name: "survey_question_#{survey_question.id}" }
             = option
           %br
     - elsif survey_question.string?
-      %input.form-control
+      %input.form-control{ name: "survey_question_#{survey_question.id}" }
     - elsif survey_question.text?
-      %textarea.form-control{ rows: 4 }
+      %textarea.form-control{ rows: 4, name: "survey_question_#{survey_question.id}"  }
     - elsif survey_question.datetime?
-      .form-group{class: 'datetimepicker'}
+      .form-group{ class: 'datetimepicker' }
         .input-group
           .input-group-addon
             %span.fa.fa-calendar
-          %input.form-control{readonly: 'readonly'}
+          %input.form-control{ readonly: 'readonly', name: "survey_question_#{survey_question.id}" }
     - elsif survey_question.numeric?
-      %input.form-control{ type: 'number' }
+      %input.form-control{ type: 'number', name: "survey_question_#{survey_question.id}"  }
diff --git a/app/views/survey/show.html.haml b/app/views/survey/show.html.haml
index 568089fc..aec00610 100644
--- a/app/views/survey/show.html.haml
+++ b/app/views/survey/show.html.haml
@@ -10,9 +10,12 @@
         = @survey.start_date
         to
         = @survey.end_date
+
 .row
   .col-md-12
-    - @survey.survey_questions.each.with_index(1) do |survey_question, index|
-      .row
-        .col-md-12
-          = render partial: 'admin/surveys/survey_question', locals:  { survey_question: survey_question, index: index }
+    = semantic_form_for @survey, url: conference_survey_reply_path(@conference.short_title, @survey) do |f|
+      - @survey.survey_questions.each.with_index(1) do |survey_question, index|
+        .row
+          .col-md-12
+            = render partial: 'admin/surveys/survey_question', locals:  { survey_question: survey_question, index: index, f: f }
+      = f.submit 'Submit', class: 'btn btn-primary pull-right'