Merge pull request #13979 from code-dot-org/fix_organizer_view_bugs

Fix a couple bugs with organizer view
code-dot-org · Mar 24, 2017 · a9fa85d · a9fa85d
2 parents 3f7b947 + a53a80c
commit a9fa85d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/src/code-studio/pd/workshop_dashboard/components/survey_results_header.jsx b/apps/src/code-studio/pd/workshop_dashboard/components/survey_results_header.jsx
@@ -307,7 +307,7 @@ const SurveyResultsHeader = React.createClass({
             <b>{question['text']}</b>
             {
               thisWorkshop[question['key']].map((answer, j) => {
-                return (
+                return !!(_.trim(answer)) && (
                   <li key={j}>
                     {answer}
                   </li>

diff --git a/dashboard/app/controllers/api/v1/pd/workshop_organizer_survey_report_controller.rb b/dashboard/app/controllers/api/v1/pd/workshop_organizer_survey_report_controller.rb
@@ -13,7 +13,7 @@ def index
       survey_report[:all_workshops_for_course] = aggregate_for_all_workshops[params[:course]]
 
       survey_report[:all_my_workshops_for_course], facilitator_scores = get_score_for_workshops(
-        ::Pd::Workshop.where(course: params[:course], organizer_id: current_user.id), facilitator_breakdown: true
+        ::Pd::Workshop.where(course: params[:course], organizer_id: current_user.id).in_state(::Pd::Workshop::STATE_ENDED), facilitator_breakdown: true
       )
       survey_report.merge!(facilitator_scores)