recheck buttons

Author: PeeachPie

app/api/sessions.py

@@ -3,15 +3,26 @@
 from flask import Blueprint, request, session
 
 from app.config import Config
-from app.lti_session_passback.auth_checkers import check_auth
+from app.lti_session_passback.auth_checkers import check_auth, is_admin
 from app.utils import DEFAULT_EXTENSION
 from packaging import version as version_util
 from ua_parser.user_agent_parser import Parse as user_agent_parse
 
 api_sessions = Blueprint('api_sessions', __name__)
 logger = get_root_logger()
 
+@api_sessions.route('/api/sessions/admin/', methods=['GET'])
+def get_session_admin():
+    """
+    Endpoint to return session is admin.
+
+    :return: Dictionary with admin status (is corrent user admin or not), and  'OK' message, or
+        or an empty dictionary with 404 HTTP code if access was denied.
+    """
 
+    if not check_auth():
+        return {}, 404
+    return {'admin': is_admin(), 'message': 'OK'}, 200
 
 @api_sessions.route('/api/sessions/info/', methods=['GET'])
 def get_session_info():

app/static/js/show_all_trainings.js

@@ -8,7 +8,7 @@ function get_time_string(timestamp){
     }
 }
 
-function buildCurrentTrainingRow(trainingId, trainingJson, is_Admin=false) {
+function buildCurrentTrainingRow(trainingId, trainingJson, isAdmin=false) {
 
     const currentTrainingRowElement = document.createElement("tr");
 
@@ -102,7 +102,7 @@ function buildCurrentTrainingRow(trainingId, trainingJson, is_Admin=false) {
     }
     currentTrainingRowElement.appendChild(recordingElement);
 
-    if (is_Admin) {
+    if (isAdmin) {
         const recheckingElement = document.createElement("td");
         const button = document.createElement("input")
         button.type = "button"
@@ -112,22 +112,11 @@ function buildCurrentTrainingRow(trainingId, trainingJson, is_Admin=false) {
         recheckingElement.appendChild(button);
         currentTrainingRowElement.appendChild(recheckingElement);
     }
-    return currentTrainingRowElement;
-}
 
-function recheck(trainingId){
-    console.log(`Start recheck for ${trainingId}`)
-    fetch(`/api/trainings/${trainingId}/`, {method: "POST"})
-    .then(response => response.json())
-    .then(innerResponseJson => {
-        if (innerResponseJson["message"] === "OK") {
-            window.open(`/trainings/statistics/${trainingId}/`);
-            //location.href = `/trainings/statistics/${trainingId}/`;
-        }
-    });
+    return currentTrainingRowElement;
 }
 
-function buildAllTrainingsTable(trainingsJson, is_Admin=false) {
+function buildAllTrainingsTable(trainingsJson) {
     if (trainingsJson["message"] !== "OK") return;
 
     const allTrainingsTable = document.getElementById("all-trainings-table");
@@ -148,16 +137,31 @@ function buildAllTrainingsTable(trainingsJson, is_Admin=false) {
         "Презентация",
         "Аудиозапись"
     ]
-    if (is_Admin) {titles.push('Запустить перепроверку')}
-    const titleRow = buildTitleRow(titles);
-    allTrainingsTable.appendChild(titleRow);
 
-    const arrayTrainings = trainingsJson.trainings; // Array of train from FETCH
+    fetch('/api/sessions/admin')
+    .then(response => response.json())
+    .then(responseJson => {
+        const isAdmin = responseJson.admin;
+        const arrayTrainings = trainingsJson.trainings; // Array of train from FETCH
+        
+        if (isAdmin) {
+            titles.push('Запустить перепроверку');
+        }
 
-    Object.keys(arrayTrainings).forEach(trainingId => {
-        const currentTrainingRowElement = buildCurrentTrainingRow(trainingId, arrayTrainings[trainingId], is_Admin);
-        allTrainingsTable.appendChild(currentTrainingRowElement);
-    });
+        const titleRow = buildTitleRow(titles);
+        allTrainingsTable.appendChild(titleRow);
+        
+        Object.keys(arrayTrainings).forEach(trainingId => {
+            const currentTrainingRowElement = buildCurrentTrainingRow(
+                trainingId, 
+                arrayTrainings[trainingId], 
+                isAdmin
+            );
+            
+            allTrainingsTable.appendChild(currentTrainingRowElement);
+        });
+    })
+    .catch(err => console.log(err));
 }
 
 const REF_PAGE_COUNT = document.getElementById('ref-page-count');
@@ -262,7 +266,7 @@ async function updateCountPage() {
     REF_BUTTON_TO_END.innerText = pageTotal;
 }
 
-function call_get_all_trainings({filters, admin=false, page = 0, count}) {
+function call_get_all_trainings({filters, page = 0, count}) {
     const query = new URLSearchParams({
         filters,
         count
@@ -272,5 +276,5 @@ function call_get_all_trainings({filters, admin=false, page = 0, count}) {
 
     return fetch(`/api/trainings?${query.toString()}`)
         .then(response => response.json())
-        .then(responseJson => buildAllTrainingsTable(responseJson, admin));
+        .then(responseJson => buildAllTrainingsTable(responseJson));
 }

app/static/js/training_statistics.js

@@ -3,15 +3,34 @@ function buildCurrentAttemptStatistics() {
     fetch(`/api/task-attempts/?training_id=${trainingId}`)
         .then(response => response.json())
         .then(response => {
+            fetch('/api/sessions/admin')
+                .then(response_admin => response_admin.json())
+                .then(responseJSON => {
+                    const isAdmin = responseJSON.admin;
+
+                    if (isAdmin) {
+                        const recheckBtn = $("#recheck-btn")[0];
+
+                        recheckBtn.addEventListener("click", () => {
+                            recheck(trainingId);
+                        })
+
+                        recheckBtn.style.visibility = 'visible';
+                    }
+                })
+
             let trainingNumber = response["training_number"];
             let attemptCount = response["attempt_count"];
+
             if (jQuery.isEmptyObject(response) || trainingNumber === attemptCount) {
                 return;
             }
+
             document.getElementById("training-number").textContent
                 = "Номер тренировки: " + response["training_number"] + " / " + response["attempt_count"];
             document.getElementById("current-points").textContent
                 = "Сумма баллов за предыдущие тренировки: " + response["current_points_sum"].toFixed(2);
+
             let next_training = document.getElementById("next-training");
             next_training.style.visibility = "visible";
             next_training.style.fontSize = "14pt";

app/static/js/utils.js

@@ -8,6 +8,18 @@ function buildTitleRow(columns) {
     return titleRowElement;
 }
 
+function recheck(trainingId){
+    console.log(`Start recheck for ${trainingId}`)
+    fetch(`/api/trainings/${trainingId}/`, {method: "POST"})
+    .then(response => response.json())
+    .then(innerResponseJson => {
+        if (innerResponseJson["message"] === "OK") {
+            window.open(`/trainings/statistics/${trainingId}/`);
+            //location.href = `/trainings/statistics/${trainingId}/`;
+        }
+    });
+}
+
 function strtobool(val, onError= false) {
     try {
         val = val.toLowerCase();

app/templates/training/statistics.html

@@ -9,6 +9,7 @@
 <div class="base-container">
     <h3>{{ title }}</h3>
     <h3 id="feedback">{{ feedback }}</h3>
+    <button id="recheck-btn" style="visibility: hidden;">Запустить перепроверку</button>
     <div id="criteria-results" style="margin-left: auto"></div>
     <div id="verdict"></div>
     <h3>{{ remaining_processing_time_estimation }}</h3>