From 5b420866218d16732de69e8c94b1a01024315cab Mon Sep 17 00:00:00 2001 From: Jimmy Ihalainen Date: Tue, 4 Feb 2025 12:43:01 +0200 Subject: [PATCH] Allow user to skip submitters when using manual assessment Bugs in the NextUnassessedSubmitterView were previously fixed in PR #1413. However, the previous fixes removed the possibility to skip submitters. These changes re-implement skipping, but this time a bit differently. Fixes #1439 --- .../course/staff/all_submissions_table.html | 2 +- exercise/staff_views.py | 54 ++- .../templates/exercise/module_goal_modal.html | 4 +- .../exercise/staff/_submissions_table.html | 2 +- .../exercise/staff/inspect_submission.html | 2 +- exercise/tests.py | 7 +- locale/en/LC_MESSAGES/django.po | 397 ++++++++++-------- locale/fi/LC_MESSAGES/django.po | 388 +++++++++-------- 8 files changed, 482 insertions(+), 374 deletions(-) diff --git a/course/templates/course/staff/all_submissions_table.html b/course/templates/course/staff/all_submissions_table.html index 43053ff25..adb41f33d 100644 --- a/course/templates/course/staff/all_submissions_table.html +++ b/course/templates/course/staff/all_submissions_table.html @@ -19,7 +19,7 @@

{% if count <= default_limit and not limited %} {% blocktranslate trimmed with count=count url=all_url %} - NUM_OF_SUBMISSIONS_DISPLAYED -- {{ count }}, {{ url }} + NUM_OF_SUBMISSIONS_DISPLAYED -- {{ count }} {% endblocktranslate %} {% elif limited %} {% blocktranslate trimmed with limit=default_limit url=all_url %} diff --git a/exercise/staff_views.py b/exercise/staff_views.py index c825d5292..bd8f178fb 100644 --- a/exercise/staff_views.py +++ b/exercise/staff_views.py @@ -395,9 +395,8 @@ class NextUnassessedSubmitterView(ExerciseBaseView, BaseRedirectView): """ access_mode = ACCESS.ASSISTANT - def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: - # Query submitters who have not been assessed yet. - submitter = None + def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: # pylint: disable=too-many-locals + # Query submitters who have not been assessed yet submitters = (UserProfile.objects .filter(submissions__exercise=self.exercise) .annotate( @@ -408,30 +407,63 @@ def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse: earliest_submission=Min('submissions__submission_time'), ) .order_by('earliest_submission')) + total_submitters = submitters.count() - unassessed_submitters = submitters.filter(count_assessed=0).order_by('earliest_submission') - submitter = unassessed_submitters.first() - assessed_submitters_count = total_submitters - unassessed_submitters.count() + 1 + # Retrieve skipped submitters from the session + skipped_submitters = request.session.get('manual_assessment_skipped_submitters', []) + + unskipped_and_unassessed_submitters = ( + submitters.filter(count_assessed=0).exclude(id__in=skipped_submitters).order_by('earliest_submission') + ) + + # If no unassessed, unskipped submitters remain, reset skipped submitters list and retry + if not unskipped_and_unassessed_submitters.exists() and skipped_submitters: + request.session['manual_assessment_skipped_submitters'] = [] + return self.get(request, *args, **kwargs) + + submitter = unskipped_and_unassessed_submitters.first() if not submitter: - # There are no more unassessed submitters. + # There are no more unassessed submitters messages.success(request, _('ALL_SUBMITTERS_HAVE_BEEN_ASSESSED')) return self.redirect(self.exercise.get_submission_list_url()) - # Find the submitter's best submission using the cache. + previous_submitter_id = request.GET.get('prev') + if previous_submitter_id: + try: + previous_submitter_id = int(request.GET.get('prev')) + except ValueError: + previous_submitter_id = None + + # If user moved on to the next submitter without assessing the previous submitter, skip the current submitter + if previous_submitter_id == submitter.id: + skipped_submitters = request.session.get('manual_assessment_skipped_submitters', []) + if submitter.id not in skipped_submitters: + # Save the skipped submitter to the session + skipped_submitters.append(submitter.id) + request.session['manual_assessment_skipped_submitters'] = skipped_submitters + return self.redirect(self.exercise.get_url('submission-next-unassessed')) + + # Find the submitter's best submission using the cache cache = CachedPoints(self.instance, submitter.user, True) ids = cache.submission_ids(exercise_id=self.exercise.id, best=True, fallback_to_last=True) if not ids: raise Http404() + + assessed_submitters_count = total_submitters - unskipped_and_unassessed_submitters.count() + 1 + percentage = f"{int(assessed_submitters_count / total_submitters * 100)}%" if total_submitters else "0%" - self.request.session['manually_assessed_counter'] = ( - f"{assessed_submitters_count} / {total_submitters} ({percentage})" - ) + counter_str = f"{assessed_submitters_count} / {total_submitters} ({percentage})" + if len(skipped_submitters) > 0: + counter_str += " (" + _('SKIPPED') + f" {len(skipped_submitters)})" + self.request.session['manually_assessed_counter'] = counter_str + url = reverse( 'submission-inspect', kwargs={'submission_id': ids[0], **kwargs}, ) + return self.redirect(url) diff --git a/exercise/templates/exercise/module_goal_modal.html b/exercise/templates/exercise/module_goal_modal.html index c24885af6..c91f9471f 100644 --- a/exercise/templates/exercise/module_goal_modal.html +++ b/exercise/templates/exercise/module_goal_modal.html @@ -30,7 +30,7 @@

{% translate "PERSONALIZED_POINTS_MO
{% translate "PERSONALIZED_POINTS_MO
- + {% translate "ASSESS_NEXT_SUBMITTER_MANUALLY" %} {{ request.session.manually_assessed_counter }} diff --git a/exercise/tests.py b/exercise/tests.py index 9496f0865..44655fee8 100644 --- a/exercise/tests.py +++ b/exercise/tests.py @@ -1524,9 +1524,9 @@ def test_enrollment_questionaire_opening_time(self): def test_next_unassessed_submitter_view(self): # parses the user ID from the URL response of NextUnassessedSubmitterView for convenience. If the URL format is # different (e.g. redirect when all have been graded) return just the url - def get_url_user_id(): + def get_url_user_id(args=''): response = self.client.get( - f"{exercise.get_absolute_url()}submitters/next-unassessed/") + f"{exercise.get_absolute_url()}submitters/next-unassessed/{args}") try: return int(response.url.split('/submissions/')[1].split('/inspect/')[0]) except Exception: @@ -1571,6 +1571,9 @@ def create_submission(user, submission_time): user2_submission.save() self.assertEqual(user_submission.id, get_url_user_id()) + # test with prev parameter + self.assertEqual(user_submission.id, get_url_user_id(f"?prev={self.user2.id}")) + # remove grader for further tests user2_submission.grader = None user2_submission.save() diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 7a1f02a65..57a2bc665 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-04 13:12+0300\n" +"POT-Creation-Date: 2025-02-04 12:16+0200\n" "PO-Revision-Date: 2021-05-27 14:47+0300\n" "Last-Translator: Jimmy Ihalainen \n" "Language-Team: English<>\n" @@ -629,6 +629,17 @@ msgstr "Enrol from SIS" msgid "COURSE_INSTANCE_SIS_ENROLL_HELP" msgstr "When enabled, students from local organization must enrol through SIS." +#: course/models.py +msgid "LABEL_POINTS_GOAL_ENABLED" +msgstr "Enable personalized points goal feature" + +#: course/models.py +msgid "LABEL_POINTS_GOAL_ENABLED_HELP" +msgstr "" +"When enabled, students will be able to specify their own points goals for " +"modules. This only affects the visual of the points progress bar for " +"students and does not affect grading." + #: course/models.py lib/admin_helpers.py msgid "MODEL_NAME_COURSE_INSTANCE" msgstr "course instance" @@ -1033,6 +1044,16 @@ msgstr "Deadline deviations" msgid "SUBMISSION_DEVIATIONS" msgstr "Submission deviations" +#: course/templates/course/_course_menu.html +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/edit_submitters.html +#: exercise/templates/exercise/staff/inspect_submission.html +#: exercise/templates/exercise/staff/list_submissions.html +#: exercise/templates/exercise/staff/submissions_summary.html +#: exercise/templatetags/exercise.py +msgid "ALL_SUBMISSIONS" +msgstr "All submissions" + #: course/templates/course/_enroll_form.html msgid "ENROLL_THROUGH_SIS" msgstr "" @@ -1265,47 +1286,6 @@ msgstr "Late submissions are allowed until %(deadline)s. " msgid "LATE_SUBMISSION_POINTS_WORTH -- %(percent)s" msgstr "However, points are only worth %(percent)s%%. " -#: exercise/templates/exercise/_user_results.html -msgid "POINTS_GOAL" -msgstr "Points goal" - -#: exercise/templates/exercise/_user_results.html -msgid "POINTS_GOAL_TOOLTIP" -msgstr "Set a personal points goal for this module. This goal is only visible to you. Once the goal has been reached, the points progress bar changes colour to blue." - -#: exercise/templates/exercise/module_goal_modal.html -msgid "PERSONALIZED_POINTS_MODAL_TITLE" -msgstr "Set personalized points goal for module" - -#: exercise/templates/exercise/module_goal_modal.html -msgid "LABEL_POINTS_GOAL_INPUT" -msgstr "Input personalized goal as a percentage or points (e.g., 50% or 150)" - -#: exercise/templates/exercise/module_goal_modal.html -msgid "PERSONALIZED_POINTS_MODAL_SUCCESS" -msgstr "Succesfully set personalized points goal" - -#: exercise/templates/exercise/module_goal_modal.html -msgid "PERSONALIZED_POINTS_MODAL_FAILURE" -msgstr "Failed to set personalized points goal" - -#: exercise/templates/exercise/module_goal_modal.html -msgid "PERSONALIZED_POINTS_MODAL_NOT_NUMBER" -msgstr "Input needs to be a percentage or a number (e.g., 50% or 150)" - -msgid "PERSONALIZED_POINTS_GOAL" -msgstr "Points goal" - -msgid "PERSONALIZED_POINTS_MODAL_LESS_THAN_REQUIRED" -msgstr "You cannot set the personalized points goal to be less than the points required to pass the module" - -msgid "PERSONALIZED_POINTS_MODAL_REMOVE_SUCCESS" -msgstr "Succesfully removed personalized points goal" - -msgid "PERSONALIZED_POINTS_MODAL_REMOVE_FAILURE" -msgstr "Failed to remove personalized points goal" - - #: course/templates/course/staff/_tag_remove_modal.html msgid "UNTAG_MULTIPLE_USERS" msgstr "Untag multiple users" @@ -1346,6 +1326,132 @@ msgstr "Cancel" msgid "REMOVE_ALL" msgstr "Remove all" +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#, python-format +msgid "NUM_OF_SUBMISSIONS_DISPLAYED -- %(count)s" +msgstr "%(count)s submissions." + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#, python-format +msgid "NUM_OF_SUBMISSIONS_DISPLAYED_AND_SHOW_ALL_BTN -- %(limit)s, %(url)s" +msgstr "" +"%(limit)s latest submissions. Show all" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#, python-format +msgid "" +"NUM_OF_SUBMISSIONS_DISPLAYED_AND_SHOW_LATEST_BTN -- %(count)s, %(url)s, " +"%(limit)s" +msgstr "" +"%(count)s submissions. Show latest %(limit)s" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +msgid "FILTER_SUBMISSIONS_BY_TAG" +msgstr "Filter submissions by tag" + +#: course/templates/course/staff/all_submissions_table.html exercise/admin.py +#: exercise/templates/exercise/_submission_info.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/inspect_submission.html +msgid "SUBMITTERS" +msgstr "Submitters" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table_compact.html +msgid "TIME" +msgstr "Time" + +#: course/templates/course/staff/all_submissions_table.html +#: course/templates/course/staff/participants.html +#: exercise/templates/exercise/_submission_info.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table_compact.html +#: exercise/templates/exercise/submission_plain.html +msgid "STATUS" +msgstr "Status" + +#: course/templates/course/staff/all_submissions_table.html +#: diploma/templates/diploma/list.html +#: exercise/templates/exercise/_submission_info.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table_compact.html +#: exercise/templates/exercise/staff/_submitters_table.html +msgid "GRADE" +msgstr "Grade" + +#: course/templates/course/staff/all_submissions_table.html +#: course/templates/course/staff/participants.html +#: edit_course/templates/edit_course/edit_course_base.html +#: edit_course/templates/edit_course/usertag_add.html +#: edit_course/templates/edit_course/usertag_delete.html +#: edit_course/templates/edit_course/usertag_edit.html +#: edit_course/templates/edit_course/usertag_list.html +#: edit_course/templates/edit_course/usertagging_add.html +#: exercise/templates/exercise/staff/_submissions_table.html +msgid "TAGS" +msgstr "Tags" + +#: course/templates/course/staff/all_submissions_table.html +#: deviations/templates/deviations/list_dl.html +#: deviations/templates/deviations/override_dl.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submitters_table.html +msgid "YES" +msgstr "Yes" + +#: course/templates/course/staff/all_submissions_table.html +#: deviations/templates/deviations/list_dl.html +#: deviations/templates/deviations/override_dl.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submitters_table.html +msgid "NO" +msgstr "No" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submitters_table.html +msgid "ASSESSED_MANUALLY" +msgstr "Assessed manually" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/_user_results.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submitters_table.html +#: exercise/templates/exercise/staff/inspect_submission.html +#: exercise/templates/exercise/submission_plain.html +msgid "INSPECT" +msgstr "Inspect" + +#: course/templates/course/staff/all_submissions_table.html +#: deviations/templates/deviations/list_dl.html +#: deviations/templates/deviations/list_submissions.html +#: deviations/templates/deviations/override_dl.html +#: deviations/templates/deviations/override_submissions.html +#: edit_course/templates/edit_course/edit_content.html +#: exercise/templates/exercise/_user_results.html +msgid "EXERCISE" +msgstr "Assignment" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table_compact.html +#: exercise/templates/exercise/submission_plain.html +#, python-format +msgid "LATE_W_PENALTY -- %(percent)s" +msgstr "Late -%(percent)s%%" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +msgid "NO_SUBMISSIONS" +msgstr "No submissions" + #: course/templates/course/staff/enroll_students.html #: course/templates/course/staff/participants.html msgid "ENROLL_STUDENTS" @@ -1372,6 +1478,7 @@ msgstr "Enrol students in the course" #: edit_course/templates/edit_course/submissiontag_list.html #: edit_course/templates/edit_course/usertag_delete.html #: edit_course/templates/edit_course/usertag_list.html +#: exercise/templates/exercise/module_goal_modal.html #: external_services/templates/external_services/list_menu.html #: news/templates/news/list.html templates/ajax_search_select.html msgid "REMOVE" @@ -1424,6 +1531,7 @@ msgstr "Edit group members" #: edit_course/templates/edit_course/usertag_add.html #: edit_course/templates/edit_course/usertag_edit.html #: edit_course/templates/edit_course/usertagging_add.html +#: exercise/templates/exercise/module_goal_modal.html #: exercise/templates/exercise/staff/edit_submitters.html #: external_services/templates/external_services/edit_menu.html #: news/templates/news/edit.html userprofile/templates/userprofile/profile.html @@ -1492,25 +1600,6 @@ msgstr "First name" msgid "EMAIL" msgstr "Email" -#: course/templates/course/staff/participants.html -#: exercise/templates/exercise/_submission_info.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submissions_table_compact.html -#: exercise/templates/exercise/submission_plain.html -msgid "STATUS" -msgstr "Status" - -#: course/templates/course/staff/participants.html -#: edit_course/templates/edit_course/edit_course_base.html -#: edit_course/templates/edit_course/usertag_add.html -#: edit_course/templates/edit_course/usertag_delete.html -#: edit_course/templates/edit_course/usertag_edit.html -#: edit_course/templates/edit_course/usertag_list.html -#: edit_course/templates/edit_course/usertagging_add.html -#: exercise/templates/exercise/staff/_submissions_table.html -msgid "TAGS" -msgstr "Tags" - #: course/templates/course/staff/participants.html msgid "ENROLLMENT_REMOVE_MODAL_REMOVE_TITLE" msgstr "Remove student" @@ -1786,15 +1875,6 @@ msgstr "Remove deadline deviations" msgid "SUBMITTER" msgstr "Submitter" -#: deviations/templates/deviations/list_dl.html -#: deviations/templates/deviations/list_submissions.html -#: deviations/templates/deviations/override_dl.html -#: deviations/templates/deviations/override_submissions.html -#: edit_course/templates/edit_course/edit_content.html -#: exercise/templates/exercise/_user_results.html -msgid "EXERCISE" -msgstr "Assignment" - #: deviations/templates/deviations/list_dl.html #: deviations/templates/deviations/override_dl.html msgid "EXTRA_SECONDS" @@ -1807,20 +1887,6 @@ msgstr "Extra seconds" msgid "DEADLINE" msgstr "Deadline" -#: deviations/templates/deviations/list_dl.html -#: deviations/templates/deviations/override_dl.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submitters_table.html -msgid "YES" -msgstr "Yes" - -#: deviations/templates/deviations/list_dl.html -#: deviations/templates/deviations/override_dl.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submitters_table.html -msgid "NO" -msgstr "No" - #: deviations/templates/deviations/list_dl.html #: deviations/templates/deviations/override_dl.html msgid "WITHOUT_LATE_PENALTY" @@ -1847,6 +1913,7 @@ msgstr "Select" #: deviations/templates/deviations/list_submissions.html #: deviations/templates/deviations/override_dl.html #: deviations/templates/deviations/override_submissions.html +#: exercise/staff_views.py msgid "UNKNOWN" msgstr "Unknown" @@ -2052,14 +2119,6 @@ msgstr "Filter users" msgid "USERNAME" msgstr "Username" -#: diploma/templates/diploma/list.html -#: exercise/templates/exercise/_submission_info.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submissions_table_compact.html -#: exercise/templates/exercise/staff/_submitters_table.html -msgid "GRADE" -msgstr "Grade" - #: edit_course/course_forms.py exercise/templates/exercise/_user_results.html msgid "CATEGORY_capitalized" msgstr "Category" @@ -2292,17 +2351,6 @@ msgstr "" "option only applies if you first select a course instance from the dropdown " "above." -#: edit_course/course_forms.py -msgid "LABEL_POINTS_GOAL_ENABLED" -msgstr "Enable personalized points goal feature" - -#: edit_course/course_forms.py -msgid "LABEL_POINTS_GOAL_ENABLED_HELP" -msgstr "" -"When enabled, students will be able to specify their own points goals for modules. " -"This only affects the visual of the points progress bar for students and does not affect " -"grading." - #: edit_course/course_forms.py msgid "LABEL_SLUG" msgstr "Slug" @@ -2678,7 +2726,8 @@ msgstr "Retrieve latest build log" #: edit_course/templates/edit_course/edit_content.html msgid "PREV_MODIFICATION_OF_COURSE_INSTANCE_TIME" -msgstr "This course was previously built or the course settings were modified on" +msgstr "" +"This course was previously built or the course settings were modified on" #: edit_course/templates/edit_course/edit_content.html msgid "EXERCISE_CATEGORIES" @@ -3083,12 +3132,6 @@ msgstr "Real class" msgid "COURSE_INSTANCE" msgstr "Course instance" -#: exercise/admin.py exercise/templates/exercise/_submission_info.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/inspect_submission.html -msgid "SUBMITTERS" -msgstr "Submitters" - #: exercise/admin.py exercise/forms.py exercise/submission_models.py msgid "LABEL_SUBMITTERS" msgstr "Submitters" @@ -3638,6 +3681,10 @@ msgstr "One of the student fields must not be blank" msgid "SUBMISSION_CREATE_AND_REVIEW_ERROR_ONLY_ONE_STUDENT_FIELD_CAN_BE_GIVEN" msgstr "Only one student field can be given" +#: exercise/forms.py +msgid "LABEL_POINTS_GOAL_INPUT" +msgstr "Input personalized goal as a percentage or points (e.g., 50% or 150)" + #: exercise/permissions.py msgid "EXERCISE_VISIBILITY_PERMISSION_DENIED_MSG" msgstr "Unfortunately, you are not permitted to view this assignment." @@ -3793,6 +3840,10 @@ msgstr "Regrade task is already running." msgid "ALL_SUBMITTERS_HAVE_BEEN_ASSESSED" msgstr "All submitters have been assessed." +#: exercise/staff_views.py +msgid "SKIPPED" +msgstr "Skipped" + #: exercise/staff_views.py msgid "ERROR_FAILED_TO_LOAD_RESOURCE" msgstr "Failed to load the resource." @@ -4157,10 +4208,15 @@ msgid "POINTS" msgstr "Points" #: exercise/templates/exercise/_points_progress.html -#: exercise/templates/exercise/save_module_goal.html +#: exercise/templates/exercise/module_goal_modal.html msgid "POINTS_TO_PASS" msgstr "Points to pass" +#: exercise/templates/exercise/_points_progress.html +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_GOAL" +msgstr "Points goal" + #: exercise/templates/exercise/_submission_info.html msgid "SUBMISSION_INFO" msgstr "Submission info" @@ -4252,6 +4308,18 @@ msgstr "Hidden" msgid "POINTS_REQUIRED_TO_PASS_MODULE -- %(points)s" msgstr "%(points)s points required to pass the module. " +#: exercise/templates/exercise/_user_results.html +msgid "POINTS_GOAL_TOOLTIP" +msgstr "" +"Set a personal points goal for this module. This goal is only visible to " +"you. Once the goal has been reached, the points progress bar changes colour " +"to blue." + +#: exercise/templates/exercise/_user_results.html +#: exercise/templates/exercise/module_goal_modal.html +msgid "POINTS_GOAL" +msgstr "Points goal" + #: exercise/templates/exercise/_user_results.html msgid "CHANGES_ARE_POSSIBLE_IN_EXERCISES_BEFORE_MODULE_OPENING" msgstr "There may be changes in the assignments before the module opens!" @@ -4268,14 +4336,6 @@ msgstr "Submissions" msgid "NO_SUBMISSIONS_YET" msgstr "No submissions yet" -#: exercise/templates/exercise/_user_results.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submitters_table.html -#: exercise/templates/exercise/staff/inspect_submission.html -#: exercise/templates/exercise/submission_plain.html -msgid "INSPECT" -msgstr "Inspect" - #: exercise/templates/exercise/_user_results.html msgid "MODULE_MODEL_ANSWER_NOT_VISIBLE" msgstr "" @@ -4380,6 +4440,36 @@ msgstr "Show assignment template" msgid "SUBMISSION_ACCEPTED_FOR_GRADING" msgstr "Your submission has been received." +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_SUCCESS" +msgstr "Succesfully set personalized points goal" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_FAILURE" +msgstr "Failed to set personalized points goal" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_NOT_NUMBER" +msgstr "Input needs to be a percentage or a number (e.g., 50% or 150)" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_LESS_THAN_REQUIRED" +msgstr "" +"You cannot set the personalized points goal to be less than the points " +"required to pass the module" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_REMOVE_SUCCESS" +msgstr "Succesfully removed personalized points goal" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_REMOVE_FAILURE" +msgstr "Failed to remove personalized points goal" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_TITLE" +msgstr "Set personalized points goal for module" + #: exercise/templates/exercise/results.html msgid "RESULTS" msgstr "Results" @@ -4558,59 +4648,14 @@ msgstr "Download points" msgid "DOWNLOAD_SUBMISSIONS" msgstr "Download submissions" -#: exercise/templates/exercise/staff/_submissions_table.html -msgid "NUM_OF_SUBMISSIONS_DISPLAYED -- %(count)s, %(url)s" -msgstr "%(count)s submissions." - -#: exercise/templates/exercise/staff/_submissions_table.html -#, python-format -msgid "NUM_OF_SUBMISSIONS_DISPLAYED_AND_SHOW_ALL_BTN -- %(limit)s, %(url)s" -msgstr "" -"%(limit)s latest submissions. Show all" - -#: exercise/templates/exercise/staff/_submissions_table.html -#, python-format -msgid "" -"NUM_OF_SUBMISSIONS_DISPLAYED_AND_SHOW_LATEST_BTN -- %(count)s, %(url)s, " -"%(limit)s" -msgstr "" -"%(count)s submissions. Show latest %(limit)s" - #: exercise/templates/exercise/staff/_submissions_table.html msgid "GROUP_BY_SUBMITTER" msgstr "Group by submitter" -#: exercise/templates/exercise/staff/_submissions_table.html -msgid "FILTER_SUBMISSIONS_BY_TAG" -msgstr "Filter submissions by tag" - #: exercise/templates/exercise/staff/_submissions_table.html msgid "GRADED" msgstr "graded" -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submissions_table_compact.html -msgid "TIME" -msgstr "Time" - -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submitters_table.html -msgid "ASSESSED_MANUALLY" -msgstr "Assessed manually" - -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submissions_table_compact.html -#: exercise/templates/exercise/submission_plain.html -#, python-format -msgid "LATE_W_PENALTY -- %(percent)s" -msgstr "Late -%(percent)s%%" - -#: exercise/templates/exercise/staff/_submissions_table.html -msgid "NO_SUBMISSIONS" -msgstr "No submissions" - #: exercise/templates/exercise/staff/_submissions_table_compact.html msgid "NUMBER_ABBREVIATED" msgstr "No." @@ -4721,14 +4766,6 @@ msgstr ">= 90%% points" msgid "EDIT_SUBMITTERS_SID" msgstr "Edit submitters SID " -#: exercise/templates/exercise/staff/edit_submitters.html -#: exercise/templates/exercise/staff/inspect_submission.html -#: exercise/templates/exercise/staff/list_submissions.html -#: exercise/templates/exercise/staff/submissions_summary.html -#: exercise/templatetags/exercise.py -msgid "ALL_SUBMISSIONS" -msgstr "All submissions" - #: exercise/templates/exercise/staff/edit_submitters.html #: exercise/templates/exercise/staff/inspect_submission.html msgid "SUBMISSION_ID" @@ -5790,6 +5827,14 @@ msgstr "Select course" msgid "TOGGLE_NAVIGATION" msgstr "Toggle navigation" +#: templates/base.html +msgid "CHANGE_LANGUAGE_TO_ENGLISH" +msgstr "Change language to English" + +#: templates/base.html +msgid "CHANGE_LANGUAGE_TO_FINNISH" +msgstr "Change language to Finnish" + #: templates/base.html userprofile/templates/userprofile/profile.html msgid "PROFILE" msgstr "Account" @@ -5834,14 +5879,6 @@ msgstr "Feedback" msgid "LOADING_FAILED" msgstr "Loading failed!" -#: templates/base.html -msgid "CHANGE_LANGUAGE_TO_ENGLISH" -msgstr "Change language to English" - -#: templates/base.html -msgid "CHANGE_LANGUAGE_TO_FINNISH" -msgstr "Change language to Finnish" - #: templates/support_channels.html msgid "TEACHERS" msgstr "Teachers" diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 19ab5565f..118bc9f87 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-04 13:12+0300\n" +"POT-Creation-Date: 2025-02-04 12:16+0200\n" "PO-Revision-Date: 2019-08-14 12:16+0200\n" "Last-Translator: Jimmy Ihalainen \n" "Language-Team: Finnish <>\n" @@ -633,15 +633,16 @@ msgstr "" "Kun valittu, paikallisten opiskelijoiden on ilmoittauduttava " "opintotietojärjestelmän kautta." -#: edit_course/course_forms.py +#: course/models.py msgid "LABEL_POINTS_GOAL_ENABLED" msgstr "Ota käyttöön henkilökohtainen pistetavoite -ominaisuus" -#: edit_course/course_forms.py +#: course/models.py msgid "LABEL_POINTS_GOAL_ENABLED_HELP" msgstr "" -"Kun tämä on käytössä, opiskelijat voivat määrittää omat pistetavoitteensa moduuleille. " -"Tämä vaikuttaa vain opiskelijoiden pistepalkin ulkonäköön, eikä vaikuta arviointiin." +"Kun tämä on käytössä, opiskelijat voivat määrittää omat pistetavoitteensa " +"moduuleille. Tämä vaikuttaa vain opiskelijoiden pistepalkin ulkonäköön, eikä " +"vaikuta arviointiin." #: course/models.py lib/admin_helpers.py msgid "MODEL_NAME_COURSE_INSTANCE" @@ -765,46 +766,6 @@ msgstr "myöhästymissakko" msgid "MODULE_LATE_SUBMISSION_PENALTY_HELPTEXT" msgstr "Pisteiden vähennyskerroin desimaalilukuna, esim. 0,1 = 10%" -#: exercise/templates/exercise/_user_results.html -msgid "POINTS_GOAL" -msgstr "Pistetavoite" - -#: exercise/templates/exercise/_user_results.html -msgid "POINTS_GOAL_TOOLTIP" -msgstr "Aseta henkilökohtainen pistetavoite tälle moduulille. Tavoite näkyy vain sinulle. Kun tavoite on saavutettu, pistepalkki vaihtaa värin siniseksi." - -#: exercise/templates/exercise/module_goal_modal.html -msgid "PERSONALIZED_POINTS_MODAL_TITLE" -msgstr "Aseta pistetavoite moduulille" - -#: exercise/templates/exercise/module_goal_modal.html -msgid "LABEL_POINTS_GOAL_INPUT" -msgstr "Anna pistetavoite prosentteina tai pisteinä (esim. 50% tai 150)" - -#: exercise/templates/exercise/module_goal_modal.html -msgid "PERSONALIZED_POINTS_MODAL_SUCCESS" -msgstr "Pistetavoite asetettu onnistuneesti" - -#: exercise/templates/exercise/module_goal_modal.html -msgid "PERSONALIZED_POINTS_MODAL_FAILURE" -msgstr "Pistetavoitteen asettaminen epäonnistui" - -#: exercise/templates/exercise/module_goal_modal.html -msgid "PERSONALIZED_POINTS_MODAL_NOT_NUMBER" -msgstr "Pistetavoite tulee antaa joko prosentteina tai pisteinä (esim. 50% or 150)" - -msgid "PERSONALIZED_POINTS_GOAL" -msgstr "Pistetavoite" - -msgid "PERSONALIZED_POINTS_MODAL_LESS_THAN_REQUIRED" -msgstr "Pistetavoite ei voi olla vähemmän kuin moduulin läpäisyyn vaaditut pisteet" - -msgid "PERSONALIZED_POINTS_MODAL_REMOVE_SUCCESS" -msgstr "Pistetavoite poistettu onnistuneesti" - -msgid "PERSONALIZED_POINTS_MODAL_REMOVE_FAILURE" -msgstr "Pistetavoitteen poistaminen epäonnistui" - #: course/models.py msgid "LABEL_MODEL_ANSWER" msgstr "esimerkkiratkaisu" @@ -1089,6 +1050,16 @@ msgstr "Määräaikojen poikkeamat" msgid "SUBMISSION_DEVIATIONS" msgstr "Palautuskertojen poikkeamat" +#: course/templates/course/_course_menu.html +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/edit_submitters.html +#: exercise/templates/exercise/staff/inspect_submission.html +#: exercise/templates/exercise/staff/list_submissions.html +#: exercise/templates/exercise/staff/submissions_summary.html +#: exercise/templatetags/exercise.py +msgid "ALL_SUBMISSIONS" +msgstr "Kaikki palautukset" + #: course/templates/course/_enroll_form.html msgid "ENROLL_THROUGH_SIS" msgstr "" @@ -1363,6 +1334,132 @@ msgstr "Peruuta" msgid "REMOVE_ALL" msgstr "Poista kaikki" +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#, python-format +msgid "NUM_OF_SUBMISSIONS_DISPLAYED -- %(count)s" +msgstr "%(count)s palautusta." + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#, python-format +msgid "NUM_OF_SUBMISSIONS_DISPLAYED_AND_SHOW_ALL_BTN -- %(limit)s, %(url)s" +msgstr "" +"%(limit)s viimeisintä palautusta. Näytä kaikki" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#, python-format +msgid "" +"NUM_OF_SUBMISSIONS_DISPLAYED_AND_SHOW_LATEST_BTN -- %(count)s, %(url)s, " +"%(limit)s" +msgstr "" +"%(count)s palautusta. Näytä %(limit)s viimeisintä" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +msgid "FILTER_SUBMISSIONS_BY_TAG" +msgstr "Suodata listaa merkinnän perusteella" + +#: course/templates/course/staff/all_submissions_table.html exercise/admin.py +#: exercise/templates/exercise/_submission_info.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/inspect_submission.html +msgid "SUBMITTERS" +msgstr "Opiskelijat" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table_compact.html +msgid "TIME" +msgstr "Aika" + +#: course/templates/course/staff/all_submissions_table.html +#: course/templates/course/staff/participants.html +#: exercise/templates/exercise/_submission_info.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table_compact.html +#: exercise/templates/exercise/submission_plain.html +msgid "STATUS" +msgstr "Tila" + +#: course/templates/course/staff/all_submissions_table.html +#: diploma/templates/diploma/list.html +#: exercise/templates/exercise/_submission_info.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table_compact.html +#: exercise/templates/exercise/staff/_submitters_table.html +msgid "GRADE" +msgstr "Arvosana" + +#: course/templates/course/staff/all_submissions_table.html +#: course/templates/course/staff/participants.html +#: edit_course/templates/edit_course/edit_course_base.html +#: edit_course/templates/edit_course/usertag_add.html +#: edit_course/templates/edit_course/usertag_delete.html +#: edit_course/templates/edit_course/usertag_edit.html +#: edit_course/templates/edit_course/usertag_list.html +#: edit_course/templates/edit_course/usertagging_add.html +#: exercise/templates/exercise/staff/_submissions_table.html +msgid "TAGS" +msgstr "Merkinnät" + +#: course/templates/course/staff/all_submissions_table.html +#: deviations/templates/deviations/list_dl.html +#: deviations/templates/deviations/override_dl.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submitters_table.html +msgid "YES" +msgstr "Kyllä" + +#: course/templates/course/staff/all_submissions_table.html +#: deviations/templates/deviations/list_dl.html +#: deviations/templates/deviations/override_dl.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submitters_table.html +msgid "NO" +msgstr "Ei" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submitters_table.html +msgid "ASSESSED_MANUALLY" +msgstr "Arvosteltu manuaalisesti" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/_user_results.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submitters_table.html +#: exercise/templates/exercise/staff/inspect_submission.html +#: exercise/templates/exercise/submission_plain.html +msgid "INSPECT" +msgstr "Tutki" + +#: course/templates/course/staff/all_submissions_table.html +#: deviations/templates/deviations/list_dl.html +#: deviations/templates/deviations/list_submissions.html +#: deviations/templates/deviations/override_dl.html +#: deviations/templates/deviations/override_submissions.html +#: edit_course/templates/edit_course/edit_content.html +#: exercise/templates/exercise/_user_results.html +msgid "EXERCISE" +msgstr "Tehtävä" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table_compact.html +#: exercise/templates/exercise/submission_plain.html +#, python-format +msgid "LATE_W_PENALTY -- %(percent)s" +msgstr "Myöhässä -%(percent)s%%" + +#: course/templates/course/staff/all_submissions_table.html +#: exercise/templates/exercise/staff/_submissions_table.html +msgid "NO_SUBMISSIONS" +msgstr "Ei vielä palautuksia" + #: course/templates/course/staff/enroll_students.html #: course/templates/course/staff/participants.html msgid "ENROLL_STUDENTS" @@ -1389,6 +1486,7 @@ msgstr "Ilmoita opiskelijoita kurssille" #: edit_course/templates/edit_course/submissiontag_list.html #: edit_course/templates/edit_course/usertag_delete.html #: edit_course/templates/edit_course/usertag_list.html +#: exercise/templates/exercise/module_goal_modal.html #: external_services/templates/external_services/list_menu.html #: news/templates/news/list.html templates/ajax_search_select.html msgid "REMOVE" @@ -1441,6 +1539,7 @@ msgstr "Muokkaa ryhmän jäseniä" #: edit_course/templates/edit_course/usertag_add.html #: edit_course/templates/edit_course/usertag_edit.html #: edit_course/templates/edit_course/usertagging_add.html +#: exercise/templates/exercise/module_goal_modal.html #: exercise/templates/exercise/staff/edit_submitters.html #: external_services/templates/external_services/edit_menu.html #: news/templates/news/edit.html userprofile/templates/userprofile/profile.html @@ -1509,25 +1608,6 @@ msgstr "Etunimi" msgid "EMAIL" msgstr "Sähköposti" -#: course/templates/course/staff/participants.html -#: exercise/templates/exercise/_submission_info.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submissions_table_compact.html -#: exercise/templates/exercise/submission_plain.html -msgid "STATUS" -msgstr "Tila" - -#: course/templates/course/staff/participants.html -#: edit_course/templates/edit_course/edit_course_base.html -#: edit_course/templates/edit_course/usertag_add.html -#: edit_course/templates/edit_course/usertag_delete.html -#: edit_course/templates/edit_course/usertag_edit.html -#: edit_course/templates/edit_course/usertag_list.html -#: edit_course/templates/edit_course/usertagging_add.html -#: exercise/templates/exercise/staff/_submissions_table.html -msgid "TAGS" -msgstr "Merkinnät" - #: course/templates/course/staff/participants.html msgid "ENROLLMENT_REMOVE_MODAL_REMOVE_TITLE" msgstr "Poista opiskelija" @@ -1806,15 +1886,6 @@ msgstr "Poista määräaikojen poikkeamia" msgid "SUBMITTER" msgstr "Palauttaja" -#: deviations/templates/deviations/list_dl.html -#: deviations/templates/deviations/list_submissions.html -#: deviations/templates/deviations/override_dl.html -#: deviations/templates/deviations/override_submissions.html -#: edit_course/templates/edit_course/edit_content.html -#: exercise/templates/exercise/_user_results.html -msgid "EXERCISE" -msgstr "Tehtävä" - #: deviations/templates/deviations/list_dl.html #: deviations/templates/deviations/override_dl.html msgid "EXTRA_SECONDS" @@ -1827,20 +1898,6 @@ msgstr "Ylimääräiset minuutit" msgid "DEADLINE" msgstr "Määräaika" -#: deviations/templates/deviations/list_dl.html -#: deviations/templates/deviations/override_dl.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submitters_table.html -msgid "YES" -msgstr "Kyllä" - -#: deviations/templates/deviations/list_dl.html -#: deviations/templates/deviations/override_dl.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submitters_table.html -msgid "NO" -msgstr "Ei" - #: deviations/templates/deviations/list_dl.html #: deviations/templates/deviations/override_dl.html msgid "WITHOUT_LATE_PENALTY" @@ -1867,6 +1924,7 @@ msgstr "Valitse" #: deviations/templates/deviations/list_submissions.html #: deviations/templates/deviations/override_dl.html #: deviations/templates/deviations/override_submissions.html +#: exercise/staff_views.py msgid "UNKNOWN" msgstr "Tuntematon" @@ -2072,14 +2130,6 @@ msgstr "Suodata listaa" msgid "USERNAME" msgstr "Käyttäjätunnus" -#: diploma/templates/diploma/list.html -#: exercise/templates/exercise/_submission_info.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submissions_table_compact.html -#: exercise/templates/exercise/staff/_submitters_table.html -msgid "GRADE" -msgstr "Arvosana" - #: edit_course/course_forms.py exercise/templates/exercise/_user_results.html msgid "CATEGORY_capitalized" msgstr "Kategoria" @@ -2638,10 +2688,6 @@ msgstr "Kurssikerrat" msgid "HIDDEN_lowercase" msgstr "piilotettu" -#: exercise/reveal_models.py -msgid "LABEL_SHOW_ZERO_POINTS_IMMEDIATELY" -msgstr "Näytä palaute välittömästi jos tehtäväpalautus saa 0 pistettä" - #: edit_course/templates/edit_course/clone_instance.html msgid "CLONE_COURSE" msgstr "Luo uusi kurssikerta" @@ -3100,12 +3146,6 @@ msgstr "Oikea luokka" msgid "COURSE_INSTANCE" msgstr "Kurssikerta" -#: exercise/admin.py exercise/templates/exercise/_submission_info.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/inspect_submission.html -msgid "SUBMITTERS" -msgstr "Opiskelijat" - #: exercise/admin.py exercise/forms.py exercise/submission_models.py msgid "LABEL_SUBMITTERS" msgstr "Palauttajat" @@ -3652,6 +3692,10 @@ msgstr "Ainakin yksi opiskelijakentistä tulee antaa" msgid "SUBMISSION_CREATE_AND_REVIEW_ERROR_ONLY_ONE_STUDENT_FIELD_CAN_BE_GIVEN" msgstr "Voidaan antaa vain yksi opiskelijakenttä" +#: exercise/forms.py +msgid "LABEL_POINTS_GOAL_INPUT" +msgstr "Anna pistetavoite prosentteina tai pisteinä (esim. 50% tai 150)" + #: exercise/permissions.py msgid "EXERCISE_VISIBILITY_PERMISSION_DENIED_MSG" msgstr "Valitettavasti sinulla ei ole oikeutta nähdä tätä tehtävää." @@ -3776,6 +3820,10 @@ msgstr "Aika" msgid "LABEL_CURRENTLY_REVEALED" msgstr "Paljastettu nyt" +#: exercise/reveal_models.py +msgid "LABEL_SHOW_ZERO_POINTS_IMMEDIATELY" +msgstr "Näytä palaute välittömästi jos tehtäväpalautus saa 0 pistettä" + #: exercise/reveal_models.py msgid "MODEL_NAME_REVEAL_RULE" msgstr "Paljastamissääntö" @@ -3804,6 +3852,10 @@ msgstr "Uudelleenarviointi on jo käynnissä." msgid "ALL_SUBMITTERS_HAVE_BEEN_ASSESSED" msgstr "Kaikki palauttajat on arvosteltu." +#: exercise/staff_views.py +msgid "SKIPPED" +msgstr "Ohitettu" + #: exercise/staff_views.py msgid "ERROR_FAILED_TO_LOAD_RESOURCE" msgstr "Lataus epäonnistui." @@ -4166,9 +4218,15 @@ msgid "POINTS" msgstr "Pisteet" #: exercise/templates/exercise/_points_progress.html +#: exercise/templates/exercise/module_goal_modal.html msgid "POINTS_TO_PASS" msgstr "Vaaditut pisteet" +#: exercise/templates/exercise/_points_progress.html +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_GOAL" +msgstr "Pistetavoite" + #: exercise/templates/exercise/_submission_info.html msgid "SUBMISSION_INFO" msgstr "Palautuksen tiedot" @@ -4262,6 +4320,17 @@ msgstr "Piilotettu" msgid "POINTS_REQUIRED_TO_PASS_MODULE -- %(points)s" msgstr "Moduulin suorittamiseen vaaditaan %(points)s pistettä." +#: exercise/templates/exercise/_user_results.html +msgid "POINTS_GOAL_TOOLTIP" +msgstr "" +"Aseta henkilökohtainen pistetavoite tälle moduulille. Tavoite näkyy vain " +"sinulle. Kun tavoite on saavutettu, pistepalkki vaihtaa värin siniseksi." + +#: exercise/templates/exercise/_user_results.html +#: exercise/templates/exercise/module_goal_modal.html +msgid "POINTS_GOAL" +msgstr "Pistetavoite" + #: exercise/templates/exercise/_user_results.html msgid "CHANGES_ARE_POSSIBLE_IN_EXERCISES_BEFORE_MODULE_OPENING" msgstr "Tehtäviin saattaa tulla muutoksia ennen kierroksen avautumista!" @@ -4278,14 +4347,6 @@ msgstr "Palautukset" msgid "NO_SUBMISSIONS_YET" msgstr "Ei vielä palautuksia" -#: exercise/templates/exercise/_user_results.html -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submitters_table.html -#: exercise/templates/exercise/staff/inspect_submission.html -#: exercise/templates/exercise/submission_plain.html -msgid "INSPECT" -msgstr "Tutki" - #: exercise/templates/exercise/_user_results.html msgid "MODULE_MODEL_ANSWER_NOT_VISIBLE" msgstr "" @@ -4390,6 +4451,36 @@ msgstr "Näytä pohjatiedosto" msgid "SUBMISSION_ACCEPTED_FOR_GRADING" msgstr "Palautuksesi on vastaanotettu arvostelua varten." +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_SUCCESS" +msgstr "Pistetavoite asetettu onnistuneesti" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_FAILURE" +msgstr "Pistetavoitteen asettaminen epäonnistui" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_NOT_NUMBER" +msgstr "" +"Pistetavoite tulee antaa joko prosentteina tai pisteinä (esim. 50% or 150)" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_LESS_THAN_REQUIRED" +msgstr "" +"Pistetavoite ei voi olla vähemmän kuin moduulin läpäisyyn vaaditut pisteet" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_REMOVE_SUCCESS" +msgstr "Pistetavoite poistettu onnistuneesti" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_REMOVE_FAILURE" +msgstr "Pistetavoitteen poistaminen epäonnistui" + +#: exercise/templates/exercise/module_goal_modal.html +msgid "PERSONALIZED_POINTS_MODAL_TITLE" +msgstr "Aseta pistetavoite moduulille" + #: exercise/templates/exercise/results.html msgid "RESULTS" msgstr "Tulokset" @@ -4570,59 +4661,14 @@ msgstr "Lataa pisteet" msgid "DOWNLOAD_SUBMISSIONS" msgstr "Lataa palautukset" -#: exercise/templates/exercise/staff/_submissions_table.html -msgid "NUM_OF_SUBMISSIONS_DISPLAYED -- %(count)s, %(url)s" -msgstr "%(count)s palautusta." - -#: exercise/templates/exercise/staff/_submissions_table.html -#, python-format -msgid "NUM_OF_SUBMISSIONS_DISPLAYED_AND_SHOW_ALL_BTN -- %(limit)s, %(url)s" -msgstr "" -"%(limit)s viimeisintä palautusta. Näytä kaikki" - -#: exercise/templates/exercise/staff/_submissions_table.html -#, python-format -msgid "" -"NUM_OF_SUBMISSIONS_DISPLAYED_AND_SHOW_LATEST_BTN -- %(count)s, %(url)s, " -"%(limit)s" -msgstr "" -"%(count)s palautusta. Näytä %(limit)s viimeisintä" - #: exercise/templates/exercise/staff/_submissions_table.html msgid "GROUP_BY_SUBMITTER" msgstr "Ryhmittele palauttajittain" -#: exercise/templates/exercise/staff/_submissions_table.html -msgid "FILTER_SUBMISSIONS_BY_TAG" -msgstr "Suodata listaa merkinnän perusteella" - #: exercise/templates/exercise/staff/_submissions_table.html msgid "GRADED" msgstr "arvosteltu" -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submissions_table_compact.html -msgid "TIME" -msgstr "Aika" - -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submitters_table.html -msgid "ASSESSED_MANUALLY" -msgstr "Arvosteltu manuaalisesti" - -#: exercise/templates/exercise/staff/_submissions_table.html -#: exercise/templates/exercise/staff/_submissions_table_compact.html -#: exercise/templates/exercise/submission_plain.html -#, python-format -msgid "LATE_W_PENALTY -- %(percent)s" -msgstr "Myöhässä -%(percent)s%%" - -#: exercise/templates/exercise/staff/_submissions_table.html -msgid "NO_SUBMISSIONS" -msgstr "Ei vielä palautuksia" - #: exercise/templates/exercise/staff/_submissions_table_compact.html msgid "NUMBER_ABBREVIATED" msgstr "Nro" @@ -4732,14 +4778,6 @@ msgstr ">= 90%% pisteistä" msgid "EDIT_SUBMITTERS_SID" msgstr "Muokkaa palauttajia SID " -#: exercise/templates/exercise/staff/edit_submitters.html -#: exercise/templates/exercise/staff/inspect_submission.html -#: exercise/templates/exercise/staff/list_submissions.html -#: exercise/templates/exercise/staff/submissions_summary.html -#: exercise/templatetags/exercise.py -msgid "ALL_SUBMISSIONS" -msgstr "Kaikki palautukset" - #: exercise/templates/exercise/staff/edit_submitters.html #: exercise/templates/exercise/staff/inspect_submission.html msgid "SUBMISSION_ID" @@ -5690,8 +5728,6 @@ msgid "LABEL_SEEN" msgstr "nähty" #: notification/models.py -#, fuzzy -#| msgid "LABEL_GRADE" msgid "LABEL_REGRADE_WHEN_SEEN" msgstr "arvioi uudestaan kun nähty" @@ -5809,6 +5845,14 @@ msgstr "Valitse kurssi" msgid "TOGGLE_NAVIGATION" msgstr "Näytä valikko" +#: templates/base.html +msgid "CHANGE_LANGUAGE_TO_ENGLISH" +msgstr "Vaihda kieli englanniksi" + +#: templates/base.html +msgid "CHANGE_LANGUAGE_TO_FINNISH" +msgstr "Vaihda kieli suomeksi" + #: templates/base.html userprofile/templates/userprofile/profile.html msgid "PROFILE" msgstr "Käyttäjätili" @@ -5853,14 +5897,6 @@ msgstr "Palaute" msgid "LOADING_FAILED" msgstr "Lataus epäonnistui!" -#: templates/base.html -msgid "CHANGE_LANGUAGE_TO_ENGLISH" -msgstr "Vaihda kieli englanniksi" - -#: templates/base.html -msgid "CHANGE_LANGUAGE_TO_FINNISH" -msgstr "Vaihda kieli suomeksi" - #: templates/support_channels.html msgid "TEACHERS" msgstr "Opettajat"