Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ux: Make the matrix view more user friendly #375

Merged
merged 1 commit into from
Mar 24, 2024
Merged

ux: Make the matrix view more user friendly #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions lms/lmsweb/translations/he/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-03-23 18:51+0200\n"
"POT-Creation-Date: 2024-03-24 16:57+0200\n"
"PO-Revision-Date: 2024-03-23 18:59+0300\n"
"Last-Translator: Yam Mesicka\n"
"Language: he\n"
Expand All @@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.14.0\n"

#: lms/lmsdb/models.py:998
#: lms/lmsdb/models.py:1004
msgid "Fatal error"
msgstr "כישלון חמור"

Expand Down Expand Up @@ -312,8 +312,7 @@ msgstr "חמ\"ל תרגילים"
msgid "Name"
msgstr "שם"

#: lms/templates/status.html:13 lms/templates/submissions-table.html:38
#: lms/templates/user.html:47
#: lms/templates/status.html:13 lms/templates/user.html:47
msgid "Checked"
msgstr "נבדקו"

Expand All @@ -336,29 +335,39 @@ msgstr "ארכיון"
#: lms/templates/submissions-table.html:6
#, fuzzy
msgid "Submissions table"
msgstr "מצב הגשה"
msgstr "טבלת הגשות"

#: lms/templates/submissions-table.html:10 lms/templates/user.html:33
#: lms/templates/submissions-table.html:11 lms/templates/user.html:33
msgid "Exercise name"
msgstr "שם תרגיל"

#: lms/templates/submissions-table.html:31
#: lms/templates/submissions-table.html:32
msgid "By"
msgstr "על־ידי"

#: lms/templates/submissions-table.html:34 lms/templates/user.html:47
#: lms/templates/submissions-table.html:35 lms/templates/user.html:47
msgid "Submitted"
msgstr "הוגש"

#: lms/templates/submissions-table.html:36
#: lms/templates/submissions-table.html:37
#, fuzzy
msgid "Checking..."
msgstr "בבדיקה..."

#: lms/templates/submissions-table.html:40
#: lms/templates/submissions-table.html:39
#, fuzzy
msgctxt "past_tense"
msgid "Checked"
msgstr "נבדק"

#: lms/templates/submissions-table.html:41
msgid "Error? This is an old solution"
msgstr "שגיאה? זהו פתרון ישן"

#: lms/templates/submissions-table.html:62
msgid "Go to detailed status view"
msgstr "לעמוד המצב המפורט"

#: lms/templates/upload.html:7
msgid "Upload Notebooks"
msgstr "העלאת מחברות"
Expand Down
46 changes: 46 additions & 0 deletions lms/static/my.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,52 @@ code {
display: flex;
}

#page-status table {
width: 100%;
border-collapse: collapse;
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion (code_refinement): Consider using a more generic class name for future flexibility.

The class name 'waiting-for-check-cell' is very specific to the current use case. If the design or functionality changes, this name might not be appropriate. A more generic name could provide better flexibility for future changes.


#page-status table th,
#page-status table td {
padding: 0.75rem;
text-align: center;
vertical-align: middle;
border: 1px solid #dee2e6;

}

#page-status .table thead th {
background-color: #e9ecef;
font-weight: bold;
}

#page-status table a {
text-decoration: none;
color: #333;
}

#page-status table a:hover {
background-color: #f8f9fa;
}

#page-status .already-checked { color: #28a745; }
#page-status .in-the-checking { color: #ffc107; }
#page-status .waiting-for-check { color: #6c757d; }
#page-status .oh-no-error { color: #dc3545; }

#page-status .solution-assessment {
font-size: 0.9em;
margin-block-start: 0.5rem;
}

#page-status .fa {
margin-inline-end: 0.2rem;
}

#page-status .waiting-for-check-cell {
background-color: #fde2d2;
}

.btn-outline {
color: var(--color);
border-color: var(--color);
Expand Down
12 changes: 6 additions & 6 deletions lms/templates/submissions-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div id="status-head">
<h1>{{ _('Submissions table') }}</h1>
<div class="center">
<table class="table">
<table class="table text-center">
<thead>
<tr>
<th scope="col">{{ _('Exercise name') }}</th>
Expand All @@ -24,21 +24,21 @@ <h1>{{ _('Submissions table') }}</h1>
<th scope="row">{{ exercise.name | e }}</th>
{%- for user in users %}
{% set solution = solutions[(exercise.id, user.id)] %}
<td>
<td class="{% if solution.state == 'CREATED' %}waiting-for-check-cell{% endif %}">
{%- if solution.solution_id and solution.state is not none %}
<div class="link-to-solution">
<a
href="{{ url_for("check_solution", solution_id=solution.solution_id) }}"
title="{{ solution.submission_timestamp.strftime("%Y-%m-%d") }} {{ _("By") }} {{ solution.checker }}"
>
{% if solution.state == 'CREATED' %}
<i class="fa fa-check-square"></i> {{ _('Submitted') }}
<i class="fa fa-envelope waiting-for-check"></i> {{ _('Submitted') }}
{% elif solution.state == 'IN_CHECKING' %}
<i class="fa fa-spinner fa-pulse"></i> {{ _('Checking...') }}
<i class="fa fa-spinner fa-pulse in-the-checking"></i> {{ _('Checking...') }}
{% elif solution.state == 'DONE' %}
<i class="fa fa-thumbs-up"></i> {{ _('Checked') }}
<i class="fa fa-check-square already-checked"></i> {{ pgettext('past_tense', 'Checked') }}
{% elif solution.state == 'OLD_SOLUTION' %}
{{ _('Error? This is an old solution') }}
<i class="fa fa-exclamation-triangle oh-no-error"></i> {{ _('Error? This is an old solution') }}
{% elif solution.state is none %}
{% endif %}
</a>
Expand Down
Loading