Rebrush test result view for RfCs and external user statistics

Author: MrSerth

app/assets/stylesheets/request-for-comments.css.scss

@@ -57,48 +57,13 @@
   .testrun-assess-results {
 
     .testrun-container {
-      display: flex;
       margin-bottom: 10px;
 
       .testrun-output {
         overflow-x: auto;
         flex-grow: 1;
       }
     }
-
-    .result {
-      margin-right: 10px;
-      margin-top: 20px;
-      min-width: 10px;
-      max-width: 10px;
-      min-height: 10px;
-      max-height: 10px;
-    }
-
-    .passed {
-      border-radius: 50%;
-      background-color: var(--bs-success);
-      -webkit-box-shadow: 0 0 11px 1px rgba(var(--bs-success-rgb), 1);
-      -moz-box-shadow: 0 0 11px 1px rgba(var(--bs-success-rgb), 1);
-      box-shadow: 0 0 11px 1px rgba(var(--bs-success-rgb), 1);
-    }
-
-    .unknown {
-      border-radius: 50%;
-      background-color: var(--bs-warning);
-      -webkit-box-shadow: 0 0 11px 1px rgba(var(--bs-warning-rgb), 1);
-      -moz-box-shadow: 0 0 11px 1px rgba(var(--bs-warning-rgb), 1);
-      box-shadow: 0 0 11px 1px rgba(var(--bs-warning-rgb), 1);
-    }
-
-    .failed {
-      border-radius: 50%;
-      background-color: var(--bs-danger);
-      -webkit-box-shadow: 0 0 11px 1px rgba(var(--bs-danger-rgb), 1);
-      -moz-box-shadow: 0 0 11px 1px rgba(var(--bs-danger-rgb), 1);
-      box-shadow: 0 0 11px 1px rgba(var(--bs-danger-rgb), 1);
-    }
-
   }
 
   #mark-as-solved-button {

app/assets/stylesheets/statistics.css.scss

@@ -27,7 +27,7 @@
     margin-bottom: auto;
 }
 
-div.unit-test-result {
+div.deadline-result {
   float: left;
   margin-right: 10px;
   width: 10px;

app/views/exercises/external_users/statistics.html.slim

@@ -74,11 +74,16 @@ h1
                 td = this.cause
                 td = this.score
                 td.align-middle
-                  -this.testruns.sort_by {|t| [t.file&.name ? 0 : 1, t.file&.name] }.each do |run|
-                    - if run.passed
-                      .unit-test-result.positive-result title=[run.file&.filepath, run.log].join("\n").strip
+                  - this.testruns.sort_by {|t| [t.file&.filepath ? 0 : 1, t.file&.filepath] }.each do |run|
+                    - if run.passed.nil? # run
+                      span.text-warning
+                        i.fa-solid.fa-circle-play.me-2 aria-hidden='true' title=[run.file&.filepath, run.log].join("\n").strip
+                    - elsif run.passed
+                      span.text-success
+                        i.fa-solid.fa-circle-check.me-2 aria-hidden='true' title=[run.file&.filepath, run.log].join("\n").strip
                     - else
-                      .unit-test-result.unknown-result title=[run.file&.filepath, run.log].join("\n").strip
+                      span.text-danger
+                        i.fa-solid.fa-circle-xmark.me-2 aria-hidden='true' title=[run.file&.filepath, run.log].join("\n").strip
                 td = @working_times_until[event_index] if policy(@exercise).detailed_statistics?
               - elsif this.is_a? UserExerciseIntervention
                 td = this.created_at.strftime('%F %T')

app/views/exercises/statistics.html.slim

@@ -81,10 +81,10 @@ h1 = @exercise
                 - latest_user_submission = submissions.where(contributor:).final.latest
                 - if latest_user_submission.present?
                   - if latest_user_submission.before_deadline?
-                    .unit-test-result.positive-result
+                    .deadline-result.positive-result
                   - elsif latest_user_submission.within_grace_period?
-                    .unit-test-result.unknown-result
+                    .deadline-result.unknown-result
                   - elsif latest_user_submission.after_late_deadline?
-                    .unit-test-result.negative-result
+                    .deadline-result.negative-result
               td = us['runs'] if policy(@exercise).detailed_statistics?
               td = @exercise.average_working_time_for(contributor) || 0 if policy(@exercise).detailed_statistics?

app/views/external_users/statistics.html.slim

@@ -26,11 +26,11 @@ h1 = t('.title', user: @user.displayname)
                 - latest_viewable_submission = submissions.where(exercise:).final.latest
                 - if latest_viewable_submission.present?
                   - if latest_viewable_submission.before_deadline?
-                    .unit-test-result.positive-result.before_deadline
+                    .deadline-result.positive-result.before_deadline
                   - elsif latest_viewable_submission.within_grace_period?
-                    .unit-test-result.unknown-result.within_grace_period
+                    .deadline-result.unknown-result.within_grace_period
                   - elsif latest_viewable_submission.after_late_deadline?
-                    .unit-test-result.negative-result.after_late_deadline
+                    .deadline-result.negative-result.after_late_deadline
               td = stats['runs'] || 0 if policy(exercises.first).detailed_statistics?
               td = stats['working_time'] || 0 if policy(exercises.first).detailed_statistics?
 - else

app/views/request_for_comments/show.html.slim

@@ -42,15 +42,25 @@
             - output_runs.each do |testrun|
               pre = testrun.log || t('request_for_comments.no_output')
 
-        - assess_runs = testruns.select {|run| run.cause == 'assess' }
+        - assess_runs = testruns.select {|run| run.cause == 'assess' }.sort_by {|run| [run.file&.filepath ? 0 : 1, run.file&.filepath]}
         - unless current_user.admin?
           - assess_runs = assess_runs.select {|run| run.file.present? ? !run.file.hidden_feedback? : true }
         - if assess_runs.size.positive?
           h5.mt-4 = t('request_for_comments.test_results')
           .testrun-assess-results
             - assess_runs.each do |testrun|
               .testrun-container
-                div class="result #{testrun.passed ? 'passed' : 'failed'}"
+                .d-flex.justify-content-between
+                  h6
+                    - if testrun.passed
+                      span.text-success
+                        i.fa-solid.fa-circle-check.me-2 aria-hidden='true'
+                        => t('request_for_comments.passed') + ':'
+                    - else
+                      span.text-danger
+                        i.fa-solid.fa-circle-xmark.me-2 aria-hidden='true'
+                        => t('request_for_comments.failed') + ':'
+                    = testrun.file.filepath
                 .collapsed.testrun-output.text
                   span.fa-solid.fa-chevron-down.collapse-button
                   pre = testrun.log || t('request_for_comments.no_output')

config/locales/de/request_for_comment.yml

@@ -21,6 +21,7 @@ de:
     click_here: Zum Kommentieren auf die Seitenleiste klicken!
     comment_edited: bearbeitet
     comments: Kommentare
+    failed: Fehlgeschlagen
     howto: |
       Um Kommentare zu einer Programmzeile hinzuzufügen, kann einfach auf die jeweilige Zeilennummer auf der linken Seite geklickt werden. <br>
       Es öffnet sich ein Textfeld, in dem der Kommentar eingetragen werden kann. <br>
@@ -40,6 +41,7 @@ de:
     modal_title: Einen Kommentar in Zeile %{line} hinzufügen
     no_output: Keine Ausgabe.
     no_question: Der/die Autor:in hat keine Frage zu dieser Anfrage gestellt.
+    passed: Erfolgreich
     runtime_output: Programmausgabe
     send_thank_you_note: Senden
     show_all: Alle Anfragen anzeigen

config/locales/en/request_for_comment.yml

@@ -21,6 +21,7 @@ en:
     click_here: Click on this sidebar to comment!
     comment_edited: edited
     comments: Comments
+    failed: Failed
     howto: |
       To leave comments to a specific code line, click on the respective line number. <br>
       Enter your comment in the popup and save it by clicking "Comment this". <br>
@@ -40,6 +41,7 @@ en:
     modal_title: Add a comment to line %{line}
     no_output: No output.
     no_question: The author did not enter a question for this request.
+    passed: Passed
     runtime_output: Runtime Output
     send_thank_you_note: Send
     show_all: All requests