From 2cff9522e618c66afd718d239a54e4974a6c4fd7 Mon Sep 17 00:00:00 2001
From: gtitov <gherman.s.titov@gmail.com>
Date: Mon, 5 Jun 2023 12:23:19 +0300
Subject: [PATCH] remove handwritten id

---
 gui/main.js            | 1 -
 main.py                | 2 +-
 questions.json         | 8 +-------
 questions_invalid.json | 8 +-------
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/gui/main.js b/gui/main.js
index e291500..7829398 100644
--- a/gui/main.js
+++ b/gui/main.js
@@ -1,4 +1,3 @@
-// REPLACE localhost WITH ACTUAL HOST IP
 document.addEventListener("DOMContentLoaded", function () {
     // console.log("ok")
     var students_selector = document.getElementById("students-selector")
diff --git a/main.py b/main.py
index 61554d7..9d9b4a0 100644
--- a/main.py
+++ b/main.py
@@ -27,7 +27,7 @@ app.add_middleware(  # CORS
 with open(QUESTIONS_FILE, "r", encoding="UTF-8") as f:
     questions_json = json.load(f)
     # TODO reassign questions id since mistakes are possible and checking is based on id
-    all_questions = questions_json["questions"]
+    all_questions = [{**q, "id": i} for i, q in enumerate(questions_json["questions"])]
     # if you want to use topics 1) filter all questions with topics 2) use topic questions to construct quiz_questions (when removing service keys from all_questions dict)
     # topics = ["теодолит"]  # move topics to VARIABLES
     # topics_questions = [q for q in all_questions if q.get("topic") in topics]
diff --git a/questions.json b/questions.json
index 61d3acd..9e9b22a 100644
--- a/questions.json
+++ b/questions.json
@@ -1,8 +1,7 @@
 {
-    "version": 1,
+    "version": 2,
     "questions": [
         {
-            "id": 1,
             "topic": "теодолит",
             "author": "GT",
             "question": "Что такое теодолит?",
@@ -16,28 +15,24 @@
             "answer": "Прибор для измерения углов"
         },
         {
-            "id": 2,
             "topic": "геометрия",
             "author": "GT",
             "question": "Сумма углов выпуклого пятиугольника составляет?",
             "answer": "540"
         },
         {
-            "id": 3,
             "topic": "нивелир",
             "author": "GT",
             "question": "Как называется прибор для измерения превышений?",
             "answer": "нивелир"
         },
         {
-            "id": 4,
             "topic": "теодолит",
             "author": "GT",
             "question": "Сколько винтов у теодолита?",
             "answer": "520"
         },
         {
-            "id": 5,
             "topic": "нивелир",
             "author": "GT",
             "question": "Что такое нивелир?",
@@ -50,7 +45,6 @@
             "answer": "Прибор для измерения углов"
         },
         {
-            "id": 6,
             "topic": "нивелир",
             "author": "GT",
             "question": "Что такое нивелир 2.0?",
diff --git a/questions_invalid.json b/questions_invalid.json
index c714d13..23e2000 100644
--- a/questions_invalid.json
+++ b/questions_invalid.json
@@ -1,8 +1,7 @@
 {
-    "version": 1,
+    "version": 2,
     "questions": [
         {
-            "id": 1,
             "topic": "теодолит",
             "author": "GT",
             "question": "Что такое теодолит?",
@@ -16,28 +15,24 @@
             "answer": "Прибор для измерения"
         },
         {
-            "id": 1,
             "topic": "геометрия",
             "author": "GT",
             "question": "Сумма углов выпуклого пятиугольника составляет?",
             "answer": "540"
         },
         {
-            "id": 3,
             "topic": "нивелир",
             "author": "GT",
             "question": "Как называется прибор для измерения превышений?",
             "answer": "нивелир"
         },
         {
-            "id": 4,
             "topic": "теодолит",
             "author": "GT",
             "question": "Сколько винтов у теодолита?",
             "answer": "520"
         },
         {
-            "id": 5,
             "topic": "нивелир",
             "author": "GT",
             "question": "Что такое нивелир?",
@@ -50,7 +45,6 @@
             "answer": "Прибор для измерения углов"
         },
         {
-            "id": 6,
             "topic": "нивелир",
             "author": "GT",
             "question": "Что такое нивелир 2.0?",