From c57e0d5921e225978773775d5be2e7a3389df43b Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Wed, 9 Jan 2013 16:26:52 +0100
Subject: [PATCH] Better dots for progress, still not perfect..

---
 js/questionset.js     | 57 +++++++++++++++++++++++++++++++++++++------
 schema.json           |  7 +++++-
 views/questionset.ejs | 30 ++++++++++++++++++++---
 3 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index e354141..9a482de 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -14,19 +14,41 @@ H5P.QuestionSet = function (options) {
     return new H5P.QuestionSet(options);
 
   var texttemplate = '' +
+'<style type="text/css">' +
+'.dots-container {' +
+'  text-align: center;' +
+'}' +
+'.progress-dot {' +
+'  display: inline-block;' +
+'  width: 10px;' +
+'  height: 10px;' +
+'  border-radius: 50%;' +
+'}' +
+'.progress-dot.unanswered {' +
+'  background: darkred;' +
+'}' +
+'.progress-dot.answered {' +
+'  background: darkgreen;' +
+'}' +
+'.progress-dot.current {' +
+'  box-shadow: 0px 0px 6px firebrick;' +
+'}' +
+'</style>' +
 '<div class="questionset">' +
 '  <div class="title"><%= title %></div>' +
 '  <% for (var i=0; i<questions.length; i++) { %>' +
-'    <div class="question" id="q-<%= i %>">' +
+'    <div class="question-container" id="q-<%= i %>">' +
 '      <div><%= questions[i].machineName %></div>' +
 '    </div>' +
 '  <% } %>' +
 '  <div class="question-footer">' +
 '    <div class="progress">' +
 '      <% if (progressType == "dots") { %>' +
-'        <% for (var i=0; i<questions.length; i++) { %>' +
-'        <span class="progress-dot unanswered" id="qdot-<%= i %>">o</span>' +
-'        <%} %>' +
+'        <div class="dots-container">' +
+'          <% for (var i=0; i<questions.length; i++) { %>' +
+'          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>' +
+'          <%} %>' +
+'        </div>' +
 '      <% } else if (progressType == "textual") { %>' +
 '        <span class="progress-text"></span>' +
 '      <% } %>' +
@@ -55,7 +77,7 @@ H5P.QuestionSet = function (options) {
   var template = new EJS({text: texttemplate});
   var params = jQuery.extend({}, defaults, options);
 
-  var currentQuestion = -1;
+  var currentQuestion = 0;
   var questionInstances = new Array();
   var allQuestionsAnswered = false;
   var myDom;
@@ -65,6 +87,14 @@ H5P.QuestionSet = function (options) {
     console.log("TODO: Randomize order of questions");
   }
 
+  var _allQuestionsAnswered = function () {
+    var answered = true;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      answered = answered && (questionInstances[i]).getAnswerGiven();
+    }
+    return answered;
+  };
+
   var _showQuestion = function (questionNumber) {
     // Sanitize input.
     if (questionNumber < 0) { questionNumber = 0; }
@@ -72,9 +102,10 @@ H5P.QuestionSet = function (options) {
 
     $('.prev.button', myDom).attr({'disabled': (questionNumber === 0)});
     $('.next.button', myDom).attr({'disabled': (questionNumber == params.questions.length-1)});
+    $('.finish.button', myDom).attr({'disabled': !(_allQuestionsAnswered())});
 
     // Hide all questions
-    $('.question', myDom).hide();
+    $('.question-container', myDom).hide();
 
     // Reshow the requested question
     $('#q-' + questionNumber, myDom).show();
@@ -88,6 +119,9 @@ H5P.QuestionSet = function (options) {
       $('.progress-dot.current', myDom).removeClass('current');
       // Set answered/unanswered for current.
       $('#qdot-' + questionNumber, myDom).addClass('current');
+      if (questionInstances[currentQuestion].getAnswerGiven()) {
+        $('#qdot-' + currentQuestion, myDom).removeClass('unanswered').addClass('answered');
+      }
     }
 
     // Remember where we are
@@ -110,12 +144,19 @@ H5P.QuestionSet = function (options) {
     }
 
     // Set event listeners.
-    $('.next.button', myDom).click(function() {
+    $('.next.button', myDom).click(function (ev) {
       _showQuestion(currentQuestion + 1);
     });
-    $('.prev.button', myDom).click(function() {
+    $('.prev.button', myDom).click(function (ev) {
       _showQuestion(currentQuestion - 1);
     });
+    $('.finish.button', myDom).click(function (ev) {
+      // get total score.
+      // Display result page.
+      // Display animation if present.
+      // Remove DOM. (delete container)
+      myDom.remove();
+    });
 
     // Hide all but initial Question.
     _showQuestion(params.initialQuestion);
diff --git a/schema.json b/schema.json
index d76e117..9e5654f 100644
--- a/schema.json
+++ b/schema.json
@@ -17,13 +17,18 @@
     "type": "integer",
     "default": 0
   },
+  "backgroundImage": {
+    "name": "Background image",
+    "description": "An optional background image for the Question set.",
+    "type": "image"
+  },
   "progressType": {
     "name": "Progress indicator",
     "description": "Question set progress indicator style",
     "type": "select",
     "values": [{"text": "Textual", "value": "textual"}, {"text": "Dots", "value": "dots"}],
     "default": "textual"
-    },
+  },
   "questions": {
     "name": "Questions",
     "description": "List of questions in this set.",
diff --git a/views/questionset.ejs b/views/questionset.ejs
index 8a1dee1..1d05cdd 100644
--- a/views/questionset.ejs
+++ b/views/questionset.ejs
@@ -1,16 +1,38 @@
+<style type="text/css">
+.dots-container {
+  text-align: center;
+}
+.progress-dot {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+}
+.progress-dot.unanswered {
+  background: darkred;
+}
+.progress-dot.answered {
+  background: darkgreen;
+}
+.progress-dot.current {
+  box-shadow: 0px 0px 6px firebrick;
+}
+</style>
 <div class="questionset">
   <div class="title"><%= title %></div>
   <% for (var i=0; i<questions.length; i++) { %>
-    <div class="question" id="q-<%= i %>">
+    <div class="question-container" id="q-<%= i %>">
       <div><%= questions[i].machineName %></div>
     </div>
   <% } %>
   <div class="question-footer">
     <div class="progress">
       <% if (progressType == "dots") { %>
-        <% for (var i=0; i<questions.length; i++) { %>
-        <span class="progress-dot unanswered" id="qdot-<%= i %>">o</span>
-        <%} %>
+        <div class="dots-container">
+          <% for (var i=0; i<questions.length; i++) { %>
+          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>
+          <%} %>
+        </div>
       <% } else if (progressType == "textual") { %>
         <span class="progress-text"></span>
       <% } %>