Skip to content
Permalink
Browse files

separate score display from answered/unanswered

While trying to add in a "partially answered" state for questions, I
decided that separating score from answered/unanswered is the right
thing to do. This way, it's clearer which parts/questions you still need
to look at.

The part feedback box and the question selectors now have a line
underneath saying "answered/unanswered/partially answered". The score
line now always gives either the score or the total available, depending
on exam feedback settings.

If both "show current score" and "show maximum score" are turned off,
the score line shows "answered/unanswered/partially answered", and the
line below is not shown.

When answers are revealed, the current/max scores are shown, and the
answered-ness below.

fixes #543
  • Loading branch information...
christianp committed Jun 21, 2018
1 parent 3d9c454 commit 73a48565ad6a8dd00e8768d2ef663302fa1844f8
@@ -191,12 +191,11 @@
"question.answer submitted": "Answer submitted",
"question.score feedback.show": "Show feedback",
"question.score feedback.hide": "Hide feedback",
"question.score feedback.answered total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Answered.",
"question.score feedback.answered actual": "Score: {{scoreString}}",
"question.score feedback.ascore total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Answered.",
"question.score feedback.score actual": "Score: {{scoreString}}",
"question.score feedback.answered": "Answered.",
"question.score feedback.unanswered": "Unanswered.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Your answer is correct",
"question.score feedback.partial": "Your answer is partially correct",
"question.score feedback.wrong": "Your answer is incorrect",
@@ -191,12 +191,11 @@
"question.answer submitted": "Antwort eingereicht",
"question.score feedback.show": "Zeige Wertung",
"question.score feedback.hide": "Blende Wertung aus",
"question.score feedback.answered total actual": "Punktestand: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Beantwortet.",
"question.score feedback.answered actual": "Punktestand: {{scoreString}}",
"question.score feedback.score total actual": "Punktestand: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Beantwortet.",
"question.score feedback.score actual": "Punktestand: {{scoreString}}",
"question.score feedback.answered": "Beantwortet.",
"question.score feedback.unanswered": "Unbeantwortet.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Ihre Antwort ist richtig",
"question.score feedback.partial": "Ihre Antwort ist teilweise richtig",
"question.score feedback.wrong": "Ihre Antwort ist nicht richtig",
@@ -259,12 +259,13 @@
"question.unsubmitted changes_plural": "You have made changes to your answers but not submitted them. Please check your answers to each part and then press the <strong>Submit all parts</strong> button.",
"question.score feedback.show": "Show feedback",
"question.score feedback.hide": "Hide feedback",
"question.score feedback.answered total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Answered.",
"question.score feedback.answered actual": "Score: {{scoreString}}",
"question.score feedback.answered": "Answered.",
"question.score feedback.unanswered": "Unanswered.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.not marked": "Not marked",
"question.score feedback.unanswered": "Unanswered",
"question.score feedback.partially answered": "Partially answered",
"question.score feedback.answered": "Answered",
"question.score feedback.score total": "{{marksString}}",
"question.score feedback.score actual": "Score: {{scoreString}}",
"question.score feedback.score total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.correct": "Your answer is correct",
"question.score feedback.partial": "Your answer is partially correct",
"question.score feedback.wrong": "Your answer is incorrect",
@@ -215,12 +215,11 @@
"question.unsubmitted changes_plural": "You have made changes to your answers but not submitted them. Please check your answers to each part and then press the <strong>Submit all parts</strong> button.",
"question.score feedback.show": "Show feedback",
"question.score feedback.hide": "Hide feedback",
"question.score feedback.answered total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Answered.",
"question.score feedback.answered actual": "Score: {{scoreString}}",
"question.score feedback.score total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Answered.",
"question.score feedback.score actual": "Score: {{scoreString}}",
"question.score feedback.answered": "Answered.",
"question.score feedback.unanswered": "Unanswered.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Your answer is correct",
"question.score feedback.partial": "Your answer is partially correct",
"question.score feedback.wrong": "Your answer is incorrect",
@@ -191,12 +191,11 @@
"question.answer submitted": "Respuesta enviada",
"question.score feedback.show": "Mostrar Retroalimentación",
"question.score feedback.hide": "Ocultar Retroalimentación",
"question.score feedback.answered total actual": "Puntuación: {{score}}/{{marks}}",
"question.score feedback.answered total": "{{marksString}}. Respondida.",
"question.score feedback.answered actual": "Puntuación: {{scoreString}}",
"question.score feedback.score total actual": "Puntuación: {{score}}/{{marks}}",
"question.score feedback.score total": "{{marksString}}. Respondida.",
"question.score feedback.score actual": "Puntuación: {{scoreString}}",
"question.score feedback.answered": "Respondida.",
"question.score feedback.unanswered": "No Respondida.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Su respuesta es correcta",
"question.score feedback.partial": "Su respuesta es parcialmente correcta",
"question.score feedback.wrong": "Su respuesta es incorrecta",
@@ -191,12 +191,11 @@
"question.answer submitted": "Réponse envoyée.",
"question.score feedback.show": "Afficher la rétroaction",
"question.score feedback.hide": "Masquer la rétroaction",
"question.score feedback.answered total actual": "Résultat: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Répondu.\n",
"question.score feedback.answered actual": "Résultat: {{scoreString}}",
"question.score feedback.score total actual": "Résultat: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Répondu.\n",
"question.score feedback.score actual": "Résultat: {{scoreString}}",
"question.score feedback.answered": "Répondu.",
"question.score feedback.unanswered": "Sans réponse.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Votre réponse est correcte.",
"question.score feedback.partial": "Votre réponse est partiellement correcte",
"question.score feedback.wrong": "Votre réponse est incorrecte",
@@ -191,12 +191,11 @@
"question.answer submitted": "Answer submitted",
"question.score feedback.show": "Show feedback",
"question.score feedback.hide": "Hide feedback",
"question.score feedback.answered total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Answered.",
"question.score feedback.answered actual": "Score: {{scoreString}}",
"question.score feedback.score total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Answered.",
"question.score feedback.score actual": "Score: {{scoreString}}",
"question.score feedback.answered": "Answered.",
"question.score feedback.unanswered": "Unanswered.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Your answer is correct",
"question.score feedback.partial": "Your answer is partially correct",
"question.score feedback.wrong": "Your answer is incorrect",
@@ -191,12 +191,11 @@
"question.answer submitted": "Answer submitted",
"question.score feedback.show": "フィードバックを表示する",
"question.score feedback.hide": "フィードバックを隠す",
"question.score feedback.answered total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Answered.",
"question.score feedback.answered actual": "Score: {{scoreString}}",
"question.score feedback.score total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Answered.",
"question.score feedback.score actual": "Score: {{scoreString}}",
"question.score feedback.answered": "Answered.",
"question.score feedback.unanswered": "Unanswered.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "正解です",
"question.score feedback.partial": "部分的に正解です",
"question.score feedback.wrong": "間違いです",
@@ -191,12 +191,11 @@
"question.answer submitted": "Answer submitted",
"question.score feedback.show": "Show feedback",
"question.score feedback.hide": "Hide feedback",
"question.score feedback.answered total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Answered.",
"question.score feedback.answered actual": "Score: {{scoreString}}",
"question.score feedback.ascore total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Answered.",
"question.score feedback.score actual": "Score: {{scoreString}}",
"question.score feedback.answered": "Answered.",
"question.score feedback.unanswered": "Unanswered.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Your answer is correct",
"question.score feedback.partial": "Your answer is partially correct",
"question.score feedback.wrong": "Your answer is incorrect",
@@ -264,4 +263,4 @@
"ruleset.circular reference": "Circular reference in definition of ruleset <code>{{name}}</code>",
"ruleset.set not defined": "Ruleset {{name}} has not been defined",
"jme.evaluate.no scope given": "Numbas.jme.evaluate must be given a Scope"
}
}
@@ -191,12 +191,11 @@
"question.answer submitted": "Svaret er sendt inn",
"question.score feedback.show": "Vis vurdering",
"question.score feedback.hide": "Skjul vurdering",
"question.score feedback.answered total actual": "Poengsum: {{score}}/{{marks}}",
"question.score feedback.answered total": "{{marksString}}. Besvart.",
"question.score feedback.answered actual": "Poengsum: {{scoreString}}",
"question.score feedback.score total actual": "Poengsum: {{score}}/{{marks}}",
"question.score feedback.score total": "{{marksString}}. Besvart.",
"question.score feedback.score actual": "Poengsum: {{scoreString}}",
"question.score feedback.answered": "Besvart.",
"question.score feedback.unanswered": "Ubesvart.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Ditt svar er riktig",
"question.score feedback.partial": "Ditt svar er delvis riktig",
"question.score feedback.wrong": "Ditt svar er feil",
@@ -191,12 +191,11 @@
"question.answer submitted": "Antwoord verzonden",
"question.score feedback.show": "Geef feedback",
"question.score feedback.hide": "Verberg",
"question.score feedback.answered total actual": "Score: {{score}}/{{marks}}",
"question.score feedback.answered total": "{{marksString}}. Beantwoord.",
"question.score feedback.answered actual": "Score: {{scoreString}}",
"question.score feedback.score total actual": "Score: {{score}}/{{marks}}",
"question.score feedback.score total": "{{marksString}}. Beantwoord.",
"question.score feedback.score actual": "Score: {{scoreString}}",
"question.score feedback.answered": "Beantwoord.",
"question.score feedback.unanswered": "Niet gemaakt.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Je antwoord is goed",
"question.score feedback.partial": "Je antwoord is gedeeltelijk goed",
"question.score feedback.wrong": "Je antwoord is fout",
@@ -191,12 +191,12 @@
"question.answer submitted": "Answer submitted",
"question.score feedback.show": "Show feedback",
"question.score feedback.hide": "Hide feedback",
"question.score feedback.answered total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Answered.",
"question.score feedback.answered actual": "Score: {{scoreString}}",
"question.score feedback.score total actual": "Score: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Answered.",
"question.score feedback.score actual": "Score: {{scoreString}}",
"question.score feedback.answered": "Answered.",
"question.score feedback.unanswered": "Unanswered.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.score total": "{{marksString}}.",
"question.score feedback.correct": "Your answer is correct",
"question.score feedback.partial": "Your answer is partially correct",
"question.score feedback.wrong": "Your answer is incorrect",
@@ -191,12 +191,11 @@
"question.answer submitted": "Resposta enviada",
"question.score feedback.show": "Mostrar feedback",
"question.score feedback.hide": "Ocultar feedback",
"question.score feedback.answered total actual": "Pontuação: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Respondida.",
"question.score feedback.answered actual": "Pontuação: {{scoreString}}",
"question.score feedback.score total actual": "Pontuação: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Respondida.",
"question.score feedback.score actual": "Pontuação: {{scoreString}}",
"question.score feedback.answered": "Respondida.",
"question.score feedback.unanswered": "Não respondida.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Sua resposta está correta.",
"question.score feedback.partial": "Sua resposta está parcialmente correta.",
"question.score feedback.wrong": "Sua resposta está incorreta",
@@ -191,12 +191,11 @@
"question.answer submitted": "Përgjigja u dorëzua.",
"question.score feedback.show": "Paraqit vlerësim",
"question.score feedback.hide": "Fshih vlerësim",
"question.score feedback.answered total actual": "Vlerësimi: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Me përgjigje.",
"question.score feedback.answered actual": "Vlerësimi: {{scoreString}}",
"question.score feedback.score total actual": "Vlerësimi: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Me përgjigje.",
"question.score feedback.score actual": "Vlerësimi: {{scoreString}}",
"question.score feedback.answered": "Me përgjigje",
"question.score feedback.unanswered": "Pa përgjigje",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Përgjigja juaj është e saktë.",
"question.score feedback.partial": "Përgjigja juaj është pjesërisht e saktë",
"question.score feedback.wrong": "Përgjigja juaj është e gabuar",
@@ -191,12 +191,11 @@
"question.answer submitted": "Svar sparat",
"question.score feedback.show": "Visa Feedback",
"question.score feedback.hide": "Göm feedback",
"question.score feedback.answered total actual": "Poäng: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.answered total": "{{marksString}}. Besvarade.",
"question.score feedback.answered actual": "Poäng: {{scoreString}}",
"question.score feedback.score total actual": "Poäng: {{score,niceNumber}}/{{marks,niceNumber}}",
"question.score feedback.score total": "{{marksString}}. Besvarade.",
"question.score feedback.score actual": "Poäng: {{scoreString}}",
"question.score feedback.answered": "Besvarad.",
"question.score feedback.unanswered": "Obesvarad.",
"question.score feedback.unanswered total": "{{marksString}}.",
"question.score feedback.correct": "Ditt svar är korrekt",
"question.score feedback.partial": "Ditt svar är delvis korrekt",
"question.score feedback.wrong": "Ditt svar är inkorrekt",
@@ -114,6 +114,11 @@ img, object[type*="image"] {
.question-nav {
display: none;
}
.question-nav .marks {
display: inline;
vertical-align: middle;
font-weight: bold;
}
.navbar-btn {
white-space: normal;
}
@@ -254,17 +259,6 @@ input.jme {
overflow-x: hidden;
}

.marks {
display: inline;
vertical-align: middle;
}
.marks .score {
font-weight: bold;
}
.marks .feedback-icon {
margin-left: 0.5em;
}

.feedback-icon {
font-size: 1.2em;
display: inline-block;
@@ -344,28 +338,37 @@ input.jme {
padding: 10px 15px; /* copied from the nav > li > a style in bootstrap */
}

#questionList .questionSelector > a {
padding: 0.5em 0.3em;
}

.questionSelector .info {
display: flex;
}

.questionSelector .feedback-icon {
float: right;
padding: 0;
font-size: 1.5em;
flex-basis: 1.25em;
}
.questionSelector .score {
flex-grow: 1;
text-align: right;
}

.questionSelector .marks {
float: right;
}

.questionSelector .dirty-message {

.questionSelector .dirty-message,
.questionSelector .answered-state
{
text-align: right;
float: right;
font-size: 0.8em;
}
.questionSelector .dirty-message .warning-icon {
font-size: 18px;
margin: 0 0 0 0.3em;
}

.questionSelector .score {
float: right;
}

.questionList {
max-height: 20em;
@@ -496,6 +499,10 @@ table {
clear: both;
}

.part .feedback-icon {
margin-left: 0.5em;
}

.correct-answer {
vertical-align: bottom;
margin-left: 1em;
@@ -620,11 +627,11 @@ table {
margin: 0;
}

.part .feedbackMessages.out-of-date .out-of-date-message {
.part.dirty .feedbackMessages .out-of-date-message {
font-size: 0.9em;
font-style: italic;
}
.part .feedbackMessages.out-of-date .feedbackMessage {
.part.dirty .feedbackMessages .feedbackMessage {
opacity: 0.3;
}

@@ -654,6 +661,9 @@ table {
}

.part .marks {
text-align: right;
}
.part .marks .score {
font-weight: bold;
}

Oops, something went wrong.

0 comments on commit 73a4856

Please sign in to comment.
You can’t perform that action at this time.