new columns in task attempt

Author: PeeachPie

app/api/task_attempts.py

@@ -9,6 +9,7 @@
 from app.utils import check_arguments_are_convertible_to_object_id, check_argument_is_convertible_to_object_id
 from app.localisation import t
 from app.status import PassBackStatus
+from app.api.trainings import get_training
 
 from app.mongo_models import TaskAttempts
 
@@ -62,19 +63,14 @@ def get_current_task_attempt() -> tuple[dict, int]:
 
 def get_task_attempt_information(task_attempt_db: TaskAttempts) -> dict:
     try:
-        is_passed_back = dict(task_attempt_db.is_passed_back)
-
-        for training_id, training_status in is_passed_back.items():
-            is_passed_back[training_id] = t(PassBackStatus.russian.get(training_status))
-
+        training_ids = task_attempt_db.training_scores.keys()
+        trainings = dict(zip(training_ids, map(get_training, training_ids)))
+        
         return {
             'message': 'OK',
             'task_id': str(task_attempt_db.task_id),
             'username': str(task_attempt_db.username),
-            'training_count': task_attempt_db.training_count,
-            'training_scores': dict(task_attempt_db.training_scores),
-            'is_passed_back': is_passed_back,
-            'params_for_passback': dict(task_attempt_db.params_for_passback)
+            'trainings': trainings,
         }
     except Exception as e:
         return {'message': '{}: {}'.format(e.__class__, e)}

app/routes/task_attempts.py

@@ -12,11 +12,6 @@
 routes_task_attempts = Blueprint('routes_task_attempts', __name__)
 logger = get_root_logger()
 
-def ch(tr_id):
-    print(tr_id)
-    print(check_access({'_id': ObjectId(tr_id)}), sep=" ")
-    print()
-    return check_access({'_id': ObjectId(tr_id)})
 
 @check_arguments_are_convertible_to_object_id
 @routes_task_attempts.route('/task_attempts/<task_attempt_id>/', methods=['GET'])
@@ -33,6 +28,8 @@ def view_task_attempt(task_attempt_id: str):
 
     task_attempt, task_attempt_status_code = get_task_attempt(task_attempt_id)
 
+    print(task_attempt)
+
     if task_attempt.get('message') != 'OK':
         return task_attempt, task_attempt_status_code
 
@@ -41,6 +38,5 @@ def view_task_attempt(task_attempt_id: str):
         task_attempt_id=task_attempt_id,
         task_id=task_attempt['task_id'],
         username=task_attempt['username'],
-        training_scores=task_attempt['training_scores'],
-        is_passed_back=task_attempt['is_passed_back'],
+        trainings=task_attempt['trainings'],
     ), 200

app/static/js/task_attempts.js

@@ -1,65 +1,93 @@
-function getTrainingsTable(trainingScores, isPassedBack) {
-    const trainingsTable = {}; 
-
-    Object.keys(trainingScores).forEach(trainingId => {
-        if (trainingsTable[trainingId] === undefined) {
-            trainingsTable[trainingId] = {};
-        }
-        trainingsTable[trainingId].score = trainingScores[trainingId];
-    });
-
-    Object.keys(isPassedBack).forEach(trainingId => {
-        if (trainingsTable[trainingId] === undefined) {
-            trainingsTable[trainingId] = {};
-        }
-        trainingsTable[trainingId].passedBackStatus = isPassedBack[trainingId];
-    });
-
-    return trainingsTable;
+const tableColomnHeaders = [
+    "№", "training_id", "start_timestamp", "training_status", "pass_back_status",  "score"
+];
+
+function get_time_string(timestampStr){
+    const timestamp = Date.parse(timestampStr);
+
+    options = { weekday: 'short', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: '2-digit', second: '2-digit', timeZoneName: 'short' }
+    if (!isNaN(timestamp)) {
+        processing_time = new Date(timestamp);
+        return processing_time.toLocaleString("ru-RU", options);
+    } else {
+        return "";
+    }
 }
 
 function createTableHeaderElement() {
-    const trainingIdHeaderElement = document.createElement("th");
-    trainingIdHeaderElement.innerHTML = "training_id";
-
-    const trainingScoreHeaderElement = document.createElement("th");
-    trainingScoreHeaderElement.innerHTML = "score";
-
-    const trainingStatusHeaderElement = document.createElement("th");
-    trainingStatusHeaderElement.innerHTML = "pass_back_status";
-
     const tableHeaderElement = document.createElement("tr");
 
-    tableHeaderElement.append(trainingIdHeaderElement, trainingScoreHeaderElement, trainingStatusHeaderElement);
+    tableColomnHeaders.forEach(colomnHeader => {
+        const tableColomnHeaderElement = document.createElement("th");
+        tableColomnHeaderElement.innerHTML = colomnHeader;
+
+        tableHeaderElement.appendChild(tableColomnHeaderElement);
+    });
 
     return tableHeaderElement;
 }
 
-function createTableRowElement(trainingInfo, trainingId) {
+function createTableRowElement() {
     const tableRowElement = document.createElement("tr");
 
-    const tableRowIdElement = document.createElement("td");
-    tableRowIdElement.innerHTML = `<a href="/trainings/statistics/${trainingId}/">${trainingId}</a>`;
+    const tableRow = {};
+
+    tableColomnHeaders.forEach(columnHeader => {
+        const tableCellElement = document.createElement("td");
+
+        tableRow[columnHeader] = tableCellElement;
+        tableRowElement.appendChild(tableCellElement);
+    });
 
-    const tableRowScoreElement = document.createElement("td");
-    tableRowScoreElement.innerHTML = trainingInfo.score ? trainingInfo.score.toFixed(2) : "none";
+    return [tableRowElement, tableRow];
+}
 
-    const tableRowStatusElement = document.createElement("td");
-    tableRowStatusElement.innerHTML = trainingInfo.passedBackStatus || "none";
+function TableRowFiller() {
+    let pos = 1;
 
-    tableRowElement.append(tableRowIdElement, tableRowScoreElement, tableRowStatusElement);
+    function fillTableRow(tableRow, training) {
+        tableRow["№"].innerHTML = pos++;
+        tableRow["training_id"].innerHTML = `<a href="/trainings/statistics/${training.id}/">${training.id}</a>`;
+        tableRow["start_timestamp"].innerHTML = get_time_string(training.training_start_timestamp);
+        tableRow["score"].innerHTML = training.score ? training.score.toFixed(2) : "none";
+        tableRow["training_status"].innerHTML = training.training_status;
+        tableRow["pass_back_status"].innerHTML = training.passedBackStatus || "none";
+    }
 
-    return tableRowElement;
+    return fillTableRow;
 }
 
-function showRelatedTrainingsTable(trainingScores, isPassedBack) {
-    const trainingsTable = getTrainingsTable(trainingScores, isPassedBack);
+function getSortedTrainingsList(trainings) {
+    const trainingsList = [];
+
+    Object.keys(trainings).forEach(trainingId => {
+        const training = trainings[trainingId];
+        training["id"] = trainingId;
+
+        trainingsList.push(training);
+    });
+
+    trainingsList.sort((a, b) => {
+        return Date.parse(a) - Date.parse(b);
+    });
+
+    return trainingsList;
+}
 
+function showRelatedTrainingsTable(trainings) {
     const tableElement = document.getElementById("related-trainings-table");
 
     tableElement.appendChild(createTableHeaderElement());
 
-    Object.keys(trainingsTable).forEach(trainingId => {
-        tableElement.appendChild(createTableRowElement(trainingsTable[trainingId], trainingId));
+    const trainingsList = getSortedTrainingsList(trainings);
+
+    const fillTableRow = TableRowFiller();
+
+    trainingsList.forEach(training => {
+        const [tableRowElement, tableRow] = createTableRowElement();
+
+        fillTableRow(tableRow, training);
+
+        tableElement.appendChild(tableRowElement);
     });
 }

app/templates/task_attempt.html

@@ -21,6 +21,6 @@ <h3>Связанные тренировки:</h3>
 <script src="{{ url_for('static', filename='js/libraries/jquery.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/task_attempts.js') }}"></script>
 <script type="text/javascript">
-    showRelatedTrainingsTable({{ training_scores|tojson|safe }}, {{ is_passed_back|tojson|safe }});
+    showRelatedTrainingsTable({{ trainings|tojson|safe }});
 </script>
 {% endblock %}