Commit e4c93f07 authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch 'staging' into 'master'

wording

See merge request arsnova/frag.jetzt!542
parents ed342bb4 daf2a1a9
......@@ -34,7 +34,7 @@ fork
else (no)
:access session as guest;
endif
:open question board;
:open question list;
partition "Ask a question" {
repeat
:open "Ask a question!" window;
......@@ -52,7 +52,7 @@ end fork
|Lecturer|
end fork
if () then
:open question board;
:open question list;
partition "Highlight question" {
(A)
:review question;
......@@ -69,7 +69,7 @@ if () then
}
else
|Moderator|
:open question board;
:open question list;
partition "Highlight question" {
(B)
:review question;
......
......@@ -4,9 +4,9 @@
'border-notMarked': user !== undefined && comment.correct === 0 && comment.bookmark === false && comment.favorite === false && !comment.answer && comment.creatorId !== user.id,
'border-ownQuestion': user !== undefined && comment.creatorId === user.id && comment.correct === 0 && comment.bookmark === false && comment.favorite === false && !comment.answer,
'border-correct': comment.correct === 1,
'border-wrong': comment.correct === 2,
'border-wrong': comment.correct === 2,
'border-answer': comment.answer && comment.bookmark === false && comment.favorite === false,
'border-bookmark': comment.bookmark === true,
'border-bookmark': comment.bookmark === true,
'border-favorite': comment.favorite === true
}"
[@slide]="slideAnimationState"
......
......@@ -125,6 +125,7 @@ mat-card-content > :first-child {
.gavel {
color: var(--primary) !important;
transform: scale(1.5) !important;
}
.moderator {
......
......@@ -151,7 +151,7 @@
"send-description": "Frage abschicken",
"tag": "Tag",
"tag-reset": "Zurücksetzen",
"tag-to-filter": "Klick auf die Fragenkategorie, um Fragen dieser Kategorie zu filtern.",
"tag-to-filter": "Klick auf die Fragekategorie, um Fragen dieser Kategorie zu filtern.",
"user-number": "Klick auf die Nummer, um die Fragen dieses anonymen Fragenstellers zu filtern.",
"vote-down": "Frage abwerten",
"vote-up": "Frage aufwerten",
......@@ -282,14 +282,14 @@
"session-id": "Raum",
"session-id-copied": "Direktlink wurde in die Zwischenablage kopiert.",
"session-settings": "Sitzungsverwaltung",
"session-question-board": "Zum öffentlichen Fragenboard",
"session-question-board": "Zur öffentlichen Frageliste",
"session-moderation-board": "Zum Index der verbannten Fragen",
"settings-comment-moderation": "Fragen moderieren",
"settings-comment-moderation-description": "Du oder einer deiner Moderatoren können Fragen aus der Anzeige verbannen.",
"settings-direct-send": "Fragen unmoderiert veröffentlichen? ",
"settings-direct-send-description": "Jede Frage wird sofort veröffentlicht. Schalte diese Option ab, wenn du jede Frage einzeln freigeben willst.",
"sure": "Bist du sicher?",
"tag-new": "Neue Fragenkategorie:",
"tag-new": "Neue Fragekategorie:",
"tag-error": "Muss zwischen 3 und 30 Zeichen lang sein",
"tags": "Tags",
"threshold": "Schwellenwert für die Anzeige? ",
......
......@@ -60,7 +60,7 @@
"vote-asc": "Ascending votes",
"vote-desc": "Descending votes",
"wrong": "Marked as wrong",
"switch-to-comment-list": "Switch to public question board",
"switch-to-comment-list": "Switch to public question list",
"switch-to-moderation-list": "Switch to index",
"select-time": "Select time period",
"select-from-now": "Display questions from now on",
......@@ -283,7 +283,7 @@
"session-id": "Key",
"session-id-copied": "Session link was copied to the clipboard.",
"session-settings": "Session administration",
"session-question-board": "To the public question board",
"session-question-board": "To the public question list",
"session-moderation-board": "To the index of banned questions",
"settings-comment-moderation": "Moderate questions",
"settings-comment-moderation-description": "You or one of your moderators can ban questions from the display.",
......
......@@ -79,10 +79,10 @@
Man kann die Anzeige auch im »Kiosk-Modus« schalten:
Dann werden eingehende neue Fragen automatisch in Vollansicht gezeigt.
Der Wechsel zur nächsten Frage wird verzögert, um das Lesen zu ermöglichen.
Auf dem Fragenboard können laufend neue Fragen oder Bewertungen das Lesen und Präsentieren erschweren, da sich die Positionen der Fragen ändern.
Auf der Frageliste können laufend neue Fragen oder Bewertungen das Lesen und Präsentieren erschweren, da sich die Positionen der Fragen ändern.
Mit dem Pause-Icon kann der Fragenstrom eingefroren werden.
Neue Fragen oder Bewertungen sind aber weiterhin möglich.
Klickt der Vortragende auf eine Frage auf dem Fragenboard, erscheint diese in Vollansicht.
Klickt der Vortragende auf eine Frage in der Frageliste, erscheint diese in Vollansicht.
Gleichzeitig blitzt die Frage auf den Endgeräten aller Teilnehmenden auf, um deren Aufmerksamkeit zu bekommen.
</p>
<p>
......@@ -219,7 +219,7 @@
height="1200"
alt="Info-Poster zu frag.jetzt">
<h2 tabindex="0">Fragenboard aus Teilnehmersicht</h2>
<h2 tabindex="0">Frageliste aus Teilnehmersicht</h2>
<img tabindex=-1 src="/assets/images/participant.webp"
class="screenshot"
......@@ -245,7 +245,7 @@
<li>Frage stellen</li>
</ol>
<p tabindex="0">Obere Werkzeugleiste einer Fragenkarte</p>
<p tabindex="0">Obere Werkzeugleiste einer Fragekarte</p>
<ol tabindex="0">
<li>Zeitstempel der Frage</li>
<li>Dozent hat die Frage besprochen (Beamer-Icon)</li>
......@@ -254,7 +254,7 @@
<li>Die Frage wurde vom Dozenten oder Moderator mit einem Stern ausgezeichnet</li>
</ol>
<p tabindex="0">Untere Werkzeugleiste einer Fragenkarte</p>
<p tabindex="0">Untere Werkzeugleiste einer Fragekarte</p>
<ol tabindex="0">
<li>Fragen nach der Kategorie (Tag-Icon) filtern</li>
<li>Fragen einer bestimmten Person (User-Icon) filtern</li>
......
......@@ -90,10 +90,10 @@
You can also activate the display in "kiosk mode":
Then, incoming new questions are automatically shown in full view.
Switching to the next question is delayed to allow reading.
On the question board, constantly new questions or ratings can make reading and presenting difficult, as the positions of the questions change.
On the question list, constantly new questions or ratings can make reading and presenting difficult, as the positions of the questions change.
With the pause icon the question stream can be frozen.
However, new questions or ratings are still possible.
If the presenter clicks on a question on the question board, it appears in full view.
If the presenter clicks on a question in the question list, it appears in full view.
At the same time, the question flashes on the end devices of all participants to attract their attention.
</p>
......@@ -191,7 +191,7 @@
<ol>
<li>
<p>Mobile phone use during the lecture:</p>
<p>An assistant moderates the question board on site or from a distance.
<p>An assistant moderates the question list on site or from a distance.
10 minutes before the end of the lecture, the teacher answers 2-3 top questions on the beamer.
<br><br>
What if I don't have an assistant available?
......@@ -208,13 +208,13 @@
<p>No mobile phone use during the lecture:</p>
<p>The teacher creates a new session at the end of each lecture.
Students can ask and rate questions at home.
The question board is moderated by an assistant or the teacher himself.
The question list is moderated by an assistant or the teacher himself.
In the first 10 minutes of the next lecture the teacher answers 2-3 top questions.</p>
</li>
<li>
<p>No mobile phone use during the lecture:</p>
<p>The teacher creates a session for the entire duration of the course.
An assistant moderates the question board during the semester.
An assistant moderates the question list during the semester.
The teacher marks the relevant questions and deletes all others.
The question list thus serves to reflect on the lecture contents and to prepare for the exam.</p>
</li>
......@@ -237,7 +237,7 @@ alt="Info poster about frag. jetzt">
height="805"
alt="Question board from the view of a participant">
<p tabindex="0">Header of the question board</p>
<p tabindex="0">Header of the question list</p>
<div tabindex="0">
<ol>
<li>Back to previous page</li>
......@@ -247,10 +247,10 @@ alt="Info poster about frag. jetzt">
</ol>
</div>
<p tabindex="0">Toolbar of the question board</p>
<p tabindex="0">Toolbar of the question list</p>
<ol tabindex="0">
<li>Number of incoming questions</li>
<li>Browse question board</li>
<li>Browse question list</li>
<li>Sort questions</li>
<li>Filter questions</li>
<li>Stop question stream</li>
......@@ -345,7 +345,7 @@ alt="Info poster about frag. jetzt">
<p>As a student I now enter the room code or the link to the session.
I could ask a question right away. But first I want to bring the moderator of the question board into the game:
I could ask a question right away. But first I want to bring the moderator of the question list into the game:
I go to my session, open the settings and select the menu item "Questions".</p>
......@@ -356,9 +356,9 @@ alt="Info poster about frag. jetzt">
Now I have to add a moderator to my session:
To do this, I enter the email address with which he registered himself at frag.jetzt.
I register now as a moderator at the app and go into the session to be moderated.
In the lecture I go to the question board of the session in the role of moderator.
In the lecture I go to the question list of the session in the role of moderator.
and in the role of lecturer, waiting for questions from students.
As a moderator, I can ban unwanted or inappropriate questions from the question board.
As a moderator, I can ban unwanted or inappropriate questions from the question list.
I could also ban closed questions (to which I can answer yes or no) with the corresponding icons.
mark
and highlight particularly interesting questions with a star.
......@@ -368,7 +368,7 @@ alt="Info poster about frag. jetzt">
students.
I click on the question to do this.
The question is displayed in full view on the beamer and highlighted in the participants' browsers.
A moderator can only ban questions from the question board, not delete them. Only the lecturer can do that.</p>
A moderator can only ban questions from the question list, not delete them. Only the lecturer can do that.</p>
<p>All other functions, such as sorting and filtering questions or stopping the question stream,
you can find out in a playful way by placing two or three browsers next to each other on your laptop yourself
......
......@@ -72,16 +72,16 @@
"visited-sessions": "Sitzungen",
"question-wall": "Fragen präsentieren",
"room-qr": "Raum-Code",
"question-board": "Fragenboard",
"question-board": "Frageliste",
"bonustoken": "Vergebene Sterne",
"edit-moderator": "Moderatoren",
"edit-tags": "Tags",
"edit-tags": "Kategorien",
"export-questions": "Fragen speichern",
"delete-questions": "Fragen löschen",
"back-to-questionboard": "Fragenboard",
"back-to-questionboard": "Frageliste",
"moderationboard": "Zum Index",
"create-question": "Frage stellen",
"questionwall": "Fragenwand",
"questionwall": "Fragen-Fokus",
"fullscreen": "Vollansicht",
"motd": "News"
},
......
......@@ -73,16 +73,16 @@
"visited-sessions": "Sessions",
"question-wall": "Present questions",
"room-qr": "Key code",
"question-board": "Question board",
"question-board": "Question list",
"bonustoken": "Assigned Stars",
"edit-moderator": "Moderators",
"edit-tags": "Tags",
"export-questions": "Save questions",
"delete-questions": "Delete questions",
"back-to-questionboard": "Question board",
"back-to-questionboard": "Question list",
"moderationboard": "To the index",
"create-question": "Ask a question",
"questionwall": "Question wall",
"questionwall": "Question focus",
"fullscreen": "Fullscreen",
"motd": "News"
},
......
......@@ -127,7 +127,7 @@
"send-description": "Frage abschicken",
"tag": "Tag",
"tag-reset": "Zurücksetzen",
"tag-to-filter": "Klick auf die Fragenkategorie, um Fragen dieser Kategorie zu filtern.",
"tag-to-filter": "Klick auf die Fragekategorie, um Fragen dieser Kategorie zu filtern.",
"user-number": "Klick auf die Nummer, um die Fragen dieses anonymen Fragenstellers zu filtern.",
"vote-down": "Frage abwerten",
"vote-up": "Frage aufwerten",
......@@ -191,7 +191,7 @@
"time-period": "Zeitraum",
"filter-time": "Nach Zeitraum filtern",
"no-result": "",
"filter-user-count": "Anzahl Kommentare",
"filter-user-count": "Anzahl Fragen",
"back-lbl": "Zurück zur vorherigen Seite",
"sort-lbl": "Sortier-Menü anzeigen",
"sort-lbl-new": "Neueste Fragen zuerst anzeigen",
......
......@@ -172,9 +172,9 @@
},
"question-wall": {
"next-comment": "Next question",
"next-comment-icon": "keyboard_arrow_right",
"next-comment-icon": "navigate_next",
"prev-comment": "Previous question",
"prev-comment-icon": "keyboard_arrow_left",
"prev-comment-icon": "navigate_before",
"auto-renew-on": "Autofocus for new questions",
"auto-renew-on-icon": "highlight",
"auto-renew-off": "Switch off autofocus",
......
......@@ -2,13 +2,13 @@ With our innovative product "frag.jetzt" we want to conquer the market of audien
There are three roles in the app: "lecturer", "moderator" and "student". Each user can take one of the two roles "lecturer" or "student". The role "moderator" is assigned by the lecturer to users who have created an account by self-registration with e-mail confirmation and whose e-mail address is known to the lecturer for acceptance as a moderator. Like students, lecturers and moderators can also ask questions, which are then directed to the audience.
After entering the room code or by scanning the QR code of the session, students can ask their questions anonymously, read each other's questions and rate them with +1 or -1. The question board can be moderated. The lecturer can set a threshold for the release of a question, i.e. the rating at which a question is displayed on the question board. The threshold value can be set between -100 and 0 rating points.
After entering the room code or by scanning the QR code of the session, students can ask their questions anonymously, read each other's questions and rate them with +1 or -1. The question list can be moderated. The lecturer can set a threshold for the release of a question, i.e. the rating at which a question is displayed in the public question list. The threshold value can be set between -100 and 0 rating points.
The teacher can award bonus points for goal-oriented and lecture-related questions. Awarded questions receive a star icon and the student will find an 8-digit code ("token") for each acquired star on the session account. The tokens can be redeemed for bonus points by emailing the teacher.
Lecturers and moderators can affirm, deny, comment on, star or ban questions to the moderation board. Questions on the moderation board can also be released again. Only lecturers may delete questions, but only if they do not have a bonus star. If the lecturer has discussed a question in full view on the beamer, a beamer icon will appear on the question.
Every user can sort the question board according to the criteria "Newest question first" and "Descending or ascending by rating points". The board can be searched or the questions can be filtered. The following filter criteria are available: questions with a bonus star, questions discussed on the beamer, commented, affirmed or denied questions and questions that the user has asked. Furthermore, the question stream can be paused, i.e. new questions are only displayed when the user releases the question stream again.
Every user can sort the question list according to the criteria "Newest question first" and "Descending or ascending by rating points". The board can be searched or the questions can be filtered. The following filter criteria are available: questions with a bonus star, questions discussed on the beamer, commented, affirmed or denied questions and questions that the user has asked. Furthermore, the question stream can be paused, i.e. new questions are only displayed when the user releases the question stream again.
The teacher can define categories ("tags") for questions in the session settings. The student can then tag his or her question with one of the predefined categories. Categorized questions can be filtered by clicking the tag.
......
Supports Markdown
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