diff --git a/app/assets/javascripts/manage_submissions.js b/app/assets/javascripts/manage_submissions.js
index 37a53f29..cd621ab3 100644
--- a/app/assets/javascripts/manage_submissions.js
+++ b/app/assets/javascripts/manage_submissions.js
@@ -44,14 +44,20 @@ $(document).ready(function () {
// Fetch data and render it in the modal
get_score_details(course_user_datum_id).then((data) => {
+ const sorting_icons =
+ ` swap_vert
+ arrow_upward
+ arrow_downward`;
const problem_headers = data.submissions[0].problems.map((problem) => {
const max_score = problem.max_score;
- const autograded = problem.grader_id < 0 ? " (Autograded)" : "";
- return `
- ${problem.name}
-
- ${max_score} ${autograded}
+ const autograded = data.autograded ? " (Autograded)" : "";
+ return ` |
+
+ ${problem.name}
+ ${sorting_icons}
+
+ ${max_score} ${autograded}
| `;
}).join('');
@@ -109,7 +115,10 @@ $(document).ready(function () {
${submission.problems.
map((problem) =>
- `${data.scores[submission.id][problem.id]?.['score']} | `
+ data.scores[submission.id] ?
+ `${data.scores[submission.id][problem.id]?.['score']} | `
+ :
+ `undefined | `
).join('')}
${submission.late_penalty}
@@ -131,11 +140,31 @@ $(document).ready(function () {
- Version No. |
- Submission Date |
- Final Score |
+
+
+ Version No.
+ ${sorting_icons}
+
+ |
+
+
+ Submission Date
+ ${sorting_icons}
+
+ |
+
+
+ Final Score
+ ${sorting_icons}
+
+ |
${problem_headers}
- Late Penalty |
+
+
+ Late Penalty
+ ${sorting_icons}
+
+ |
Tweak |
Actions |
diff --git a/app/assets/stylesheets/manage_submissions.css b/app/assets/stylesheets/manage_submissions.css
index 7f5983c5..6f30e2e7 100644
--- a/app/assets/stylesheets/manage_submissions.css
+++ b/app/assets/stylesheets/manage_submissions.css
@@ -1,7 +1,11 @@
-.modal-header {
- float: right;
- margin-bottom: 0;
- padding-bottom: 0;
+/* Score Popup */
+
+#modal-close {
+ font-size: 2rem;
+ position: absolute;
+ top: -35%;
+ right: 0;
+ padding: 0;
}
.score-details {
@@ -13,6 +17,40 @@
height: auto;
}
-.submissions-td {
- padding-left: 0.6rem !important;
+/* Table Header */
+
+#score-details-header {
+ position: relative;
+ margin-top: 0;
+}
+
+.score-styling {
+ font-weight: normal;
+ font-style: italic;
+ text-transform: none;
+}
+
+.sorting-th {
+ display: flex;
+ align-items: center;
+}
+
+/* Table Styling */
+
+.submissions-problem-bg {
+ background-color: #F2F2F2 !important;
+}
+
+table.prettyBorder tr:hover {
+ background-color: white;
+}
+
+/* Icons */
+
+.material-icons {
+ margin-left: 3px;
+}
+
+.i-no-margin {
+ margin-left: 0;
}
diff --git a/app/assets/stylesheets/style.css.scss b/app/assets/stylesheets/style.css.scss
index d61dafd5..e483f5c4 100644
--- a/app/assets/stylesheets/style.css.scss
+++ b/app/assets/stylesheets/style.css.scss
@@ -791,7 +791,6 @@ table.prettyBorder {
p {
margin: 0;
float: left;
- padding-right: 3px;
}
}
@@ -824,7 +823,7 @@ table.prettyBorder {
.submissions-td {
border: none;
border-bottom: 1px solid #ddd;
- padding: 5px 0 5px 0;
+ padding: 5px 0 5px 0.6rem;
}
.submissions-cbox-label {
@@ -1574,6 +1573,10 @@ table.sub td, th {
margin-left: 3px;
}
+i.left {
+ margin-right: 10px;
+}
+
.submissions-score-align {
display: flex;
align-items: center;
diff --git a/app/views/submissions/index.html.erb b/app/views/submissions/index.html.erb
index 541a8ae3..440008f9 100755
--- a/app/views/submissions/index.html.erb
+++ b/app/views/submissions/index.html.erb
@@ -124,7 +124,7 @@
<% if submission.filename then %>
- <%= link_to " zoom_in".html_safe,
+ <%= link_to " zoom_in".html_safe,
[:view, @course, @assessment, submission],
{:title=>"View the file for this submission",
:class=>"btn small"} %>
@@ -143,13 +143,13 @@
:method => :post,
:title=>"Rerun the autograder on this submission",
:class=>"btn small" do %>
- autorenew
+ autorenew
<% end %>
Regrade
<% end %>
- <%= link_to "delete_outline".html_safe,
+ <%= link_to "delete_outline".html_safe,
destroyConfirm_course_assessment_submission_path(@course, @assessment, submission),
{:title=>"Destroy this submission forever",
:class=>"btn small"} %>
@@ -162,12 +162,10 @@
|
|