merge with master

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/api/trainings.py

@@ -207,40 +207,49 @@ def get_training_statistics(training_id: str) -> (dict, int):
     """
     if not check_access({'_id': ObjectId(training_id)}):
         return {}, 404
+    
     training_db = TrainingsDBManager().get_training(training_id)
+
+
     presentation_file_id = training_db.presentation_file_id
     presentation_file_name = DBManager().get_file_name(presentation_file_id)
+
     if presentation_file_name is None:
         return {'message': 'No presentation file with presentation_file_id = {}.'.format(presentation_file_id)}, 404
-    presentation_record_file_id = training_db.presentation_record_file_id
-    training_status = training_db.status
-    audio_status = training_db.audio_status
-    presentation_status = training_db.presentation_status
+    
+
     slides_time = []
+    audio_status = training_db.audio_status
+    
     if audio_status == AudioStatus.PROCESSED:
         # here we need to process audio_slides
         audio = Audio.from_json_file(DBManager().get_file(training_db.audio_id))
         slides_time = proccess_training_slides_info(audio)
-    feedback = training_db.feedback
-    criteria_pack_id = training_db.criteria_pack_id
-    feedback_evaluator_id = training_db.feedback_evaluator_id
+
+
     remaining_processing_time_estimation, remaining_processing_time_estimation_code = \
         get_remaining_processing_time_by_training_id(training_id)
+    
     if remaining_processing_time_estimation['message'] != 'OK':
         return remaining_processing_time_estimation, remaining_processing_time_estimation_code
+    
+
     return {
         'message': 'OK',
+        'username': training_db.username,
+        'full_name': training_db.full_name,
+        'task_attempt_id': training_db.task_attempt_id,
         'presentation_file_id': str(presentation_file_id),
         'presentation_file_name': presentation_file_name,
-        'presentation_record_file_id': str(presentation_record_file_id),
-        'feedback': feedback,
-        'training_status': training_status,
+        'presentation_record_file_id': str(training_db.presentation_record_file_id),
+        'feedback': training_db.feedback,
+        'training_status': training_db.status,
         'audio_status': audio_status,
-        'presentation_status': presentation_status,
+        'presentation_status': training_db.presentation_status,
         'slides_time': slides_time,
         'remaining_processing_time_estimation': remaining_processing_time_estimation['processing_time_remaining'],
-        'criteria_pack_id': criteria_pack_id,
-        'feedback_evaluator_id': feedback_evaluator_id,
+        'criteria_pack_id': training_db.criteria_pack_id,
+        'feedback_evaluator_id': training_db.feedback_evaluator_id,
     }, 200
 
 
@@ -357,7 +366,7 @@ def get_training_information(current_training: Trainings) -> dict:
             'task_attempt_id': str(task_attempt_id),
             'task_id': str(task_attempt.task_id),
             'params_for_passback': task_attempt.params_for_passback,
-            "training_start_timestamp": ObjectId(str(_id)).generation_time.astimezone(pytz.timezone("Europe/Moscow")).replace(tzinfo=None),
+            "training_start_timestamp": ObjectId(str(_id)).generation_time.astimezone(pytz.timezone("Europe/Moscow")),
             'processing_start_timestamp': processing_start_timestamp,
             'processing_finish_timestamp': processing_finish_timestamp,
             'score': current_training.feedback.get('score', None),

app/routes/trainings.py

@@ -66,16 +66,13 @@ def view_training_statistics(training_id: str):
         verdict_str = ''
     training_status = training_statistics['training_status']
     training_status_str = TrainingStatus.russian.get(training_status, '')
-    if training_status_str:
-        training_status_str = '{}: {}'.format(t("Статус"), t(training_status_str))
+
     audio_status = training_statistics['audio_status']
     audio_status_str = AudioStatus.russian.get(audio_status, '')
-    if audio_status_str:
-        audio_status_str = '{}: {}'.format(t("Статус"), t(audio_status_str))
+
     presentation_status = training_statistics['presentation_status']
     presentation_status_str = PresentationStatus.russian.get(presentation_status, '')
-    if presentation_status_str:
-        presentation_status_str = '{}: {}'.format(t("Статус"), t(presentation_status_str))
+
     remaining_processing_time_estimation = training_statistics['remaining_processing_time_estimation']
     if remaining_processing_time_estimation and remaining_processing_time_estimation > 0:
         remaining_processing_time_estimation_str = '{}: {} с.'.format(t("Ожидаемое время обработки"),
@@ -88,6 +85,9 @@ def view_training_statistics(training_id: str):
         'training/statistics.html',
         title='{}: {}'.format(t("Статистика тренировки с ID"), training_id),
         training_id=training_id,
+        username=training_statistics['username'],
+        full_name=training_statistics['full_name'],
+        task_attempt_id=training_statistics['task_attempt_id'],
         presentation_file_id=training_statistics['presentation_file_id'],
         presentation_file_name=training_statistics['presentation_file_name'],
         presentation_record_file_id=training_statistics['presentation_record_file_id'],

app/static/css/index.css

@@ -7,8 +7,8 @@
     text-align: center;
 }
 
-.table > tr > td,
-.table > tr > th {
+.table tr > td,
+.table tr > th {
     border: 1px solid black;
     padding-left: 5px;
     padding-right: 5px;
@@ -17,7 +17,7 @@
 .button_action{
     padding: 10px 15px;
     background-color: #2f5cff;
-    border: 0;http://localhost:5000/show_all_trainings/?username=testing_session_id
+    border: 0;
     border-radius: 3px;
     color: white;
     font-size: 16px;

app/static/js/show_all_trainings.js

@@ -1,14 +1,14 @@
 function get_time_string(timestamp){
-    options = { weekday: 'short', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: '2-digit', second: '2-digit', timeZoneName: 'short' }
+    let options = {year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: '2-digit', second: '2-digit'}
     if (!isNaN(timestamp)) {
-        processing_time = new Date(timestamp);
+        let processing_time = new Date(timestamp);
         return processing_time.toLocaleString("ru-RU", options);
     } else {
         return "";
     }
 }
 
-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,23 @@ function buildTitleRow(columns) {
     return titleRowElement;
 }
 
+function recheck(trainingId){
+    fetch('/api/sessions/admin')
+    .then(response => response.json())
+    .then(res => {
+        if (res.admin) {
+            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

@@ -8,15 +8,43 @@
 {% block content %}
 <div class="base-container">
     <h3>{{ title }}</h3>
+    <h3>Связанные попытки: <a href="/task_attempts/{{task_attempt_id}}">{{ task_attempt_id }}</a></h3>
+
+    <h3>Логин студента: {{ username }}</h3>
+    <h3>{{ t("Дата создания тренировки") }}: {{ gen_time }}. </h3>
+
+    <h3>{{ remaining_processing_time_estimation }}</h3>
+
+    <table class="table">
+        <tr>
+            <th></th>
+            <th>Id</th>
+            <th>Статус</th>
+        </tr>
+        <tr>
+            <td><b>Тренировка</b></td>
+            <td>{{ training_id }}</td>
+            <td>{{ training_status }}</td>
+        </tr>
+        <tr>
+            <td><b>Презентация</b></td>
+            <td>{{ presentation_file_id }}</td>
+            <td>{{ presentation_status }}</td>
+        </tr>
+        <tr>
+            <td><b>Аудиозапись</b></td>
+            <td>{{ presentation_record_file_id }}</td>
+            <td>{{ audio_status }}</td>
+        </tr>
+    </table>
+
     <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>
-    <h3>{{ t("id тренировки") }}: {{ training_id }}. {{ training_status }}. </h3>
-    <h3>{{ t("Дата создания тренировки") }}: {{ gen_time }}. </h3>
-    <h3>{{ t("id презентации") }}: {{ presentation_file_id }}. {{ presentation_status }}</h3>
-    <h3>{{ t("Название презентации") }}: {{ presentation_file_name }}</h3>
-    <h3>{{ t("id аудиозаписи") }}: {{ presentation_record_file_id }}. {{ audio_status }}</h3>
+
+    <h3>{{ t("Название презентации") }}: <a href="/api/files/presentations/{{ presentation_file_id }}">{{ presentation_file_name }}</a></h3>
+
     <div id="next-training" style="visibility: hidden; font-size: 0">
         <h3 id="training-number"></h3>
         <h3 id="current-points"></h3>
@@ -32,8 +60,9 @@ <h3 id="current-points"></h3>
     <div>
         <canvas id="the-canvas" style="border: 1px solid #000000; direction: ltr;"></canvas>
     </div>
-    
+
     <audio id="presentation-record" controls src="/api/files/presentation-records/{{ presentation_record_file_id }}/"></audio>
+
     <table class="table transcription-table" id="per-slide-audio-transcription-table"></table>
 </div>
 <script src="{{ url_for('static', filename='js/libraries/jquery.min.js') }}"></script>