diff --git a/card/back.html b/card/back.html index 4ad1ebd..1e34d0f 100644 --- a/card/back.html +++ b/card/back.html @@ -28,7 +28,8 @@ wrongwrong: 'correct', // Should be wrong and got marked as wrong correctcorrect: 'correct', // Should be correct and got marked as correct wrongcorrect: 'wrong', // Should be wrong but got marked as correct - correctwrong: 'wrong' // Should be correct but got marked as wrong + correctwrong: 'wrong', // Should be correct but got marked as wrong + eithernone: "wrong" // Kprim was marked neither correct nor wrong } }, atable: { @@ -38,7 +39,8 @@ wrongwrong: 'correct', // Should be wrong and got marked as wrong correctcorrect: 'correct', // Should be correct and got marked as correct wrongcorrect: 'wrong', // Should be wrong but got marked as correct - correctwrong: 'wrong' // Should be correct but got marked as wrong + correctwrong: 'wrong', // Should be correct but got marked as wrong + eithernone: "wrong" // Kprim was marked neither correct nor wrong } } } @@ -81,6 +83,8 @@ qrows[(type != 0) ? i : i + 1].setAttribute("class", options.qtable.colors.wrongcorrect); } else if (solutions[i] && answers[i] === "0"){ qrows[(type != 0) ? i : i + 1].setAttribute("class", options.qtable.colors.correctwrong); + } else if (type == 0 && answers[i] === "-") { + qrows[(type != 0) ? i : i + 1].setAttribute("class", options.qtable.colors.eithernone); } } } @@ -105,6 +109,8 @@ arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.wrongcorrect); } else if (solutions[i] && answers[i] === "0") { arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.correctwrong); + } else if (type == 0 && answers[i] === "-") { + arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.eithernone); } } //Count correct answers. diff --git a/src/multiple_choice/config.py b/src/multiple_choice/config.py index e0efc72..b4c0b8f 100644 --- a/src/multiple_choice/config.py +++ b/src/multiple_choice/config.py @@ -44,8 +44,8 @@ # default configurations # TODO: update version number before release -default_conf_local = {'version': "2.4.3"} -default_conf_syncd = {'version': "2.4.3"} +default_conf_local = {'version': "2.5.0"} +default_conf_syncd = {'version': "2.5.0"} def getSyncedConfig(): # Synced preferences diff --git a/src/multiple_choice/template.py b/src/multiple_choice/template.py index 1249e84..ac131f2 100644 --- a/src/multiple_choice/template.py +++ b/src/multiple_choice/template.py @@ -306,7 +306,8 @@ wrongwrong: 'correct', // Should be wrong and got marked as wrong correctcorrect: 'correct', // Should be correct and got marked as correct wrongcorrect: 'wrong', // Should be wrong but got marked as correct - correctwrong: 'wrong' // Should be correct but got marked as wrong + correctwrong: 'wrong', // Should be correct but got marked as wrong + eithernone: "wrong" // Kprim was marked neither correct nor wrong } }, atable: { @@ -316,7 +317,8 @@ wrongwrong: 'correct', // Should be wrong and got marked as wrong correctcorrect: 'correct', // Should be correct and got marked as correct wrongcorrect: 'wrong', // Should be wrong but got marked as correct - correctwrong: 'wrong' // Should be correct but got marked as wrong + correctwrong: 'wrong', // Should be correct but got marked as wrong + eithernone: "wrong" // Kprim was marked neither correct nor wrong } } } @@ -359,6 +361,8 @@ qrows[(type != 0) ? i : i + 1].setAttribute("class", options.qtable.colors.wrongcorrect); } else if (solutions[i] && answers[i] === "0"){ qrows[(type != 0) ? i : i + 1].setAttribute("class", options.qtable.colors.correctwrong); + } else if (type == 0 && answers[i] === "-") { + qrows[(type != 0) ? i : i + 1].setAttribute("class", options.qtable.colors.eithernone); } } } @@ -383,6 +387,8 @@ arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.wrongcorrect); } else if (solutions[i] && answers[i] === "0") { arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.correctwrong); + } else if (type == 0 && answers[i] === "-") { + arows[(type != 0) ? i : i + 1].setAttribute("class", options.atable.colors.eithernone); } } //Count correct answers.