Merge pull request #433 from OSLL/428_training_page_info

Additional information on training page

Author: HadronCollider

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
 
 

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/templates/training/statistics.html

@@ -8,16 +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>
@@ -33,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>