diff --git a/lms/lmstests/public/unittests/services.py b/lms/lmstests/public/unittests/services.py index 728f6c8a..4eb596ca 100644 --- a/lms/lmstests/public/unittests/services.py +++ b/lms/lmstests/public/unittests/services.py @@ -154,9 +154,10 @@ def _handle_failed_to_execute_tests(self, raw_results: bytes) -> None: def _handle_result( self, case_name: str, result: junitparser.Element, ) -> None: - message = ' '.join( - elem[1].replace('\n', '') - for elem in result._elem.items() + # Extract only the Assertion Message + message = '\n'.join( + msg_.partition("\n")[0].removeprefix("AssertionError: ") + for _type, msg_ in result._elem.items() ) self._logger.info( 'Create comment on test %s solution %s.', diff --git a/lms/lmsweb/translations/he/LC_MESSAGES/messages.po b/lms/lmsweb/translations/he/LC_MESSAGES/messages.po index e22afbcd..eebec578 100644 --- a/lms/lmsweb/translations/he/LC_MESSAGES/messages.po +++ b/lms/lmsweb/translations/he/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-03-29 05:54+0300\n" +"POT-Creation-Date: 2024-03-29 21:14+0300\n" "PO-Revision-Date: 2024-03-23 18:59+0300\n" "Last-Translator: Yam Mesicka\n" "Language: he\n" @@ -48,31 +48,31 @@ msgstr "הבודק האוטומטי נכשל ב־%(number)d דוגמאות בת msgid "Woah! Did you check your code?" msgstr "ווהו! בדקת את הקוד שלך?" -#: lms/lmsweb/views.py:183 +#: lms/lmsweb/views.py:181 msgid "Can not register now" msgstr "לא ניתן להירשם כעת" -#: lms/lmsweb/views.py:205 +#: lms/lmsweb/views.py:203 msgid "Registration successfully" msgstr "ההרשמה בוצעה בהצלחה" -#: lms/lmsweb/views.py:233 +#: lms/lmsweb/views.py:231 msgid "The confirmation link is expired, new link has been sent to your email" msgstr "קישור האימות פג תוקף, קישור חדש נשלח אל תיבת המייל שלך" -#: lms/lmsweb/views.py:252 +#: lms/lmsweb/views.py:250 msgid "Your user has been successfully confirmed, you can now login" msgstr "המשתמש שלך אומת בהצלחה, כעת אתה יכול להתחבר למערכת" -#: lms/lmsweb/views.py:277 lms/lmsweb/views.py:345 +#: lms/lmsweb/views.py:275 lms/lmsweb/views.py:343 msgid "Your password has successfully changed" msgstr "הסיסמה שלך שונתה בהצלחה" -#: lms/lmsweb/views.py:295 +#: lms/lmsweb/views.py:293 msgid "Password reset link has successfully sent" msgstr "קישור לאיפוס הסיסמה נשלח בהצלחה" -#: lms/lmsweb/views.py:321 +#: lms/lmsweb/views.py:319 msgid "Reset password link is expired" msgstr "הקישור לאיפוס הסיסמה פג תוקף" @@ -413,7 +413,7 @@ msgid "Checker" msgstr "בודק" #: lms/templates/user.html:37 lms/templates/view.html:25 -#: lms/templates/view.html:114 +#: lms/templates/view.html:118 msgid "Assessment" msgstr "הערכה מילולית" @@ -485,23 +485,23 @@ msgstr "סיסמה נוכחית" msgid "Finish Checking" msgstr "סיום בדיקה" -#: lms/templates/view.html:86 +#: lms/templates/view.html:88 msgid "Automatic Checking" msgstr "בדיקות אוטומטיות" #: lms/templates/view.html:93 -msgid "Error" -msgstr "כישלון" +msgid "Test failed" +msgstr "בדיקה נכשלה" -#: lms/templates/view.html:98 -msgid "Staff Error" -msgstr "כישלון סגל" +#: lms/templates/view.html:101 +msgid "Staff traceback" +msgstr "Traceback לצוות" -#: lms/templates/view.html:130 +#: lms/templates/view.html:134 msgid "Comments for this exercise" msgstr "הערות על התרגיל" -#: lms/templates/view.html:138 +#: lms/templates/view.html:142 msgid "Done Checking" msgstr "סיים לבדוק" diff --git a/lms/lmsweb/views.py b/lms/lmsweb/views.py index 76ae9bc1..1f344d09 100644 --- a/lms/lmsweb/views.py +++ b/lms/lmsweb/views.py @@ -3,7 +3,6 @@ import arrow # type: ignore from flask import ( - # Response, jsonify, make_response, render_template, @@ -40,7 +39,6 @@ ) from lms.lmsweb import ( babel, - # http_basic_auth, limiter, routes, webapp, diff --git a/lms/static/my.css b/lms/static/my.css index 5a724cf7..b76d4724 100644 --- a/lms/static/my.css +++ b/lms/static/my.css @@ -467,17 +467,24 @@ button.our-button-narrow, a.our-button-narrow { border-bottom-left-radius: 0.25rem; } -.code-view-container { +.code-review-container { position: relative; - direction: ltr; - text-align: left; height: min-content; display: flex; - overflow-x: hidden; - flex-flow: column wrap; + flex-direction: column; flex-basis: 70vw; flex-grow: 4; +} + +.code-view-container { border: 1px solid #e1e4e8; + direction: ltr; + display: flex; + flex-flow: column wrap; + margin-block-end: 2rem; + overflow-x: hidden; + text-align: left; + width: 100%; } #code-view { @@ -612,36 +619,98 @@ pre { } .test-results { - direction: rtl; - text-align: right; + font-family: Arial, sans-serif; + display: flex; + width: 100%; + flex-direction: column; + margin: auto; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); } -.test-result-title { +.test-results-header { + background-color: #F9FAFB; text-align: center; - text-decoration: underline; - margin-top: 20px; + color: #333; + padding: 0.5rem 0; + border-radius: 6px 6px 0 0; + font-size: 1.1rem; } .test-results-list { + list-style: none; padding: 0; + margin: 0; } .test-result { - padding: 10px; - margin: 5px 0; + background-color: #FFFFFF; + border-radius: 6px; + border: 1px solid #E2E8F0; display: flex; flex-direction: column; - border: 1px solid #c2bdbd; + padding: 1.5rem; + transition: box-shadow 0.2s ease; + width: 100%; } -.test-result .test-name { - border-bottom: 1px solid #c2bdbd; - margin-bottom: 12px; - padding-bottom: 6px; +.test-header { + display: flex; + justify-content: space-between; + align-items: center; +} + +.test-name { + font-weight: 600; + color: #1A202C; +} + +.test-status.failure { + background-color: #F56565; + border-radius: 12px; + color: #FFFFFF; + font-size: 0.85rem; + padding: 0.25rem 0.5rem; } -.test-result .title { +.error-description { + background-color: #F7FAFC; + border-radius: 4px; + color: #2D3748; + display: flex; + line-height: 1.5; + margin: 0.5rem 0; + padding: 0.75rem; +} + +.staff-failure .title { font-weight: bold; + display: flex; + margin-bottom: 5px; +} + +.stack-trace pre { + background-color: #EDF2F7; + color: #2D3748; + padding: 0.75rem; + border-radius: 4px; + overflow-x: auto; +} + +.stack-trace code { + width: 100%; + background-color: #F8F9FA; + color: #333; + padding: 10px; + border-radius: 4px; + display: flex; + flex-direction: column; + white-space: pre; +} + +@media (max-width: 768px) { + .test-result { + padding: 1rem; /* less padding on smaller screens */ + } } .stack-trace { @@ -809,7 +878,7 @@ code > code:last-of-type{ */ pre[class*="language-"] { /* Override prism.js */ - padding: 0 !important; + padding: 0.5rem !important; margin: 0 !important; } @@ -829,6 +898,10 @@ code#user-code { justify-content: start; cursor: pointer; width: 100%; + /* Nice trick: with flex-grow: 1; and width: 0; + * the line fits the container width + * */ + width: 0; flex-grow: 1; } diff --git a/lms/templates/view.html b/lms/templates/view.html index 5128675e..27edfd96 100644 --- a/lms/templates/view.html +++ b/lms/templates/view.html @@ -50,58 +50,62 @@

{{ _('Exercise view') }} {{ solution['exercise']['number'] }}: {{ solution[' {%- endif %}
-
-
-
{{ current_file.code.splitlines() | length }} lines
-
- {% if config.SHAREABLE_SOLUTIONS and not shared_url %} -
-
- +
+
+
+
{{ current_file.code.splitlines() | length }} lines
+
+ {% if config.SHAREABLE_SOLUTIONS and not shared_url %} +
+
+ +
+
+ + + +
-
- - - + {% endif -%} +
+
+ +
+
+
+
-
- {% endif -%} -
-
- -
-
-
-
-
-
- 
{% if current_file | language_name in image_extensions %}
{% else %}{{- current_file.code | trim(chars=' ') | e -}}{% endif %}
+
+ 
{% if current_file | language_name in image_extensions %}
{% else %}{{- current_file.code | trim(chars=' ') | e -}}{% endif %}
+
{% if test_results and not shared_url %} -
-

{{ _('Automatic Checking') }}

+
+
{{ _('Automatic Checking') }}
    {%- for test_result in test_results %}
  1. -
    - {{ test_result.pretty_test_name | e }} -
    - {{ _('Error') }}: - - 
    {{ test_result.user_message | e }}
    -     +
    + {{ _('Test failed') }}: + {{ test_result.pretty_test_name | e }} +
    +
    + {{ test_result.user_message | e }} +
    {% if is_manager %} - {{ _('Staff Error') }}: - - 
    {{ test_result.staff_message | e }}
    -     +
    + {{ _('Staff traceback') }}: + + 
    {{ test_result.staff_message | e }}
    +     +
    {% endif %}
    2. - {% endfor -%} + {% endfor %}
{% endif %} diff --git a/tests/test_exercise_unit_tests.py b/tests/test_exercise_unit_tests.py index c4b48e3d..69b61a5f 100644 --- a/tests/test_exercise_unit_tests.py +++ b/tests/test_exercise_unit_tests.py @@ -64,8 +64,7 @@ def _verify_comments(): first = auto_comments[0] assert first.exercise_test_name.test_name == 'test_check_bar_bar' assert first.exercise_test_name.pretty_test_name == 'שם כזה מגניב 2' - expected = ("AssertionError: איזה ברברון" - "assert 'bar' == 'barbaron' - barbaron + bar") + expected = "איזה ברברון" assert expected == first.user_message assert "foo('bar') == 'barbaron'" in first.staff_message