Merge pull request #41 from Deaponn/develop

Qol improvements

Author: gronostajo

package.json

@@ -10,6 +10,7 @@
     "coffee-script": "1.10.0",
     "coffeelint": "1.15.7",
     "coffeelint-newline-at-eof": "0.4.1",
+    "coffeescript": "^2.7.0",
     "del": "2.2.x",
     "group-array": "^0.3.1",
     "gulp": "3.9.1",
@@ -37,6 +38,9 @@
     "run-sequence": "1.2.2",
     "yargs": "5.0.0"
   },
+  "overrides": {
+    "graceful-fs": "^4.2.11"
+  },  
   "repository": {
     "type": "git",
     "url": "git://github.com/gronostajo/drill2.git"

src/app/20_main.js

@@ -151,9 +151,20 @@
 
 			$scope.currentQuestion = $scope.questions[$scope.questionIndex - 1];
 
+			$scope.displayAsRadio = $scope.config.displayAsRadio && $scope.currentQuestion.totalCorrect() == 1;
+
+			for (var i = 0; i < $scope.questions.length; i++) {
+				var q = $scope.questions[i];
+				for (var j = 0; j < q.answers.length; j++) {
+					q.answers[j].sortingKey = ($scope.config.shuffleAnswers)
+						? Math.random() : j;
+				}
+			}
+
 			for (var i = 0; i < $scope.currentQuestion.answers.length; i++) {
 				$scope.currentQuestion.answers[i].checked = false;
 			}
+			$scope.currentQuestion.checkedAnswer = undefined; // for radio input questions
 
 			ViewportHelper.scrollToTop(function() {
 				$scope.$apply(function () {
@@ -193,6 +204,8 @@
 				}
 			}
 
+			if ($scope.view.isGraded()) return;
+
 			for (i = 0; i < $scope.currentQuestion.answers.length; i++) {
 				sortingKeys.push($scope.currentQuestion.answers[i].sortingKey);
 			}
@@ -201,12 +214,20 @@
 
 			for (i = 0; i < $scope.currentQuestion.answers.length; i++) {
 				if ($scope.currentQuestion.answers[i].sortingKey === sortingKeys[$event.which - 49]) {
-					$scope.currentQuestion.answers[i].checked = !$scope.currentQuestion.answers[i].checked;
+					if ($scope.displayAsRadio)
+						$scope.currentQuestion.checkedAnswer = $scope.currentQuestion.answers[i].id; // for radio input questions
+					else
+						$scope.currentQuestion.answers[i].checked = !$scope.currentQuestion.answers[i].checked;
 				}
 			}
 		};
 
 		$scope.grade = function () {
+			for (var i = 0; i < $scope.currentQuestion.answers.length; i++) {
+				var answer = $scope.currentQuestion.answers[i];
+				if (answer.id == $scope.currentQuestion.checkedAnswer) answer.checked = true;
+			}
+
 			$scope.stopTimer();
 
 			$scope.view.current = 'graded';
@@ -238,14 +259,6 @@
 			else {
 				$scope.questions = $scope.loadedQuestions.slice(0);	// shallow copy
 			}
-
-			for (var i = 0; i < $scope.questions.length; i++) {
-				var q = $scope.questions[i];
-				for (var j = 0; j < q.answers.length; j++) {
-					q.answers[j].sortingKey = ($scope.config.shuffleAnswers)
-						? Math.random() : j;
-				}
-			}
 		};
 
 		$scope.escapeQuestions = function () {
@@ -313,6 +326,7 @@
 				for (var i = 0; i < $scope.currentQuestion.answers.length; i++) {
 					$scope.currentQuestion.answers[i].checked = false;
 				}
+				$scope.currentQuestion.checkedAnswer = undefined; // for radio input questions
 				$scope.grade();
 				$scope.stopTimer();
 			}

src/app/parser/meta/OptionsBlockProcessor.coffee

@@ -86,6 +86,8 @@ angular.module('DrillApp').service 'OptionsBlockProcessor', (JsonLoader, SafeEva
 
     repeatIncorrect: parseBool
 
+    displayAsRadio: parseBool
+
     explain: (vOrig, m, logFn) ->
       v = vOrig and vOrig.toLowerCase()
       if v in ['summary', 'optional', 'always']

src/app/screens/home/settings/settings.html

@@ -108,6 +108,12 @@
                         Repeat incorrectly answered questions
                     </label>
                 </div>
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" ng-model="model.displayAsRadio">
+                        Display questions with one correct answer as Radio (only one option at a time is selectable)
+                    </label>
+                </div>
             </div>
         </div>
 

src/app/screens/question/question.html

@@ -16,10 +16,11 @@ <h2 title="{{currentQuestion.id != false ? currentQuestion.id : 'No ID'}}">Quest
         <div ng-hide="config.markdown" ng-bind-html="currentQuestion.body | plaintext"></div>
     </div>
     <div class="form-group answers">
-        <div class="checkbox answer no-selection correct-{{answer.correct}} checked-{{answer.checked}}" ng-class="{ explained: view.isGraded() && config.showExplanations && currentQuestion.hasExplanations }" ng-repeat="answer in currentQuestion.answers | orderBy:'sortingKey'">
+        <div class="{{displayAsRadio ? 'radio' : 'checkbox'}} answer no-selection correct-{{answer.correct}} checked-{{displayAsRadio ? (currentQuestion.checkedAnswer == answer.id) : answer.checked}}" ng-class="{ explained: view.isGraded() && config.showExplanations && currentQuestion.hasExplanations }" ng-repeat="answer in currentQuestion.answers | orderBy:'sortingKey'">
             <label>
                 <span class="label label-default keyboard-shortcut answer-number"></span>
-                <input type="checkbox" ng-model="answer.checked" ng-disabled="view.isGraded()">
+                <input type="radio" ng-model="currentQuestion.checkedAnswer" ng-value="answer.id" ng-disabled="view.isGraded()" ng-if="displayAsRadio">
+                <input type="checkbox" ng-model="answer.checked" ng-disabled="view.isGraded()" ng-else>
                 <span class="content">
                     <span class="id" ng-show="view.isGraded() && config.showExplanations && currentQuestion.hasExplanations">{{answer.id}})&nbsp</span>
                     <span ng-bind-html="answer.body | plaintext:'span.p'"></span>

src/app/screens/summary/summary.html

@@ -10,9 +10,9 @@ <h2>The test is over</h2>
         <div class="panel-body">
             <div class="question-body" ng-show="config.markdown" ng-bind-html="question.body | markdown:this"></div>
             <div class="question-body" ng-hide="config.markdown" ng-bind-html="question.body | plaintext"></div>
-            <div class="checkbox answer explained" ng-repeat="answer in question.answers">
+            <div class="{{(config.displayAsRadio && question.totalCorrect() == 1) ? 'radio' : 'checkbox'}} answer explained" ng-repeat="answer in question.answers">
                 <label ng-class="{ correct: answer.checked && answer.correct, incorrect: answer.checked && !answer.correct, missed: !answer.checked && answer.correct }">
-                    <input type="checkbox" disabled ng-checked="answer.checked">
+                    <input type="{{(config.displayAsRadio && question.totalCorrect() == 1) ? 'radio' : 'checkbox'}}" disabled ng-checked="answer.checked">
                     <span class="content">
                         <span class="id">{{answer.id}})&nbsp;</span>
                         <span ng-bind-html="answer.body | plaintext:'span.p'"></span>

test/src/parser/meta/OptionsBlockProcessorSpec.coffee

@@ -16,6 +16,7 @@ describe 'OptionsBlockProcessor', ->
     timeLimitEnabled: no
     timeLimitSecs: 60
     repeatIncorrect: no
+    displayAsRadio: no
     explain: 'optional'
     showExplanations: no
     explanations: {}
@@ -182,6 +183,27 @@ describe 'OptionsBlockProcessor', ->
 
     expect(logger).not.toHaveBeenCalled()
 
+  it 'should recognize display as radio setting option', ->
+    expectedTrue = displayAsRadio: yes
+    expectedFalse = displayAsRadio: no
+    logger = jasmine.createSpy('logger')
+
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": true}', logger)).toHaveMemberValues(expectedTrue)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": "true"}', logger)).toHaveMemberValues(expectedTrue)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": "enabled"}', logger)).toHaveMemberValues(expectedTrue)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": "yes"}', logger)).toHaveMemberValues(expectedTrue)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": "1"}', logger)).toHaveMemberValues(expectedTrue)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": 1}', logger)).toHaveMemberValues(expectedTrue)
+
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": false}', logger)).toHaveMemberValues(expectedFalse)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": "false"}', logger)).toHaveMemberValues(expectedFalse)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": "disabled"}', logger)).toHaveMemberValues(expectedFalse)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": "no"}', logger)).toHaveMemberValues(expectedFalse)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": "0"}', logger)).toHaveMemberValues(expectedFalse)
+    expect(@OptionsBlockProcessor.process('{"displayAsRadio": 0}', logger)).toHaveMemberValues(expectedFalse)
+
+    expect(logger).not.toHaveBeenCalled()
+
   it 'should recognize explanation options', ->
     logger = jasmine.createSpy('logger')