Fix minor style and logic issues

thm-projects · Feb 6, 2017 · fc7867f · fc7867f
1 parent bf7b1a6
commit fc7867f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/arsnova.click/client/layout/view_leaderboard/scripts/lib.js b/arsnova.click/client/layout/view_leaderboard/scripts/lib.js
@@ -219,7 +219,7 @@ export function getAllLeaderboardItems(keepAllNicks = false) {
  if (typeof allItems[o] === "undefined") {
  allItems[o] = {
  responseTime: 0,
- correctQuestions: tmpItems[o].correctQuestions
+ correctQuestions: []
  };
  }
  allItems[o].responseTime += tmpItems[o].responseTime;

diff --git a/arsnova.click/client/layout/view_lobby/scripts/onRendered.js b/arsnova.click/client/layout/view_lobby/scripts/onRendered.js
@@ -49,7 +49,6 @@ Template.memberlist.onRendered(function () {
  }
  });
  if (localData.containsHashtag(Router.current().params.quizName)) {
- Meteor.call("EventManagerCollection.setActiveQuestion", Router.current().params.quizName, 0);
  const musicSettings = Session.get("questionGroup").getConfiguration().getMusicSettings();
  let songTitle = musicSettings.getLobbyTitle();
  if (songTitle === "Random") {

diff --git a/arsnova.click/client/plugins/splashscreen/scripts/lib.js b/arsnova.click/client/plugins/splashscreen/scripts/lib.js
@@ -272,6 +272,14 @@ export const parseMarkdown = {
  }
  return QuestionGroupCollection.findOne().questionList[parseInt(instance.data.questionIndex)].type === "FreeTextQuestion";
  },
+ isSurveyQuestion: function () {
+ const instance = Template.instance();
+ const questionDoc = QuestionGroupCollection.findOne();
+ if (!questionDoc) {
+ return;
+ }
+ return QuestionGroupCollection.findOne().questionList[parseInt(instance.data.questionIndex)].type === "SurveyQuestion";
+ },
  isRangedQuestion: function () {
  const instance = Template.instance();
  const questionDoc = QuestionGroupCollection.findOne();

diff --git a/arsnova.click/client/plugins/splashscreen/templates/splashscreen_question_and_answer.html b/arsnova.click/client/plugins/splashscreen/templates/splashscreen_question_and_answer.html
@@ -91,7 +91,7 @@ <h3 id="answerHeader" role="heading">{{_ "plugins.splashscreen.question_and_answ
  <h3 id="answerHeader" role="heading">{{_ "plugins.splashscreen.question_and_answer.answeroption" count=2}}</h3>
  {{#each getAnswerOptions}}
  <div class="answerContentElementWrapper" role="listitem">
- <div class="answerContentElementLetter {{#if revealCorrectAnswerValue}}{{#if isCorrectAnswer @index}}correctAnswer{{else}}wrongAnswer{{/if}}{{/if}}">
+ <div class="answerContentElementLetter {{#unless isSurveyQuestion}}{{#if revealCorrectAnswerValue}}{{#if isCorrectAnswer @index}}correctAnswer{{else}}wrongAnswer{{/if}}{{/if}}{{/unless}}">
  <span>{{_ "plugins.splashscreen.question_and_answer.answeroption" count=1}} {{answerOptionLetter @index}}</span>
  </div>
  <div class="answerContentElementItem">