Add more options for surveys

* Survey period constraints
* Add abilities
* Enforce required questions
* Update survey_submssion updated_at
* Do a full match of possible answer and user reply

app/views/admin/events/_datatable_row.haml

@@ -61,3 +61,8 @@
       = link_to "#{event.comments_count}",
         admin_conference_program_event_path(conference_id, event),
         anchor: 'comments-div'
+    %td.text-center
+      = link_to new_admin_conference_survey_path(@conference.short_title,
+        survey: {  surveyable_type: 'Event', surveyable_id: event.id }),
+        class: 'btn btn-success' do
+        .fa.fa-plus

app/views/admin/survey_questions/_form.html.haml

@@ -17,7 +17,7 @@
         .col-md-12
           = f.input :title
           = f.input :mandatory
-          %div.survey-possible-answers{ class: @survey_question.choice? ? '' : 'hidden'}
+          .survey-possible-answers{ class: @survey_question.choice? ? '' : 'hidden' }
             = f.input :possible_answers, hint: 'Comma separated', input_html: { rows: 3 }
             .row
               .col-md-6
@@ -38,16 +38,16 @@
           %label
             Preview:
           .panel.panel-default
-            .panel-body{id: 'survey_question_preview'}
-              %p{id: 'title', style: 'word-wrap: break-word'}
+            .panel-body{ id: 'survey_question_preview' }
+              %p{ id: 'title', style: 'word-wrap: break-word' }
                 = @survey_question.title.blank? ? 'What is your answer?' : @survey_question.title
 
-              %div.kinds.boolean{ class: @survey_question.boolean? ? '' : 'hidden'}
-                %input{type: 'radio', name: 'radio'} Yes
+              .kinds.boolean{ class: @survey_question.boolean? ? '' : 'hidden' }
+                %input{ type: 'radio', name: 'radio' } Yes
                 %br
-                %input{type: 'radio', name: 'radio'} No
+                %input{ type: 'radio', name: 'radio' } No
 
-              %div.kinds.choice{ id: '', class: @survey_question.choice? ? '' : 'hidden'}
+              .kinds.choice{ class: @survey_question.choice? ? '' : 'hidden' }
                 - if @survey_question.possible_answers.blank?
                   - if @survey_question.single_choice?
                     %input{ type: 'radio', name: 'radio' } Choice 1
@@ -72,21 +72,21 @@
                         = option
                       %br
 
-              %div.kinds.string{ class: @survey_question.string? ? '' : 'hidden'}
+              .kinds.string{ class: @survey_question.string? ? '' : 'hidden' }
                 %input.form-control
 
-              %div.kinds.text{ class: @survey_question.text? ? '' : 'hidden'}
+              .kinds.text{ class: @survey_question.text? ? '' : 'hidden' }
                 %textarea.form-control{ rows: 4 }
 
 
-              %div.kinds.datetime{ class: @survey_question.datetime? ? '' : 'hidden'}
-                .form-group{class: 'datetimepicker'}
+              .kinds.datetime{ class: @survey_question.datetime? ? '' : 'hidden' }
+                .form-group{ class: 'datetimepicker' }
                   .input-group
                     .input-group-addon
                       %span.fa.fa-calendar
-                    %input.form-control{readonly: 'readonly'}
+                    %input.form-control{ readonly: 'readonly' }
+                    .kinds.numeric{ class: @survey_question.numeric? ? '' : 'hidden' }
 
-              %div.kinds.numeric{ class: @survey_question.numeric? ? '' : 'hidden'}
                 %input.form-control{ type: 'number' }
 
       = f.submit 'Save', class: 'btn btn-primary'

app/views/admin/surveys/_survey_question.html.haml

@@ -1,31 +1,11 @@
 .panel.panel-default
   .panel-heading
-    %span.badge
-      = question_index
-    = survey_question.title
-
-    - if survey_question.multiple_choice?
-      ( Select
-      - if survey_question.min_choices != survey_question.max_choices
-        a minimum of
-      = survey_question.min_choices
-      - if survey_question.min_choices != survey_question.max_choices
-        and a maximum of
-        = survey_question.max_choices
-      choices )
-    - if survey_question.mandatory
-      %span.fa.fa-asterisk.text-danger
-    - if can? :edit, @survey
-      %p.pull-right
-        = link_to edit_admin_conference_survey_survey_question_path(@conference.short_title, @survey, survey_question) do
-          %span.fa.fa-edit
-        = 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
+    = render partial: 'admin/surveys/survey_question_title',  locals:  { survey_question: survey_question, question_index: question_index }
   .panel-body
     - if survey_question.boolean?
       %input{ type: 'hidden', name: "survey_submission[#{survey_question.id}][]" }
       %label
-        %input{ type: 'radio', name: "survey_submission[#{survey_question.id}][]", value: 'Yes', checked: survey_reply.text == 'Yes' }
+        %input{ type: 'radio', name: "survey_submission[#{survey_question.id}][]", value: 'Yes', checked: survey_reply.text == 'Yes',required: survey_question.mandatory }
         Yes
       %br
       %label
@@ -39,24 +19,24 @@
       - possible_answers.each.with_index(1) do |answer, answer_index|
         - if survey_question.single_choice?
           %label
-            %input{ type: 'radio', name: "survey_submission[#{survey_question.id}][]", value: answer, checked: (survey_reply.text.include? answer if survey_reply.text) }
+            %input{ type: 'radio', name: "survey_submission[#{survey_question.id}][]", value: answer, checked: (survey_reply.text == answer if survey_reply.text), required: survey_question.mandatory }
             = answer
           %br
         - else
           %label
-            = check_box_tag "survey_submission[#{survey_question.id}][]", answer,  (survey_reply.text.include? answer if survey_reply.text), id: dom_id(survey_reply)
+            = check_box_tag "survey_submission[#{survey_question.id}][]", answer, (survey_reply.text.include? answer if survey_reply.text), id: dom_id(survey_reply), required: survey_question.mandatory
             = answer
 
           %br
     - elsif survey_question.string?
-      %input.form-control{ name: "survey_submission[#{survey_question.id}][]", value:  survey_reply.text }
+      %input.form-control{ name: "survey_submission[#{survey_question.id}][]", value:  survey_reply.text, required: survey_question.mandatory }
     - elsif survey_question.text?
-      = text_area_tag "survey_submission[#{survey_question.id}][]", survey_reply.text, rows: 4, class: 'form-control'
+      = text_area_tag "survey_submission[#{survey_question.id}][]", survey_reply.text, rows: 4, class: 'form-control', required: survey_question.mandatory
     - elsif survey_question.datetime?
       .form-group{ class: 'datetimepicker' }
         .input-group
           .input-group-addon
             %span.fa.fa-calendar
-          %input.form-control{ readonly: 'readonly', name: "survey_submission[#{survey_question.id}][]", value: survey_reply.text }
+          %input.form-control{ readonly: 'readonly', name: "survey_submission[#{survey_question.id}][]", value: survey_reply.text, required: survey_question.mandatory }
     - elsif survey_question.numeric?
-      %input.form-control{ type: 'number', name: "survey_submission[#{survey_question.id}][]", value: survey_reply.text }
+      %input.form-control{ type: 'number', name: "survey_submission[#{survey_question.id}][]", value: survey_reply.text, required: survey_question.mandatory }

app/views/admin/surveys/_survey_question_title.html.haml

@@ -0,0 +1,22 @@
+%span.badge
+  = question_index
+= survey_question.title
+
+- if survey_question.multiple_choice?
+  ( Select
+  - if survey_question.min_choices != survey_question.max_choices
+    a minimum of
+  = survey_question.min_choices
+  - if survey_question.min_choices != survey_question.max_choices
+    and a maximum of
+    = survey_question.max_choices
+  choices )
+- if survey_question.mandatory
+  %span.fa.fa-asterisk.text-danger
+- if can? :edit, @survey
+  %p.pull-right
+    = "(#{survey_question.survey_replies.count} replies)"
+    = link_to edit_admin_conference_survey_survey_question_path(@conference.short_title, @survey, survey_question) do
+      %span.fa.fa-edit
+    = 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

app/views/admin/surveys/_survey_replies.html.haml

@@ -0,0 +1,16 @@
+- @survey.survey_questions.each.with_index(1) do |survey_question, question_index|
+  .panel.panel-default
+    .panel-heading{ type: 'button', 'data-toggle': 'collapse', 'data-target': "#question-#{survey_question.id}", 'aria-expanded': 'true', 'aria-controls': 'collapse' }
+      = render partial: 'survey_question_title', locals:  { survey_question: survey_question, question_index: question_index }
+
+    .panel-body.collapse{ id: "question-#{survey_question.id}" }
+      - if survey_question.survey_replies.any?
+        %table.table
+          %thead
+            %th User Email
+            %th Reply
+          %tbody
+            - survey_question.survey_replies.reload.each do |reply|
+              %tr
+                %td= reply.user.email
+                %td= reply.text

app/views/admin/surveys/_survey_stats.html.haml

@@ -0,0 +1,13 @@
+= javascript_include_tag "//www.google.com/jsapi", "chartkick"
+= javascript_include_tag 'chartkick'
+
+= bar_chart @survey.survey_questions.map{ |q| [q.title, q.survey_replies.count] }
+
+- @survey.survey_questions.each.with_index(1) do |survey_question, question_index|
+  .panel.panel-default
+    .panel-heading
+      = render partial: 'survey_question_title', locals:  { survey_question: survey_question, question_index: question_index }
+    .panel-body
+      - question_replies = survey_question.survey_replies
+      - if question_replies.any?
+        = pie_chart question_replies.group(:text).count, library: { legend: 'bottom', plotOptions: { pie: { dataLabels: { enabled: false }, showInLegend: true } } }

app/views/admin/surveys/index.html.haml

@@ -14,6 +14,8 @@
       %table.table.table-hover.datatable#surveys
         %thead
           %th Title
+          %th # of questions
+          %th # of submissions
           %th When
           %th Start Date
           %th End Date
@@ -23,6 +25,10 @@
             %tr
               %td
                 = link_to survey.title, admin_conference_survey_path(@conference.short_title, survey)
+              %td
+                = survey.survey_questions.length
+              %td
+                = survey.survey_submissions.length
               %td
                 = survey.target
               %td

app/views/admin/surveys/show.html.haml

@@ -11,10 +11,24 @@
         = @survey.end_date
 .row
   .col-md-12
-    = semantic_form_for 'survey_submission', url: '#' do |f|
-      - @survey.survey_questions.each.with_index(1) do |survey_question, question_index|
-        .row
-          .col-md-12
-            - survey_reply = survey_question.survey_replies.new(survey_question_id: survey_question.id, user_id: current_user.id)
-            = render partial: 'survey_question', locals:  { survey_question: survey_question, question_index: question_index, survey_reply: survey_reply }
-    = link_to 'Add Question', new_admin_conference_survey_survey_question_path(@conference.short_title, @survey), class: 'btn btn-success pull-right'
+    .tabbable
+      %ul.nav.nav-tabs
+        %li.active
+          = link_to 'Questions' , '#questions-content', 'data-toggle' => 'tab'
+        %li
+          = link_to 'Replies' , '#replies-content', 'data-toggle' => 'tab'
+        %li
+          = link_to 'Stats' , '#stats-content', 'data-toggle' => 'tab'
+      .tab-content
+        .tab-pane.active#questions-content
+          = semantic_form_for 'survey_submission', url: '#' do |f|
+            - @survey.survey_questions.each.with_index(1) do |survey_question, question_index|
+              .row
+                .col-md-12
+                  - survey_reply = survey_question.survey_replies.new(survey_question_id: survey_question.id, user_id: current_user.id)
+                  = render partial: 'survey_question', locals:  { survey_question: survey_question, question_index: question_index, survey_reply: survey_reply }
+          = link_to 'Add Question', new_admin_conference_survey_survey_question_path(@conference.short_title, @survey), class: 'btn btn-success pull-right'
+        .tab-pane#replies-content
+          = render partial: 'survey_replies'
+        .tab-pane#stats-content
+          = render partial: 'survey_stats'