Commit 8fc5d5f2 authored by Samantha Monty's avatar Samantha Monty

correct distractor grading plain matching

parent a78c145b
......@@ -241,7 +241,7 @@ $border-radius: 6px;
list-style-type: none;
margin: 0 1em;
padding: 0.5em 0.6em 0.7em 2em;
border-radius: 6px;
border-radius: $border-radius;
&.solved {
display: block;
background-color: $tooltip;
......@@ -402,13 +402,17 @@ $border-radius: 6px;
text-align: var(--align-global);
height: inherit;
overflow: inherit;
// height: 550px;
// display: flex;
// flex-direction: column;
.matchDiv {
padding: 0.5em;
margin: 0.5em 0;
border-radius: 7px;
width: 100%;
border: 1px solid $solution;
justify-content: space-between;
// flex-grow: 9;
// overflow-y: scroll;
}
.matchDiv,
.matchItems {
......@@ -468,11 +472,6 @@ $border-radius: 6px;
}
.optList {
float: right;
&.correct p::before,
&.incorrect p.correct::before,
&.incorrect p.incorrect::before {
color: initial;
}
&.correct {
background-color: $right;
p {
......@@ -480,15 +479,27 @@ $border-radius: 6px;
&::after {
color: $right;
}
&::before {
color: initial;
}
}
}
&.incorrect {
background-color: $wrong;
p {
&.correct::before {
color: initial;
}
&.blank.correct::before,
&::after {
color: $wrong;
}
&.incorrect::before {
// background-color: $wrong;
// content: "✗ ";
// color: $red;
color: initial;
}
}
}
p {
......@@ -521,6 +532,10 @@ $border-radius: 6px;
&.selected.incorrect::before {
color: inherit;
}
// &.selected.incorrect::before {
// content: "✗ ";
// color: $red;
// }
&.correct-notSelected::before {
color: $right;
}
......
......@@ -928,8 +928,9 @@
.reveal .quiz-mi.plain,
.reveal .quiz-match-items.plain {
text-align: var(--align-global);
height: inherit;
overflow: inherit;
height: 550px;
display: flex;
flex-direction: column;
}
.reveal .qmi.plain .matchDiv,
......@@ -941,6 +942,8 @@
width: 100%;
border: 1px solid #eee;
justify-content: space-between;
flex-grow: 9;
overflow-y: scroll;
}
.reveal .qmi.plain .matchDiv,
......@@ -1053,16 +1056,6 @@
float: right;
}
.reveal .qmi.plain .optList.correct p::before, .reveal .qmi.plain .optList.incorrect p.correct::before, .reveal .qmi.plain .optList.incorrect p.incorrect::before,
.reveal .quiz-mi.plain .optList.correct p::before,
.reveal .quiz-mi.plain .optList.incorrect p.correct::before,
.reveal .quiz-mi.plain .optList.incorrect p.incorrect::before,
.reveal .quiz-match-items.plain .optList.correct p::before,
.reveal .quiz-match-items.plain .optList.incorrect p.correct::before,
.reveal .quiz-match-items.plain .optList.incorrect p.incorrect::before {
color: initial;
}
.reveal .qmi.plain .optList.correct,
.reveal .quiz-mi.plain .optList.correct,
.reveal .quiz-match-items.plain .optList.correct {
......@@ -1077,12 +1070,24 @@
color: #aaffaa;
}
.reveal .qmi.plain .optList.correct p::before,
.reveal .quiz-mi.plain .optList.correct p::before,
.reveal .quiz-match-items.plain .optList.correct p::before {
color: initial;
}
.reveal .qmi.plain .optList.incorrect,
.reveal .quiz-mi.plain .optList.incorrect,
.reveal .quiz-match-items.plain .optList.incorrect {
background-color: #ffaaaa;
}
.reveal .qmi.plain .optList.incorrect p.correct::before,
.reveal .quiz-mi.plain .optList.incorrect p.correct::before,
.reveal .quiz-match-items.plain .optList.incorrect p.correct::before {
color: initial;
}
.reveal .qmi.plain .optList.incorrect p.blank.correct::before, .reveal .qmi.plain .optList.incorrect p::after,
.reveal .quiz-mi.plain .optList.incorrect p.blank.correct::before,
.reveal .quiz-mi.plain .optList.incorrect p::after,
......@@ -1091,6 +1096,12 @@
color: #ffaaaa;
}
.reveal .qmi.plain .optList.incorrect p.incorrect::before,
.reveal .quiz-mi.plain .optList.incorrect p.incorrect::before,
.reveal .quiz-match-items.plain .optList.incorrect p.incorrect::before {
color: initial;
}
.reveal .qmi.plain .optList p,
.reveal .quiz-mi.plain .optList p,
.reveal .quiz-match-items.plain .optList p {
......
......@@ -304,7 +304,7 @@ function buildPlainMatch(question) {
matchItems.appendChild(matchQuestion);
const lab = document.createElement('label');
lab.setAttribute('data-bucketId', allBuckets[i].classList.contains('distractor') ? '0' : allBuckets[i].getAttribute('data-bucketId'));
lab.setAttribute('data-bucketId', allBuckets[i].classList.contains('distractor') ? "" : allBuckets[i].getAttribute('data-bucketId'));
lab.innerHTML = allBuckets[i].innerHTML;
const blank = document.createElement('p');
......
......@@ -308,6 +308,49 @@ lectureId: cg1
topic: yeah
```
# Matching 5 - Plain
## Question text {.qmi .plain}
Das unmarkierte Quadrat unten links im Bild ist mit einer Textur (blauer
Pfeil, oranger Pfeil) versehen. Die Texturkoordinaten wurden für dieses
Quadrat *nicht* transformiert.
Die Quadrate 1 bis 5 zeigen dieselbe Textur, allerdings mit transformierten
Texturkoordinaten. Geben Sie jeweils die verwendete, unter Umständen
zusammengesetzte, Transformation für diese 5 Quadrate an.
Bild 1
: Rz(180)
Bild 2
: Sxy(1, -1)
Bild 3
: Sxy(3, 3)
Bild 4
: Sxy(0.5, 0.5) Txy(0.5, 0.5)
Bild 5
: Rz(-45)Txy(0.5, 0.5)
!
: Sxy(-1,1)
!
: Sxy(0.3, 0.3)
!
: Sxy(-1,1) Txy(0.5, 0.5)
!
: Rz(45)
Bild 6
: !
# Blanktext/Inserting MC
Like multiple-choice, however, the choices are shown as drop-down lists embedded inside the text. Hence, beware of the whitespaces below.
......@@ -424,7 +467,7 @@ Points: 5
# Free text alternative
However, to have only one syntax to remember I propose we also accept this alternative form below. It would also allow us to use the comments to have almost right/wrong answers which we comment to the users. All we need here is a way to specify cases and a default. Saying this, if we add context dependent reg expressions to the matching list, that would be great for the utility, i.e., everything which matches but which is not in the already given list before, see:
This alternate forms allows you to define free-text questions as lists without brackets. All answers are correct.
# Free Text Alternative 1 - Fancy
......@@ -433,16 +476,14 @@ However, to have only one syntax to remember I propose we also accept this alter
Das Ergebnis von $2*2=~?$ ist?
- [X] 4
- 4
- Die perfekte Lösung
- [X] vier
- vier
- Auch ok
- [X] four
- four
- Deutscher Studiengang
- [ ] fier
- fier
- RTL, no not really?
- [ ] *
- ganz falsch, so oder so?
```yaml
Points: 5
......@@ -454,20 +495,17 @@ Points: 5
Das Ergebnis von $2*2=~?$ ist?
- [X] 4
- 4
- Die perfekte Lösung
- [X] vier
- vier
- Auch ok
- [X] four
- four
- Deutscher Studiengang
- [ ] fier
- fier
- RTL, no not really?
- [ ] *
- ganz falsch, so oder so?
```yaml
Points: 5
Points:
```
# fenced divs syntax
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment