Compare commits

...

11 Commits

Author SHA1 Message Date
gtitov 3b4545f585 add
3 years ago
gtitov c3cdbba14b initial files to variables
3 years ago
gtitov e14834ac18 change: radio questions
3 years ago
gtitov 3d3039e8dd minor
3 years ago
gtitov 8ce14e0991 add: favicon
3 years ago
gtitov 25f483e5af local css
3 years ago
gtitov 2215d2afd3 local css
3 years ago
gtitov 1ef0e2967f add pictures folder
3 years ago
gtitov 2c0233a543 add gui
3 years ago
gtitov 3d2d415c5e add and edit stuff
3 years ago
gtitov 9d874ce014 msc
3 years ago

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 2.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

@ -0,0 +1,37 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="simple.css">
<script src="main.js"></script>
<title>Тестирование</title>
</head>
<body>
<header id="header">
<h1>Тестирование</h1>
<p>Получите тест</p>
</header>
<main id="main">
<p>Найдите себя и нажмите получить тест:</p>
<p>
<select id="students-selector">
<option value="" disabled selected>ФИО</option>
</select>
<button id="get-quiz" disabled>Получить тест</button>
</p>
<button id="end-quiz">Завершить тест для всех 😇</button>
</main>
<footer>
<p>кафедра картографии и геоинформатики c 💖 для 👩‍🎓</p>
</footer>
</body>
</html>

@ -0,0 +1,98 @@
document.addEventListener("DOMContentLoaded", function () {
// console.log("ok")
var students_selector = document.getElementById("students-selector")
var get_quiz_button = document.getElementById("get-quiz")
fetch("http://localhost:8000/students")
.then(r => r.json())
.then(students => {
students.forEach(student => {
students_selector.innerHTML += `<option value=${student.id}>${student.name}</option>`
})
students_selector.addEventListener("change", function (e) {
get_quiz_button.disabled = false
},
{ once: true }
)
})
get_quiz_button.addEventListener("click", function () {
// console.log(students_selector.value)
// console.log(students_selector.options[students_selector.selectedIndex].text)
fetch('http://localhost:8000/get_quiz?' + new URLSearchParams({
student_id: students_selector.value,
student: students_selector.options[students_selector.selectedIndex].text
}))
.then(r => r.json())
.then(quiz => {
// console.log(quiz)
var questions = quiz.questions
var questions_html = "<form id='form' onkeydown='return event.keyCode != 13;'>"
questions.forEach(q => {
console.log(q)
if (q.options) {
let options_div = ""
q.options.forEach(o => {
options_div += `<label for="${o}"><input type="radio" id="${o}" name="${q.id}" value="${o}">${o}</label>`
})
const question_div =
`<fieldset>
<legend>Выберите ответ:</legend>
${options_div}
</fieldset>`
questions_html +=
`<article>
<h3>${q.question}</h3>
${q.picture ? `<img src='${q.picture}'>` : ""}
${question_div}
</article>`
} else {
const question_div = `<input type="text" id="${q.id}" name="${q.id}">`
questions_html +=
`<article>
<h3>${q.question}</h3>
${q.picture ? `<img src='${q.picture}'>` : ""}
${question_div}
</article>`
}
})
// console.log(questions_html)
questions_html += "</form>"
document.getElementById("header").innerHTML = `<h1>Тестирование</h1><p>${students_selector.options[students_selector.selectedIndex].text}</p>`
document.getElementById("main").innerHTML = questions_html
var button = document.createElement('button');
button.innerHTML = 'Сдать';
button.onclick = function () {
const form = document.getElementById('form');
const formData = new FormData(form);
console.log(formData)
for (const [key, value] of formData) {
console.log(quiz)
console.log(`${key}: ${value}\n`) // assume questions are in the same order - can it make code simplier?
quiz.questions.find(q => q.id == key).student_answer = value
// console.log(quiz)
}
fetch('http://localhost:8000/save_student_answers?' + new URLSearchParams({
student_answers: JSON.stringify(quiz)
}))
document.getElementById("main").innerHTML = "<p>Тестирование окончено</p>"
};
// where do we want to have the button to appear?
// you can append it to another element just by doing something like
// document.getElementById('foobutton').appendChild(button);
document.getElementById("main").appendChild(button)
})
})
document.getElementById("end-quiz").addEventListener("click", function() {
let pass = window.prompt("Уважаемый преподаватель, введите пароль, чтобы завершить тестирование для всех", "Я здесь случайно")
// console.log(pass)
fetch('http://localhost:8000/end_quiz?' + new URLSearchParams({
password: pass
}))
.then(r => r.text())
.then(text => window.alert(text))
})
})

@ -0,0 +1,627 @@
/* Global variables. */
:root {
/* Set sans-serif & mono fonts */
--sans-font: -apple-system, BlinkMacSystemFont, "Avenir Next", Avenir,
"Nimbus Sans L", Roboto, "Noto Sans", "Segoe UI", Arial, Helvetica,
"Helvetica Neue", sans-serif;
--mono-font: Consolas, Menlo, Monaco, "Andale Mono", "Ubuntu Mono", monospace;
/* Default (light) theme */
--bg: #fff;
--accent-bg: #f5f7ff;
--text: #212121;
--text-light: #585858;
--border: #d8dae1;
--accent: #0d47a1;
--code: #d81b60;
--preformatted: #444;
--marked: #ffdd33;
--disabled: #efefef;
}
/* Dark theme */
@media (prefers-color-scheme: dark) {
:root {
color-scheme: dark;
--bg: #212121;
--accent-bg: #2b2b2b;
--text: #dcdcdc;
--text-light: #ababab;
--border: #666;
--accent: #ffb300;
--code: #f06292;
--preformatted: #ccc;
--disabled: #111;
}
/* Add a bit of transparency so light media isn't so glaring in dark mode */
img,
video {
opacity: 0.8;
}
}
/* Reset box-sizing */
*, *::before, *::after {
box-sizing: border-box;
}
/* Reset default appearance */
textarea,
select,
input,
progress {
appearance: none;
-webkit-appearance: none;
-moz-appearance: none;
}
html {
/* Set the font globally */
font-family: var(--sans-font);
scroll-behavior: smooth;
}
/* Make the body a nice central block */
body {
color: var(--text);
background-color: var(--bg);
font-size: 1.15rem;
line-height: 1.5;
display: grid;
grid-template-columns: 1fr min(45rem, 90%) 1fr;
margin: 0;
}
body > * {
grid-column: 2;
}
/* Make the header bg full width, but the content inline with body */
body > header {
background-color: var(--accent-bg);
border-bottom: 1px solid var(--border);
text-align: center;
padding: 0 0.5rem 2rem 0.5rem;
grid-column: 1 / -1;
}
body > header h1 {
max-width: 1200px;
margin: 1rem auto;
}
body > header p {
max-width: 40rem;
margin: 1rem auto;
}
/* Add a little padding to ensure spacing is correct between content and header > nav */
main {
padding-top: 1.5rem;
}
body > footer {
margin-top: 4rem;
padding: 2rem 1rem 1.5rem 1rem;
color: var(--text-light);
font-size: 0.9rem;
text-align: center;
border-top: 1px solid var(--border);
}
/* Format headers */
h1 {
font-size: 3rem;
}
h2 {
font-size: 2.6rem;
margin-top: 3rem;
}
h3 {
font-size: 2rem;
margin-top: 3rem;
}
h4 {
font-size: 1.44rem;
}
h5 {
font-size: 1.15rem;
}
h6 {
font-size: 0.96rem;
}
/* Prevent long strings from overflowing container */
p, h1, h2, h3, h4, h5, h6 {
overflow-wrap: break-word;
}
/* Fix line height when title wraps */
h1,
h2,
h3 {
line-height: 1.1;
}
/* Reduce header size on mobile */
@media only screen and (max-width: 720px) {
h1 {
font-size: 2.5rem;
}
h2 {
font-size: 2.1rem;
}
h3 {
font-size: 1.75rem;
}
h4 {
font-size: 1.25rem;
}
}
/* Format links & buttons */
a,
a:visited {
color: var(--accent);
}
a:hover {
text-decoration: none;
}
button,
[role="button"],
input[type="submit"],
input[type="reset"],
input[type="button"],
label[type="button"] {
border: none;
border-radius: 5px;
background-color: var(--accent);
font-size: 1rem;
color: var(--bg);
padding: 0.7rem 0.9rem;
margin: 0.5rem 0;
}
button[disabled],
[role="button"][aria-disabled="true"],
input[type="submit"][disabled],
input[type="reset"][disabled],
input[type="button"][disabled],
input[type="checkbox"][disabled],
input[type="radio"][disabled],
select[disabled] {
opacity: 0.5;
cursor: not-allowed;
}
input:disabled,
textarea:disabled,
select:disabled {
cursor: not-allowed;
background-color: var(--disabled);
}
input[type="range"] {
padding: 0;
}
/* Set the cursor to '?' while hovering over an abbreviation */
abbr {
cursor: help;
}
button:focus,
button:enabled:hover,
[role="button"]:focus,
[role="button"]:not([aria-disabled="true"]):hover,
input[type="submit"]:focus,
input[type="submit"]:enabled:hover,
input[type="reset"]:focus,
input[type="reset"]:enabled:hover,
input[type="button"]:focus,
input[type="button"]:enabled:hover,
label[type="button"]:focus,
label[type="button"]:hover {
filter: brightness(1.4);
cursor: pointer;
}
/* Format navigation */
header > nav {
font-size: 1rem;
line-height: 2;
padding: 1rem 0 0 0;
}
/* Use flexbox to allow items to wrap, as needed */
header > nav ul,
header > nav ol {
align-content: space-around;
align-items: center;
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: center;
list-style-type: none;
margin: 0;
padding: 0;
}
/* List items are inline elements, make them behave more like blocks */
header > nav ul li,
header > nav ol li {
display: inline-block;
}
header > nav a,
header > nav a:visited {
margin: 0 0.5rem 1rem 0.5rem;
border: 1px solid var(--border);
border-radius: 5px;
color: var(--text);
display: inline-block;
padding: 0.1rem 1rem;
text-decoration: none;
}
header > nav a:hover {
filter: brightness(1.4);
cursor: pointer;
}
/* Reduce nav side on mobile */
@media only screen and (max-width: 720px) {
header > nav a {
border: none;
padding: 0;
text-decoration: underline;
line-height: 1;
}
}
/* Consolidate box styling */
aside, details, pre, progress {
background-color: var(--accent-bg);
border: 1px solid var(--border);
border-radius: 5px;
margin-bottom: 1rem;
}
aside {
font-size: 1rem;
width: 30%;
padding: 0 15px;
margin-left: 15px;
float: right;
}
/* Make aside full-width on mobile */
@media only screen and (max-width: 720px) {
aside {
width: 100%;
float: none;
margin-left: 0;
}
}
article, fieldset {
border: 1px solid var(--border);
padding: 1rem;
border-radius: 5px;
margin-bottom: 1rem;
}
article h2:first-child,
section h2:first-child {
margin-top: 1rem;
}
section {
border-top: 1px solid var(--border);
border-bottom: 1px solid var(--border);
padding: 2rem 1rem;
margin: 3rem 0;
}
/* Don't double separators when chaining sections */
section + section,
section:first-child {
border-top: 0;
padding-top: 0;
}
section:last-child {
border-bottom: 0;
padding-bottom: 0;
}
details {
padding: 0.7rem 1rem;
}
summary {
cursor: pointer;
font-weight: bold;
padding: 0.7rem 1rem;
margin: -0.7rem -1rem;
word-break: break-all;
}
details[open] summary + * {
margin-top: 0;
}
details[open] summary {
margin-bottom: 0.5rem;
}
details[open] > :last-child {
margin-bottom: 0;
}
/* Format tables */
table {
border-collapse: collapse;
display: block;
margin: 1.5rem 0;
overflow: auto;
width: 100%;
}
td,
th {
border: 1px solid var(--border);
text-align: left;
padding: 0.5rem;
}
th {
background-color: var(--accent-bg);
font-weight: bold;
}
tr:nth-child(even) {
/* Set every other cell slightly darker. Improves readability. */
background-color: var(--accent-bg);
}
table caption {
font-weight: bold;
margin-bottom: 0.5rem;
}
/* Format forms */
textarea,
select,
input {
font-size: inherit;
font-family: inherit;
padding: 0.5rem;
margin-bottom: 0.5rem;
color: var(--text);
background-color: var(--bg);
border: 1px solid var(--border);
border-radius: 5px;
box-shadow: none;
max-width: 100%;
display: inline-block;
}
label {
display: block;
}
textarea:not([cols]) {
width: 100%;
}
/* Add arrow to drop-down */
select:not([multiple]) {
background-image: linear-gradient(45deg, transparent 49%, var(--text) 51%),
linear-gradient(135deg, var(--text) 51%, transparent 49%);
background-position: calc(100% - 15px), calc(100% - 10px);
background-size: 5px 5px, 5px 5px;
background-repeat: no-repeat;
padding-right: 25px;
}
/* checkbox and radio button style */
input[type="checkbox"],
input[type="radio"] {
vertical-align: middle;
position: relative;
}
input[type="radio"] {
border-radius: 100%;
}
input[type="checkbox"]:checked,
input[type="radio"]:checked {
background-color: var(--accent);
}
input[type="checkbox"]:checked::after {
/* Creates a rectangle with colored right and bottom borders which is rotated to look like a check mark */
content: " ";
width: 0.18em;
height: 0.32em;
border-radius: 0;
position: absolute;
top: 0.05em;
left: 0.17em;
background-color: transparent;
border-right: solid var(--bg) 0.08em;
border-bottom: solid var(--bg) 0.08em;
font-size: 1.8em;
transform: rotate(45deg);
}
input[type="radio"]:checked::after {
/* creates a colored circle for the checked radio button */
content: " ";
width: 0.25em;
height: 0.25em;
border-radius: 100%;
position: absolute;
top: 0.125em;
background-color: var(--bg);
left: 0.125em;
font-size: 32px;
}
/* Makes input fields wider on smaller screens */
@media only screen and (max-width: 720px) {
textarea,
select,
input {
width: 100%;
}
}
/* Ensures the checkbox and radio inputs do not have a set width like other input fields */
input[type="checkbox"],
input[type="radio"] {
width: auto;
}
/* Set a height for color input */
input[type="color"] {
height: 2.5rem;
padding: 0.2rem;
}
/* do not show border around file selector button */
input[type="file"] {
border: 0;
}
/* Misc body elements */
hr {
color: var(--border);
border-top: 1px;
margin: 1rem auto;
}
mark {
padding: 2px 5px;
border-radius: 4px;
background-color: var(--marked);
}
img,
video {
max-width: 100%;
height: auto;
border-radius: 5px;
}
figure {
margin: 0;
text-align: center;
}
figcaption {
font-size: 0.9rem;
color: var(--text-light);
margin-bottom: 1rem;
}
blockquote {
margin: 2rem 0 2rem 2rem;
padding: 0.4rem 0.8rem;
border-left: 0.35rem solid var(--accent);
color: var(--text-light);
font-style: italic;
}
cite {
font-size: 0.9rem;
color: var(--text-light);
font-style: normal;
}
dl {
display: grid;
grid-template-columns: auto 1fr;
}
dl dt {
grid-column-start: 1;
color: var(--text-light);
}
dl dd {
grid-column-start: 2;
}
/* Use mono font for code elements */
code,
pre,
pre span,
kbd,
samp {
font-family: var(--mono-font);
color: var(--code);
}
kbd {
color: var(--preformatted);
border: 1px solid var(--preformatted);
border-bottom: 3px solid var(--preformatted);
border-radius: 5px;
padding: 0.1rem 0.4rem;
}
pre {
padding: 1rem 1.4rem;
max-width: 100%;
overflow: auto;
color: var(--preformatted);
}
/* Fix embedded code within pre */
pre code {
color: var(--preformatted);
background: none;
margin: 0;
padding: 0;
}
/* Progress bars */
/* Declarations are repeated because you */
/* cannot combine vendor-specific selectors */
progress {
width: 100%;
}
progress:indeterminate {
background-color: var(--accent-bg);
}
progress::-webkit-progress-bar {
border-radius: 5px;
background-color: var(--accent-bg);
}
progress::-webkit-progress-value {
border-radius: 5px;
background-color: var(--accent);
}
progress::-moz-progress-bar {
border-radius: 5px;
background-color: var(--accent);
transition-property: width;
transition-duration: 0.3s;
}
progress:indeterminate::-moz-progress-bar {
background-color: var(--accent-bg);
}

@ -1,8 +1,12 @@
from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware # CORS
from fastapi.staticfiles import StaticFiles
import json
import random
from pathlib import Path
from datetime import datetime
from settings import WAVE, END_TEST_PASSWORD, QUIZ_LENGTH, QUESTIONS_FILE, STUDENTS_FILE
app = FastAPI()
@ -18,29 +22,17 @@ app.add_middleware( # CORS
allow_headers=["*"],
)
# student_answers_example = {
# "version": 1,
# "student": "asd",
# "attempt": 0,
# "questions": [
# {
# "id": 4,
# "question": "Сколько винтов у теодолита?",
# "student_answer": 100
# }
# ]
# }
# open files once and use variables after
with open("questions.json", "r", encoding="UTF-8") as f:
with open(QUESTIONS_FILE, "r", encoding="UTF-8") as f:
content = json.load(f)
all_questions = content["questions"]
topics = ["теодолит"]
topics_questions = [q for q in all_questions if q.get("topic") in topics]
topics_questions = all_questions # don't use topics for now. see next to lines to use topics
# topics = ["теодолит"] # move topics to VARIABLES
# topics_questions = [q for q in all_questions if q.get("topic") in topics]
remove_keys = ["author", "answer", "topic"]
quiz_questions = [{key: value for key, value in q.items() if key not in remove_keys} for q in topics_questions]
with open("students.json", "r", encoding="UTF-8") as f:
with open(STUDENTS_FILE, "r", encoding="UTF-8") as f:
content = json.load(f)
students = content["students"]
@ -59,6 +51,7 @@ def check_answers(student_answers: dict):
checked_answers["correct_percent"] = round(checked_answers["correct"] * 100 / len(checked_answers["questions"]))
return checked_answers
@app.get("/students")
def show_students():
return students
@ -74,19 +67,20 @@ def get_quiz(student_id, student: str):
Returns:
obj: json-like quiz
"""
quiz_length = 1
quiz_length = QUIZ_LENGTH
questions_for_student = random.sample(quiz_questions, len(quiz_questions))[:quiz_length] # random order and only first n questions
return {
"version": 1,
"student_id": student_id,
"student": student,
"attempt": 0, # TODO how to count attempts?
"wave": WAVE, # волна сдачи теста
"start_time": datetime.now().strftime("%Y-%m-%dT%H-%M-%S"),
"questions": questions_for_student
}
@app.get("/send_student_answers")
@app.get("/save_student_answers")
def send_student_answers(student_answers: str):
"""Save answers as-is and checked answers
"""Save answers as-is and check answers
Args:
student_answers (str): json-like string with student's answers
@ -95,12 +89,42 @@ def send_student_answers(student_answers: str):
str: student name
"""
json_answers = json.loads(student_answers)
print(json_answers)
path_to_answers = f'answers/{json_answers["student"]}_{json_answers["attempt"]}.json'
timestamp_str = datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
json_answers["end_time"] = timestamp_str
path_to_answers = f'answers/{json_answers["student"]}_{json_answers["wave"]}_{timestamp_str}.json'
with open(path_to_answers, 'w', encoding='utf-8') as f:
json.dump(json_answers, f, ensure_ascii=False)
path_to_results = f'results/{json_answers["student"]}_{json_answers["attempt"]}.json'
path_to_results = f'results/{json_answers["student"]}_{json_answers["wave"]}_{timestamp_str}.json'
with open(path_to_results, 'w', encoding='utf-8') as f:
json.dump(check_answers(json_answers), f, ensure_ascii=False) # TODO move checking to background?
return json_answers["student"]
return json_answers["student"]
@app.get("/end_quiz")
def end_test(password: str):
"""End test and save results to csv
Args:
password (str): password to end test
"""
if password == END_TEST_PASSWORD:
csv_string = "student,percent,start,end\n"
for file_in_results in Path("results").iterdir():
if file_in_results.is_file() and file_in_results.suffix == ".json":
print(file_in_results)
with open(file_in_results, "r", encoding="UTF-8") as f:
content = json.load(f)
csv_string += f"{content['student']},{content['correct_percent']},{content['start_time']},{content['end_time']}\n"
timestamp = datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
results_path = Path(f"results/results_{timestamp}.csv")
with open(results_path, "w", encoding='utf-8') as f:
f.write(csv_string)
return(f"Тестирование завершено. Сводные результаты сохранены в {results_path.resolve()}")
else:
return("Неверный пароль")
app.mount("/", StaticFiles(directory="gui", html = True), name="gui") # must be after method since it uses them
app.mount("/pictures", StaticFiles(directory="pictures"), name="pictures") # must be after method since it uses them

@ -20,7 +20,7 @@
"topic": "геометрия",
"author": "GT",
"question": "Сумма углов выпуклого пятиугольника составляет?",
"answer": 520
"answer": "540"
},
{
"id": 3,
@ -34,7 +34,7 @@
"topic": "теодолит",
"author": "GT",
"question": "Сколько винтов у теодолита?",
"answer": 520
"answer": "520"
}
]
}

@ -0,0 +1,6 @@
В командной строке (cmd, PowerShell)
```
pip install -r requirements.txt
uvicorn main:app
```

Binary file not shown.

@ -0,0 +1,5 @@
WAVE = 1
END_TEST_PASSWORD = "qwe"
QUIZ_LENGTH = 4
QUESTIONS_FILE = "questions.json"
STUDENTS_FILE = "students.json"
Loading…
Cancel
Save