diff --git a/Gemfile.lock b/Gemfile.lock index 73bec84c..e507d2c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -621,6 +621,3 @@ DEPENDENCIES web-console (~> 2.0) webmock whenever - -BUNDLED WITH - 1.12.5 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index bb2f4e9e..d181745c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,7 +15,6 @@ //= require waypoints/jquery.waypoints //= require dataTables/jquery.dataTables //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap -//= require cocoon //= require bootstrap //= require Chart //= require osem diff --git a/app/controllers/survey_controller.rb b/app/controllers/survey_controller.rb deleted file mode 100644 index e4d21f8b..00000000 --- a/app/controllers/survey_controller.rb +++ /dev/null @@ -1,12 +0,0 @@ -class SurveyController < ApplicationController - load_resource :conference, find_by: :short_title - load_and_authorize_resource - - def show - @survey_submission = @survey.survey_submissions.new - end - - def reply - end - -end diff --git a/app/controllers/survey_submissions_controller.rb b/app/controllers/survey_submissions_controller.rb new file mode 100644 index 00000000..da693116 --- /dev/null +++ b/app/controllers/survey_submissions_controller.rb @@ -0,0 +1,21 @@ +class SurveySubmissionsController < ApplicationController + load_resource :conference, find_by: :short_title + load_resource :survey + load_and_authorize_resource +# skip_before_filter :verify_authenticity_token + + def edit + end + + def update + end + + def new + end + + def update + end + + def show + end +end diff --git a/app/controllers/surveys_controller.rb b/app/controllers/surveys_controller.rb new file mode 100644 index 00000000..668bbb32 --- /dev/null +++ b/app/controllers/surveys_controller.rb @@ -0,0 +1,26 @@ +class SurveysController < ApplicationController + load_resource :conference, find_by: :short_title + load_and_authorize_resource +# skip_before_filter :verify_authenticity_token + + def edit + end + + def update + end + + def new + end + + def update + end + + def show + @survey_submission = @survey.survey_submissions.new + end + + def reply + redirect_to :back + end + +end diff --git a/app/views/admin/surveys/_survey_question.html.haml b/app/views/admin/surveys/_survey_question.html.haml index 039c2ee5..641684aa 100644 --- a/app/views/admin/surveys/_survey_question.html.haml +++ b/app/views/admin/surveys/_survey_question.html.haml @@ -1,8 +1,11 @@ .panel.panel-default .panel-heading %span.badge - = index + = question_index = survey_question.title + ID + = survey_question.id + - if survey_question.multiple_choice? ( Select - if survey_question.min_choices != survey_question.max_choices @@ -21,22 +24,37 @@ = link_to admin_conference_survey_survey_question_path(@conference.short_title, @survey, survey_question), method: :delete, data: { confirm: 'Are you sure you want to delete this question?' } do %span.fa.fa-times .panel-body - = f.semantic_fields_for :survey_reply do |reply, index| - = reply.hidden_field :survey_question_id, value: survey_question.id - - if survey_question.boolean? - = reply.input :text, as: :radio, label: false - - elsif survey_question.choice? - - choice_type = survey_question.single_choice? ? :radio : :check_boxes - = reply.input :text, as: choice_type, label: false, collection: survey_question.possible_answers.split(',').map(&:strip) - - elsif survey_question.string? - %input.form-control{ name: "survey_question_#{survey_question.id}" } - - elsif survey_question.text? - %textarea.form-control{ rows: 4, name: "survey_question_#{survey_question.id}" } - - elsif survey_question.datetime? - .form-group{ class: 'datetimepicker' } - .input-group - .input-group-addon - %span.fa.fa-calendar - %input.form-control{ readonly: 'readonly', name: "survey_question_#{survey_question.id}" } - - elsif survey_question.numeric? - %input.form-control{ type: 'number', name: "survey_question_#{survey_question.id}" } + %input{ type: 'hidden', name: "survey_question_#{survey_question.id}", value: survey_question.id } + + - if survey_question.boolean? + %input{ type: 'radio', name: "survey_question_#{survey_question.id}_reply", value: 'Yes' } + Yes + %input{ type: 'radio', name: "survey_question_#{survey_question.id}_reply", value: 'No' } + No + + - elsif survey_question.choice? + - possible_answers = survey_question.possible_answers.split(',').map(&:strip) + + - possible_answers.each do |answer| + - if survey_question.single_choice? + %input{ type: 'radio', name: "survey_question_#{survey_question.id}_reply", value: answer } + = label_tag answer + %br + - else + = hidden_field_tag "survey_submission[survey_question_#{survey_question.id}][survey_reply_ids][]", nil + = check_box_tag "survey_submission[survey_question_#{survey_question.id}][survey_reply_ids][]", possible_answers.index, false + = answer + %br + - elsif survey_question.string? + %input.form-control{ name: "survey_question_#{survey_question.id}" } + - elsif survey_question.text? + %textarea.form-control{ rows: 4, name: "survey_question_#{survey_question.id}" } + - elsif survey_question.datetime? + .form-group{ class: 'datetimepicker' } + .input-group + .input-group-addon + %span.fa.fa-calendar + %input.form-control{ readonly: 'readonly', name: "survey_question_#{survey_question.id}" } + - elsif survey_question.numeric? + %input.form-control{ type: 'number', name: "survey_question_#{survey_question.id}" } + diff --git a/app/views/admin/surveys/show.html.haml b/app/views/admin/surveys/show.html.haml index f60d3653..7c140fc9 100644 --- a/app/views/admin/surveys/show.html.haml +++ b/app/views/admin/surveys/show.html.haml @@ -11,8 +11,9 @@ = @survey.end_date .row .col-md-12 - - @survey.survey_questions.each.with_index(1) do |survey_question, index| - .row - .col-md-12 - = render partial: 'survey_question', locals: { survey_question: survey_question, index: index } + = semantic_form_for 'survey_submission', url: '#' do |f| + - @survey.survey_questions.each.with_index(1) do |survey_question, index| + .row + .col-md-12 + = render partial: 'survey_question', locals: { survey_question: survey_question, index: index, f: f } = link_to 'Add Question', new_admin_conference_survey_survey_question_path(@conference.short_title, @survey), class: 'btn btn-success pull-right' diff --git a/app/views/survey/show.html.haml b/app/views/survey_submissions/_form.html.haml similarity index 79% rename from app/views/survey/show.html.haml rename to app/views/survey_submissions/_form.html.haml index d6babaa8..b3e10620 100644 --- a/app/views/survey/show.html.haml +++ b/app/views/survey_submissions/_form.html.haml @@ -1,5 +1,5 @@ .row - .col-md-12 + .col-md-10.col-md-offset-1 .page-header %h1 Survey #{@survey.title} @@ -14,8 +14,9 @@ .row .col-md-12 = semantic_form_for @survey_submission, url: conference_survey_reply_path(@conference.short_title, @survey) do |f| - - @survey.survey_questions.each.with_index(1) do |survey_question, index| + - @survey.survey_questions.each.with_index(1) do |survey_question, question_index| .row - .col-md-12 - = render partial: 'admin/surveys/survey_question', locals: { survey_question: survey_question, index: index, f: f } + .col-md-10.col-md-offset-1 + + = render partial: 'admin/surveys/survey_question', locals: { survey_question: survey_question, question_index: question_index, f: f } = f.submit 'Submit', class: 'btn btn-primary pull-right' diff --git a/app/views/surveys/show.html.haml b/app/views/surveys/show.html.haml new file mode 100644 index 00000000..cc93e740 --- /dev/null +++ b/app/views/surveys/show.html.haml @@ -0,0 +1,22 @@ +.row + .col-md-10.col-md-offset-1 + .page-header + %h1 + Survey #{@survey.title} + - if can? :edit, @survey + = link_to 'Edit Survey', admin_conference_survey_path(@conference.short_title, @survey), class: 'btn btn-primary pull-right' + %p.text-muted + From: + = @survey.start_date + to + = @survey.end_date + +.row + .col-md-12 + = semantic_form_for @survey_submission, url: conference_survey_reply_path(@conference.short_title, @survey) do |f| + - @survey.survey_questions.each.with_index(1) do |survey_question| + .row + .col-md-10.col-md-offset-1 + = f.semantic_fields_for :survey_reply do |myreply, index| + = render partial: 'admin/surveys/survey_question', locals: { survey_question: survey_question, index: index, myreply: myreply } + = f.submit 'Submit', class: 'btn btn-primary pull-right' diff --git a/config/routes.rb b/config/routes.rb index 02a46547..db3c76c1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -96,7 +96,8 @@ Osem::Application.routes.draw do end resources :conference, only: [:index, :show] do - resources :survey, only: [:show] do + resources :surveys, only: [:show] do + resource :survey_submission post :reply end resource :program, only: [] do