update check formatting for tables / results

Author: HadronCollider

app/db/db_methods.py

@@ -210,7 +210,7 @@ def set_passbacked_flag(checks_id, flag):
     upd_check['$set']['is_passbacked'] = flag
     if not (flag is None):
         # None - if user without passback
-        upd_check['$set']['lms_passback_time'] = datetime.now()
+        upd_check['$set']['lms_passback_time'] = None
     check = checks_collection.update_one({'_id': checks_id}, upd_check)
     return check if check else None
 

app/server.py

@@ -17,6 +17,7 @@
 from flask_recaptcha import ReCaptcha
 
 import servants.user as user
+from app.utils import format_check_for_table
 from db import db_methods
 from db.db_types import Check
 from lti_session_passback.lti import utils
@@ -26,7 +27,7 @@
 from root_logger import get_logging_stdout_handler, get_root_logger
 from servants import pre_luncher
 from tasks import create_task
-from utils import checklist_filter, decorator_assertion, get_file_len, timezone_offset, format_check
+from utils import checklist_filter, decorator_assertion, get_file_len, format_check
 
 logger = get_root_logger('web')
 UPLOAD_FOLDER = '/usr/src/project/files'
@@ -35,7 +36,7 @@
     'report': {'doc', 'odt', 'docx'}
 }
 DOCUMENT_TYPES = {'Лабораторная работа', 'Курсовая работа', 'ВКР'}
-TABLE_COLUMNS = ['Solution', 'User', 'File', 'Pack', 'Check added', 'LMS date', 'Score']
+TABLE_COLUMNS = ['Solution', 'User', 'File', 'Criteria', 'Check added', 'LMS date', 'Score']
 
 app = Flask(__name__, static_folder="./../src/", template_folder="./templates/")
 app.config.from_pyfile('settings.py')
@@ -419,17 +420,7 @@ def check_list_data():
     # construct response
     response = {
         "total": count,
-        "rows": [{
-            "_id": str(item["_id"]),
-            "filename": item["filename"],
-            "criteria": item.get('criteria', ''),
-            "user": item["user"],
-            "lms-user-id": item["lms_user_id"] if item.get("lms_user_id") else '-',
-            "upload-date": (item["_id"].generation_time + timezone_offset).strftime("%d.%m.%Y %H:%M:%S"),
-            "moodle-date": item['lms_passback_time'].strftime("%d.%m.%Y %H:%M:%S") if item.get(
-                'lms_passback_time') else '-',
-            "score": item["score"]
-        } for item in rows]
+        "rows": [format_check_for_table(item) for item in rows]
     }
 
     # return json data
@@ -452,17 +443,7 @@ def get_query(req):
 
 def get_stats():
     rows, count = db_methods.get_checks(**get_query(request))
-    return [{
-        "_id": str(item["_id"]),
-        "filename": item["filename"],
-        "user": item["user"],
-        "lms-username": item["user"].rsplit('_', 1)[0],
-        "lms-user-id": item["lms_user_id"] if item.get("lms_user_id") else '-',
-        "upload-date": (item["_id"].generation_time + timezone_offset).strftime("%d.%m.%Y %H:%M:%S"),
-        "moodle-date": item['lms_passback_time'].strftime("%d.%m.%Y %H:%M:%S") if item.get(
-            'lms_passback_time') else '-',
-        "score": item["score"]
-    } for item in rows]
+    return [format_check_for_table(item) for item in rows]
 
 
 @app.route("/get_csv")

app/templates/check_list.html

@@ -48,7 +48,7 @@
                 <tr>
                     <th data-field="_id" data-width="160">Upload ID</th>
                     <th data-field="filename" data-filter-control="input" data-sortable="true">File name</th>
-                    <th data-field="criteria" data-filter-control="input" data-sortable="true">Criteria pack</th>
+                    <th data-field="criteria" data-sortable="true">Criteria pack</th>
                     {% if current_user.is_admin %}
                         <th data-field="user" data-filter-control="input" data-sortable="true">Username</th>
                         <th data-field="lms-user-id" data-sortable="false">User ID</th>

app/utils/__init__.py

@@ -1,7 +1,7 @@
 from .checklist_filter import checklist_filter
 from .converter import convert_to, open_file
 from .decorators import decorator_assertion
-from .formatters import format_check
+from .formatters import format_check, format_check_for_table
 from .get_file_len import get_file_len
 from .get_text_from_slides import get_text_from_slides
 from .parse_for_html import format_descriptions, format_header, find_tasks_on_slides_feedback, \

app/utils/formatters.py

@@ -8,3 +8,18 @@ def format_check(check):
     return (str(check['_id']), check['user'], check['filename'], check['criteria'],
             (check['_id'].generation_time + timezone_offset).strftime("%H:%M:%S - %b %d %Y"),
             grade_passback_ts, check['score'])
+
+
+def format_check_for_table(check):
+    return {
+        "_id": str(check["_id"]),
+        "filename": check["filename"],
+        "criteria": check.get("criteria", ''),
+        "user": check["user"],
+        "lms-username": check["user"].rsplit('_', 1)[0],
+        "lms-user-id": check["lms_user_id"] if check.get("lms_user_id") else '-',
+        "upload-date": (check["_id"].generation_time + timezone_offset).strftime("%d.%m.%Y %H:%M:%S"),
+        "moodle-date": check['lms_passback_time'].strftime("%d.%m.%Y %H:%M:%S") if check.get(
+            'lms_passback_time') else '-',
+        "score": check["score"]
+    }