From 312ab26815dfa5a0395a7f91566c3dd4071fb3c7 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Thu, 4 Jan 2024 14:23:22 +0100 Subject: [PATCH 01/12] Always show navigation on submission pages --- .../stylesheets/models/submissions.css.scss | 1 + app/views/feedbacks/_score_link.html.erb | 23 ++++++++----------- app/views/feedbacks/_score_table.html.erb | 4 ++-- app/views/submissions/_description.html.erb | 13 ++++------- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/models/submissions.css.scss b/app/assets/stylesheets/models/submissions.css.scss index 51aa436171..78dac1c213 100644 --- a/app/assets/stylesheets/models/submissions.css.scss +++ b/app/assets/stylesheets/models/submissions.css.scss @@ -511,6 +511,7 @@ iframe.file { .score-details { padding-bottom: 10px; + padding-top: 10px; } .submission-history { diff --git a/app/views/feedbacks/_score_link.html.erb b/app/views/feedbacks/_score_link.html.erb index fc70ce6a64..2534824f0b 100644 --- a/app/views/feedbacks/_score_link.html.erb +++ b/app/views/feedbacks/_score_link.html.erb @@ -5,21 +5,18 @@ %> <% total = policy(feedback.evaluation_exercise).show_total? %> <% scores = policy_scope(feedback.scores) %> -<% if total && feedback.score_items.present? %> +<% if (total && feedback.score_items.present?) || scores.present? %> <%= link_to "#score-details-#{feedback.id}", - class: 'toggleable-icon', + class: 'toggleable-icon btn with-icon btn-outline', + 'aria-expanded': 'true', title: t("feedbacks.score_link.view_breakdown"), data: { 'bs-toggle': "collapse" } do %> - <%= t("feedbacks.score_link.score", score: format_score(feedback.score), max: format_score(feedback.maximum_score)) %> - - - <% end %> -<% elsif scores.present? %> - <%= link_to "#score-details-#{feedback.id}", - class: 'toggleable-icon', - title: t("feedbacks.score_link.view_breakdown"), data: { 'bs-toggle': "collapse" } do %> - <%= t("feedbacks.score_link.present", count: scores.length) %> - - + + + <% if total && feedback.score_items.present? %> + <%= t("feedbacks.score_link.score", score: format_score(feedback.score), max: format_score(feedback.maximum_score)) %> + <% else %> + <%= t("feedbacks.score_link.present", count: scores.length) %> + <% end %> <% end %> <% end %> <%# Link to edit screen if needed %> diff --git a/app/views/feedbacks/_score_table.html.erb b/app/views/feedbacks/_score_table.html.erb index 224003180e..2a861a84c3 100644 --- a/app/views/feedbacks/_score_table.html.erb +++ b/app/views/feedbacks/_score_table.html.erb @@ -10,7 +10,7 @@ "> <% end %> - <%= format_score feedback.score %> / <%= format_score feedback.maximum_score %> + <%= format_score feedback.score %> / <%= format_score feedback.maximum_score %> <% end %> <% scores.each do |score| %> @@ -23,7 +23,7 @@
<%= score.score_item.description %> - <%= format_score score.score %> / <%= format_score score.score_item.maximum %> + <%= format_score score.score %> / <%= format_score score.score_item.maximum %> <% end %> diff --git a/app/views/submissions/_description.html.erb b/app/views/submissions/_description.html.erb index 0ef68b63f4..31266388e3 100644 --- a/app/views/submissions/_description.html.erb +++ b/app/views/submissions/_description.html.erb @@ -47,7 +47,6 @@ <%= time_ago_in_words submission.created_at %> <%= t "submissions.show.ago" %> - <% if @feedbacks.blank? %>
<% @submissions_time_stamps.each do |t| %> @@ -71,22 +70,18 @@ <% end %>
- <% else %> -
+
<% @feedbacks.each do |feedback| %> <%= render 'feedbacks/score_link', feedback: feedback %> +
"> + <%= render 'feedbacks/score_table', feedback: feedback %> +
<% end %>
- <% end %>
-<% @feedbacks.each do |feedback | %> -
"> - <%= render 'feedbacks/score_table', feedback: feedback %> -
-<% end %> <% unless submission.queued? or submission.running? %> <%= submission.judge.renderer.new(submission, current_user).parse %> From f260274bc482d8186ec82264523a7da41c42d487 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Thu, 4 Jan 2024 14:31:13 +0100 Subject: [PATCH 02/12] Fix order of elements --- app/views/submissions/_description.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/submissions/_description.html.erb b/app/views/submissions/_description.html.erb index 31266388e3..4112244ae4 100644 --- a/app/views/submissions/_description.html.erb +++ b/app/views/submissions/_description.html.erb @@ -70,16 +70,16 @@ <% end %> -
- <% @feedbacks.each do |feedback| %> + <% @feedbacks.each do |feedback| %> +
<%= render 'feedbacks/score_link', feedback: feedback %>
"> <%= render 'feedbacks/score_table', feedback: feedback %>
- <% end %> -
+
+ <% end %> From bdef7fb454e36f504d9de955118c8151375acf85 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Thu, 4 Jan 2024 14:31:33 +0100 Subject: [PATCH 03/12] Fix indent --- app/views/submissions/_description.html.erb | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/app/views/submissions/_description.html.erb b/app/views/submissions/_description.html.erb index 4112244ae4..9ac97a945e 100644 --- a/app/views/submissions/_description.html.erb +++ b/app/views/submissions/_description.html.erb @@ -47,29 +47,29 @@ <%= time_ago_in_words submission.created_at %> <%= t "submissions.show.ago" %> -
-
- <% @submissions_time_stamps.each do |t| %> - <%= t %> -
- <% end %> -
-
- <% @submissions.each_with_index do |s, i| %> - - <%= link_to "##{@submissions.length - i}", submission_path(s), class: 'submission-link' %> - <%= submission_status_icon(s, 12) %> - - <%= Submission.human_enum_name(:status, s.status) %> - <% if s.summary.present? and s.summary.downcase != Submission.human_enum_name(:status, s.status).downcase %> - · <%= s.summary %> - <% end %> - +
+
+ <% @submissions_time_stamps.each do |t| %> + <%= t %> +
+ <% end %> +
+
+ <% @submissions.each_with_index do |s, i| %> + + <%= link_to "##{@submissions.length - i}", submission_path(s), class: 'submission-link' %> + <%= submission_status_icon(s, 12) %> + + <%= Submission.human_enum_name(:status, s.status) %> + <% if s.summary.present? and s.summary.downcase != Submission.human_enum_name(:status, s.status).downcase %> + · <%= s.summary %> + <% end %> -
- <% end %> -
+ +
+ <% end %>
+
<% @feedbacks.each do |feedback| %>
From e4e14a4e8782038b12ea8ef7d1ede7eca1e25a08 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Thu, 4 Jan 2024 15:04:30 +0100 Subject: [PATCH 04/12] Put scores into a card --- app/assets/stylesheets/components/card.css.scss | 2 +- app/assets/stylesheets/models/submissions.css.scss | 5 +++++ app/views/feedbacks/_score_link.html.erb | 11 +++-------- app/views/submissions/_description.html.erb | 10 ++++++---- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/components/card.css.scss b/app/assets/stylesheets/components/card.css.scss index 7380b4c3b0..715096ad71 100644 --- a/app/assets/stylesheets/components/card.css.scss +++ b/app/assets/stylesheets/components/card.css.scss @@ -22,7 +22,7 @@ .card-outlined { box-shadow: none; - border: 1px solid var(--d-outline); + border: 1px solid var(--d-divider); } .card-media { diff --git a/app/assets/stylesheets/models/submissions.css.scss b/app/assets/stylesheets/models/submissions.css.scss index 78dac1c213..ea3434f317 100644 --- a/app/assets/stylesheets/models/submissions.css.scss +++ b/app/assets/stylesheets/models/submissions.css.scss @@ -539,3 +539,8 @@ iframe.file { margin-right: 6px; } } + +.scores.card .card-title.card-title-colored-container .btn { + margin-top: -12px; + margin-bottom: -12px; +} diff --git a/app/views/feedbacks/_score_link.html.erb b/app/views/feedbacks/_score_link.html.erb index 2534824f0b..914a4d174e 100644 --- a/app/views/feedbacks/_score_link.html.erb +++ b/app/views/feedbacks/_score_link.html.erb @@ -6,22 +6,17 @@ <% total = policy(feedback.evaluation_exercise).show_total? %> <% scores = policy_scope(feedback.scores) %> <% if (total && feedback.score_items.present?) || scores.present? %> - <%= link_to "#score-details-#{feedback.id}", - class: 'toggleable-icon btn with-icon btn-outline', - 'aria-expanded': 'true', - title: t("feedbacks.score_link.view_breakdown"), data: { 'bs-toggle': "collapse" } do %> - - + "> <% if total && feedback.score_items.present? %> <%= t("feedbacks.score_link.score", score: format_score(feedback.score), max: format_score(feedback.maximum_score)) %> <% else %> <%= t("feedbacks.score_link.present", count: scores.length) %> <% end %> - <% end %> + <% end %> <%# Link to edit screen if needed %> <% if policy(feedback).show? && scores.present? %> - <%= link_to feedback_path(feedback), class: "edit-score btn btn-icon", title: t("feedbacks.score_link.view_feedback") do %> + <%= link_to feedback_path(feedback), class: "edit-score btn btn-icon float-end", title: t("feedbacks.score_link.view_feedback") do %> <% end %> <% end %> diff --git a/app/views/submissions/_description.html.erb b/app/views/submissions/_description.html.erb index 9ac97a945e..221146ce9f 100644 --- a/app/views/submissions/_description.html.erb +++ b/app/views/submissions/_description.html.erb @@ -71,14 +71,16 @@
<% @feedbacks.each do |feedback| %> -
- +
+
+
<%= render 'feedbacks/score_link', feedback: feedback %> - -
"> +
+
"> <%= render 'feedbacks/score_table', feedback: feedback %>
+
<% end %>
From decbabc3c1ddc198f2dfd313c6f109eee48464f3 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 9 Jan 2024 13:47:18 +0100 Subject: [PATCH 05/12] Add edit label to button --- app/views/feedbacks/_score_link.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/feedbacks/_score_link.html.erb b/app/views/feedbacks/_score_link.html.erb index 914a4d174e..b0bba67244 100644 --- a/app/views/feedbacks/_score_link.html.erb +++ b/app/views/feedbacks/_score_link.html.erb @@ -16,7 +16,8 @@ <% end %> <%# Link to edit screen if needed %> <% if policy(feedback).show? && scores.present? %> - <%= link_to feedback_path(feedback), class: "edit-score btn btn-icon float-end", title: t("feedbacks.score_link.view_feedback") do %> + <%= link_to feedback_path(feedback), class: "edit-score btn btn-text with-icon float-end", title: t("feedbacks.score_link.view_feedback") do %> + <%= t "score_items.table.edit" %> <% end %> <% end %> From a1f69735d1a9a59d6691d74bcc3ccb9622edb7d9 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 9 Jan 2024 13:47:39 +0100 Subject: [PATCH 06/12] Remove feedback label from table header --- app/views/evaluations/overview.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/evaluations/overview.html.erb b/app/views/evaluations/overview.html.erb index 8185a80a3c..5e2eae5dac 100644 --- a/app/views/evaluations/overview.html.erb +++ b/app/views/evaluations/overview.html.erb @@ -14,7 +14,7 @@ <%= t '.exercise' %> - <%= t '.feedback' %> + <%= t '.grade' if graded %> From 70b37e666dc75dd43f9ab4ef6c2b35201ba2f5f2 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 9 Jan 2024 13:58:41 +0100 Subject: [PATCH 07/12] Merge file --- app/views/evaluations/overview.html.erb | 2 +- app/views/feedbacks/_score_card.html.erb | 58 +++++++++++++++++++++ app/views/feedbacks/_score_link.html.erb | 23 -------- app/views/feedbacks/_score_table.html.erb | 30 ----------- app/views/submissions/_description.html.erb | 9 +--- config/locales/views/feedbacks/en.yml | 3 +- config/locales/views/feedbacks/nl.yml | 3 +- 7 files changed, 62 insertions(+), 66 deletions(-) create mode 100644 app/views/feedbacks/_score_card.html.erb delete mode 100644 app/views/feedbacks/_score_link.html.erb delete mode 100644 app/views/feedbacks/_score_table.html.erb diff --git a/app/views/evaluations/overview.html.erb b/app/views/evaluations/overview.html.erb index 5e2eae5dac..4f51afffa8 100644 --- a/app/views/evaluations/overview.html.erb +++ b/app/views/evaluations/overview.html.erb @@ -33,7 +33,7 @@ <% if graded %> <% if fb.maximum_score %> - <%= t "feedbacks.score_table.total_score" %> + <%= t "feedbacks.score_card.total_score" %> <% else %> <%= t ".no_grading" %> <% end %> diff --git a/app/views/feedbacks/_score_card.html.erb b/app/views/feedbacks/_score_card.html.erb new file mode 100644 index 0000000000..3cb1954548 --- /dev/null +++ b/app/views/feedbacks/_score_card.html.erb @@ -0,0 +1,58 @@ +<%# + If the total is visible, show that. + If there are other visible scores, display that. + Else display nothing. +%> +<% total = policy(feedback.evaluation_exercise).show_total? %> +<% scores = policy_scope(feedback.scores) %> + +
+
+ <% if (total && feedback.score_items.present?) || scores.present? %> + "> + <% if total && feedback.score_items.present? %> + <%= t(".score", score: format_score(feedback.score), max: format_score(feedback.maximum_score)) %> + <% else %> + <%= t(".present", count: scores.length) %> + <% end %> + + <% end %> + <%# Link to edit screen if needed %> + <% if policy(feedback).show? && scores.present? %> + <%= link_to feedback_path(feedback), class: "edit-score btn btn-text with-icon float-end", title: t(".view_feedback") do %> + + <%= t "score_items.table.edit" %> + <% end %> + <% end %> +
+
"> + <% if total || feedback.score_items.present? %> + + <% if total %> + + + + + <% end %> + <% scores.each do |score| %> + + + + + <% end %> +
+ <%= t ".total_score" %> + <% unless feedback.evaluation_exercise.visible_score? %> + "> + <% end %> + <%= format_score feedback.score %> / <%= format_score feedback.maximum_score %>
+ <%= score.score_item.name %> + <% unless score.score_item.visible %> + "> + <% end %> +
+ <%= score.score_item.description %> + 		<%= format_score score.score %> / <%= format_score score.score_item.maximum %>
+ <% end %> +
+
diff --git a/app/views/feedbacks/_score_link.html.erb b/app/views/feedbacks/_score_link.html.erb deleted file mode 100644 index b0bba67244..0000000000 --- a/app/views/feedbacks/_score_link.html.erb +++ /dev/null @@ -1,23 +0,0 @@ -<%# - If the total is visible, show that. - If there are other visible scores, display that. - Else display nothing. -%> -<% total = policy(feedback.evaluation_exercise).show_total? %> -<% scores = policy_scope(feedback.scores) %> -<% if (total && feedback.score_items.present?) || scores.present? %> - "> - <% if total && feedback.score_items.present? %> - <%= t("feedbacks.score_link.score", score: format_score(feedback.score), max: format_score(feedback.maximum_score)) %> - <% else %> - <%= t("feedbacks.score_link.present", count: scores.length) %> - <% end %> - -<% end %> -<%# Link to edit screen if needed %> -<% if policy(feedback).show? && scores.present? %> - <%= link_to feedback_path(feedback), class: "edit-score btn btn-text with-icon float-end", title: t("feedbacks.score_link.view_feedback") do %> - - <%= t "score_items.table.edit" %> - <% end %> -<% end %> diff --git a/app/views/feedbacks/_score_table.html.erb b/app/views/feedbacks/_score_table.html.erb deleted file mode 100644 index 2a861a84c3..0000000000 --- a/app/views/feedbacks/_score_table.html.erb +++ /dev/null @@ -1,30 +0,0 @@ -<% total = policy(feedback.evaluation_exercise).show_total? %> -<% scores = policy_scope(feedback.scores).includes(:score_item) %> -<% if total || feedback.score_items.present? %> - - <% if total %> - - - - - <% end %> - <% scores.each do |score| %> - - - - - <% end %> -
- <%= t "feedbacks.score_table.total_score" %> - <% unless feedback.evaluation_exercise.visible_score? %> - "> - <% end %> - <%= format_score feedback.score %> / <%= format_score feedback.maximum_score %>
- <%= score.score_item.name %> - <% unless score.score_item.visible %> - "> - <% end %> -
- <%= score.score_item.description %> - 		<%= format_score score.score %> / <%= format_score score.score_item.maximum %>
-<% end %> diff --git a/app/views/submissions/_description.html.erb b/app/views/submissions/_description.html.erb index 221146ce9f..c4726ad1b4 100644 --- a/app/views/submissions/_description.html.erb +++ b/app/views/submissions/_description.html.erb @@ -72,14 +72,7 @@ <% @feedbacks.each do |feedback| %>
-
-
- <%= render 'feedbacks/score_link', feedback: feedback %> -
-
"> - <%= render 'feedbacks/score_table', feedback: feedback %> -
-
+ <%= render 'feedbacks/score_card', feedback: feedback %>
<% end %> diff --git a/config/locales/views/feedbacks/en.yml b/config/locales/views/feedbacks/en.yml index 6826f7686e..c7d3cd1750 100644 --- a/config/locales/views/feedbacks/en.yml +++ b/config/locales/views/feedbacks/en.yml @@ -59,10 +59,9 @@ en: submissions_table: update-submission: "Change to this submission" confirm: "Are you sure? All comments on the previous submission will be deleted." - score_table: + score_card: total_score: Total grade score_breakdown: Grade breakdown - score_link: score: "Grade: %{score} / %{max}" score_short: "%{score} / %{max}" present: "There are %{count} score items" diff --git a/config/locales/views/feedbacks/nl.yml b/config/locales/views/feedbacks/nl.yml index eb254885b6..cc3dece143 100644 --- a/config/locales/views/feedbacks/nl.yml +++ b/config/locales/views/feedbacks/nl.yml @@ -59,10 +59,9 @@ nl: submissions_table: update-submission: "Veranderen naar deze oplossing" confirm: "Ben je zeker? Alle opmerkingen op de vorige oplossing zullen verwijderd worden." - score_table: + score_card: total_score: Totaalscore score_breakdown: Puntenverdeling - score_link: score: "Score: %{score} / %{max}" score_short: "%{score} / %{max}" present: "Er zijn %{count} scoreonderdelen" From a78d67446e227a58b9f71da01ea3374ab0903475 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 10 Jan 2024 10:34:27 +0100 Subject: [PATCH 08/12] Add and improve text --- app/views/feedbacks/_score_card.html.erb | 43 ++++++++++-------------- config/locales/views/evaluations/en.yml | 4 +-- config/locales/views/evaluations/nl.yml | 4 +-- config/locales/views/feedbacks/en.yml | 7 ++-- config/locales/views/feedbacks/nl.yml | 7 ++-- 5 files changed, 25 insertions(+), 40 deletions(-) diff --git a/app/views/feedbacks/_score_card.html.erb b/app/views/feedbacks/_score_card.html.erb index 3cb1954548..2b9e3e0796 100644 --- a/app/views/feedbacks/_score_card.html.erb +++ b/app/views/feedbacks/_score_card.html.erb @@ -1,32 +1,23 @@ -<%# - If the total is visible, show that. - If there are other visible scores, display that. - Else display nothing. -%> <% total = policy(feedback.evaluation_exercise).show_total? %> <% scores = policy_scope(feedback.scores) %> -
-
- <% if (total && feedback.score_items.present?) || scores.present? %> - "> - <% if total && feedback.score_items.present? %> - <%= t(".score", score: format_score(feedback.score), max: format_score(feedback.maximum_score)) %> - <% else %> - <%= t(".present", count: scores.length) %> + +<% if total || feedback.score_items.present? %> +
+
+ <%= t(".score")%> + <%# Link to edit screen if needed %> + <% if policy(feedback).show? %> + <%= link_to feedback_path(feedback), class: "edit-score btn btn-text with-icon float-end", title: t(".view_feedback") do %> + + <%= t "score_items.table.edit" %> <% end %> - - <% end %> - <%# Link to edit screen if needed %> - <% if policy(feedback).show? && scores.present? %> - <%= link_to feedback_path(feedback), class: "edit-score btn btn-text with-icon float-end", title: t(".view_feedback") do %> - - <%= t "score_items.table.edit" %> <% end %> - <% end %> -
-
"> - <% if total || feedback.score_items.present? %> +
+
"> +
+ <%= t ".info_html", url: overview_evaluation_path(feedback.evaluation_exercise.evaluation) %> +
<% if total %> @@ -53,6 +44,6 @@ <% end %>
- <% end %> +
-
+<% end %> diff --git a/config/locales/views/evaluations/en.yml b/config/locales/views/evaluations/en.yml index 32c98591c2..c0a617f9ac 100644 --- a/config/locales/views/evaluations/en.yml +++ b/config/locales/views/evaluations/en.yml @@ -75,8 +75,8 @@ en: submission_correct: "Correct submission, " submission_wrong: "Wrong submission, " overview: - title: Evaluation overview - explanation: A course admin has evaluated your submissions for the series "%{series}". For each exercise, your last submission before %{deadline} was automatically selected, but the course admin may have manually selected a different one. Note that this evaluation doesn't necessarily mean that feedback has been added to all of your submissions. + title: Evaluation + explanation: A teacher reviewed your work for the "%{series}" series. They automatically picked your last submission before %{deadline}, but they might have chosen a different one manually. Keep in mind, this evaluation doesn't always include feedback on all your submissions. released: Feedback was added to your code. exercise: Exercise no_annotations: "# comments" diff --git a/config/locales/views/evaluations/nl.yml b/config/locales/views/evaluations/nl.yml index 0cb340fe18..360b2e5958 100644 --- a/config/locales/views/evaluations/nl.yml +++ b/config/locales/views/evaluations/nl.yml @@ -76,8 +76,8 @@ nl: submission_correct: "Juiste oplossing, " submission_wrong: "Foute oplossing, " overview: - title: Evaluatie-overzicht - explanation: Een cursusbeheerder evalueerde je oplossingen voor de reeks "%{series}". Voor elke oefening werd je laatst ingediende oplossing voor %{deadline} automatisch geselecteerd, maar de cursusbeheerder selecteerde mogelijks handmatig een andere oplossing. Merk op dat deze evaluatie niet noodzakelijk betekent dat er feedback werd toevoegd aan elk van je oplossingen. + title: Evaluatie + explanation: Een lesgever heeft je werk voor de reeks "%{series}" bekeken. Dodona heeft automatisch je laatste inzending voor %{deadline} geselecteerd, maar mogelijk heeft de lesgever handmatig een andere gekozen. Houd er rekening mee dat deze evaluatie niet altijd feedback op al je oplossingen omvat. released: Er werd feedback gegeven op je code exercise: Oefening feedback: "Feedback" diff --git a/config/locales/views/feedbacks/en.yml b/config/locales/views/feedbacks/en.yml index c7d3cd1750..df6a1a4075 100644 --- a/config/locales/views/feedbacks/en.yml +++ b/config/locales/views/feedbacks/en.yml @@ -61,9 +61,6 @@ en: confirm: "Are you sure? All comments on the previous submission will be deleted." score_card: total_score: Total grade - score_breakdown: Grade breakdown - score: "Grade: %{score} / %{max}" - score_short: "%{score} / %{max}" - present: "There are %{count} score items" - view_breakdown: View grade breakdown + score: "Grade" view_feedback: Go to the feedback + info_html: "This solution has been evaluated by a teacher. They provided the following feedback. See all evaluated solutions." diff --git a/config/locales/views/feedbacks/nl.yml b/config/locales/views/feedbacks/nl.yml index cc3dece143..50d004fc61 100644 --- a/config/locales/views/feedbacks/nl.yml +++ b/config/locales/views/feedbacks/nl.yml @@ -61,9 +61,6 @@ nl: confirm: "Ben je zeker? Alle opmerkingen op de vorige oplossing zullen verwijderd worden." score_card: total_score: Totaalscore - score_breakdown: Puntenverdeling - score: "Score: %{score} / %{max}" - score_short: "%{score} / %{max}" - present: "Er zijn %{count} scoreonderdelen" - view_breakdown: Puntenverdeling bekijken + score: "Punten" view_feedback: Ga naar de feedback + info_html: "Deze oplossing werd nagekeken door een lesgever. Deze gaf onderstaande beoordeling. Bekijk de andere beoordelingen." From dc4f8f9271afde682825c67b2fbaea09d7ef3541 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 10 Jan 2024 10:44:47 +0100 Subject: [PATCH 09/12] Remove unused css --- app/assets/stylesheets/models/submissions.css.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/stylesheets/models/submissions.css.scss b/app/assets/stylesheets/models/submissions.css.scss index 917337d9b0..bf219e3b27 100644 --- a/app/assets/stylesheets/models/submissions.css.scss +++ b/app/assets/stylesheets/models/submissions.css.scss @@ -510,11 +510,6 @@ iframe.file { } } -.score-details { - padding-bottom: 10px; - padding-top: 10px; -} - .submission-history { display: flex; max-height: 75px; From aec8a9a0d6b4e1f3261a71453a76d8ff69292a23 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 10 Jan 2024 14:59:10 +0100 Subject: [PATCH 10/12] Update config/locales/views/feedbacks/nl.yml Co-authored-by: Bart Mesuere --- config/locales/views/feedbacks/nl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/feedbacks/nl.yml b/config/locales/views/feedbacks/nl.yml index 50d004fc61..65407caf12 100644 --- a/config/locales/views/feedbacks/nl.yml +++ b/config/locales/views/feedbacks/nl.yml @@ -63,4 +63,4 @@ nl: total_score: Totaalscore score: "Punten" view_feedback: Ga naar de feedback - info_html: "Deze oplossing werd nagekeken door een lesgever. Deze gaf onderstaande beoordeling. Bekijk de andere beoordelingen." + info_html: "Deze oplossing werd manueel nagekeken door een lesgever als deel van een evaluatie. Hieronder vind je jouw feedback." From 80052775db3393564917511da031188aaa43e724 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 10 Jan 2024 14:59:15 +0100 Subject: [PATCH 11/12] Update config/locales/views/feedbacks/en.yml Co-authored-by: Bart Mesuere --- config/locales/views/feedbacks/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/views/feedbacks/en.yml b/config/locales/views/feedbacks/en.yml index df6a1a4075..7148aef93f 100644 --- a/config/locales/views/feedbacks/en.yml +++ b/config/locales/views/feedbacks/en.yml @@ -63,4 +63,4 @@ en: total_score: Total grade score: "Grade" view_feedback: Go to the feedback - info_html: "This solution has been evaluated by a teacher. They provided the following feedback. See all evaluated solutions." + info_html: "This solution has been manually evaluated by a teacher as part of an evaluation. Below, you can find your feedback." From 40a974e2bdce7ec5bd03162b5005c933eecf8756 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 10 Jan 2024 15:06:59 +0100 Subject: [PATCH 12/12] Apply feedback --- app/views/feedbacks/_score_card.html.erb | 2 +- config/locales/views/feedbacks/en.yml | 4 ++-- config/locales/views/feedbacks/nl.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/feedbacks/_score_card.html.erb b/app/views/feedbacks/_score_card.html.erb index 2b9e3e0796..2832ba4475 100644 --- a/app/views/feedbacks/_score_card.html.erb +++ b/app/views/feedbacks/_score_card.html.erb @@ -5,7 +5,7 @@ <% if total || feedback.score_items.present? %>
- <%= t(".score")%> + <%= t(".evaluation")%> <%# Link to edit screen if needed %> <% if policy(feedback).show? %> <%= link_to feedback_path(feedback), class: "edit-score btn btn-text with-icon float-end", title: t(".view_feedback") do %> diff --git a/config/locales/views/feedbacks/en.yml b/config/locales/views/feedbacks/en.yml index 7148aef93f..41544e784f 100644 --- a/config/locales/views/feedbacks/en.yml +++ b/config/locales/views/feedbacks/en.yml @@ -61,6 +61,6 @@ en: confirm: "Are you sure? All comments on the previous submission will be deleted." score_card: total_score: Total grade - score: "Grade" + evaluation: Evaluation view_feedback: Go to the feedback - info_html: "This solution has been manually evaluated by a teacher as part of an evaluation. Below, you can find your feedback." + info_html: "This solution has been manually evaluated by a teacher as part of an evaluation. Below, you can find your feedback." diff --git a/config/locales/views/feedbacks/nl.yml b/config/locales/views/feedbacks/nl.yml index 65407caf12..e85eb35b86 100644 --- a/config/locales/views/feedbacks/nl.yml +++ b/config/locales/views/feedbacks/nl.yml @@ -61,6 +61,6 @@ nl: confirm: "Ben je zeker? Alle opmerkingen op de vorige oplossing zullen verwijderd worden." score_card: total_score: Totaalscore - score: "Punten" + evaluation: Evaluatie view_feedback: Ga naar de feedback info_html: "Deze oplossing werd manueel nagekeken door een lesgever als deel van een evaluatie. Hieronder vind je jouw feedback."