From 58ca0e50eb86169e7737e000981d8386b9c995a5 Mon Sep 17 00:00:00 2001 From: Earle Nietzel Date: Thu, 29 Feb 2024 11:48:55 -0500 Subject: [PATCH 1/4] SAK-49766 Assignments releasing submissions should work consistently #12390 https://sakaiproject.atlassian.net/browse/SAK-49766 - this also removes the outdated option withGrade --- .../assignment/api/AssignmentConstants.java | 2 - .../api/src/resources/assignment.properties | 3 +- .../impl/AssignmentServiceImpl.java | 33 +- .../impl/AssignmentServiceTest.java | 12 +- .../AssignmentEntityProvider.java | 15 +- .../assignment/tool/AssignmentAction.java | 358 ++++++++--------- .../assignment/tool/AssignmentToolUtils.java | 106 ++--- .../WEB-INF/tools/sakai.assignment.grades.xml | 1 - assignment/tool/src/webapp/js/assignments.js | 5 + .../webapp/vm/assignment/assignment_macros.vm | 8 +- ...signments_instructor_grading_submission.vm | 372 +++++++++--------- ...nts_instructor_list_deleted_assignments.vm | 2 +- ...assignments_instructor_list_submissions.vm | 175 ++++---- ...ignments_instructor_new_edit_assignment.vm | 4 +- ...signments_instructor_preview_assignment.vm | 116 +++--- ...s_instructor_preview_grading_submission.vm | 2 +- ...signments_instructor_reorder_assignment.vm | 4 +- ...signments_instructor_report_submissions.vm | 2 +- ...nts_instructor_student_list_submissions.vm | 38 +- .../chef_assignments_list_assignments.vm | 16 +- .../vm/assignment/chef_assignments_options.vm | 2 +- ..._assignments_student_confirm_submission.vm | 58 ++- ..._assignments_student_preview_submission.vm | 58 ++- .../chef_assignments_student_review_edit.vm | 74 ++-- .../chef_assignments_student_view_grade.vm | 76 ++-- ...hef_assignments_student_view_submission.vm | 136 +++---- 26 files changed, 807 insertions(+), 871 deletions(-) diff --git a/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentConstants.java b/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentConstants.java index c290403dbb95..014c27513b45 100644 --- a/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentConstants.java +++ b/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentConstants.java @@ -333,8 +333,6 @@ public enum IMSGradingProgress { public static final String STATE_CONTEXT_STRING = "Assignment.context_string"; - public static final String WITH_GRADES = "with_grades"; - public static final String GRADE_SUBMISSION_SUBMISSION_ID = "grade_submission_submission_id"; public static final String GRADE_SUBMISSION_ASSIGNMENT_ID = "grade_submission_assignment_id"; public static final String GRADE_SUBMISSION_GRADE = "grade_submission_grade"; diff --git a/assignment/api/src/resources/assignment.properties b/assignment/api/src/resources/assignment.properties index 3f97ccd6b4e5..fe3af62979df 100644 --- a/assignment/api/src/resources/assignment.properties +++ b/assignment/api/src/resources/assignment.properties @@ -1060,7 +1060,8 @@ sendFeedback.label = Send Feedback to Multiple Students sendFeedback.instruction = Select students from the table below. Write your feedback in the following text area, select any additional feedback options, and then click "Update" to save. sendFeedback.options = Feedback options sendFeedback.overwrite = Replace existing "Instructor Summary Comments" feedback for selected students. -sendFeedback.returnToStudents = Return feedback to selected students now. (NOTE: Only the feedback will be released, if you want to release the grades you must click on "Release Grades"). +sendFeedback.returnToStudents = Return feedback to selected students now +sendFeedback.returnToStudents.note = (NOTE: Only the feedback will be released, if you want to release the grades you must click on "Release Grades") sendFeedback.nouser = Please choose at least one student to send feedback. sendFeedback.nocomment = Please enter a feedback comment. sendFeedback.savedow = Feedback has been replaced and saved successfully. diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java index cbbc4c547c2f..e1366c002a57 100644 --- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java +++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java @@ -1942,21 +1942,31 @@ private AssignmentConstants.SubmissionStatus getGradersCanonicalSubmissionStatus } } else { if (returnTime != null && returnTime.isAfter(submitTime)) { - return resubmissionAllowed ? SubmissionStatus.RETURNED_PENDING_RESUBMIT : SubmissionStatus.RETURNED; + return resubmissionAllowed ? SubmissionStatus.RETURNED_PENDING_RESUBMIT : SubmissionStatus.RETURNED; } else { return SubmissionStatus.RETURNED; } } } else if (submission.getGraded()) { - return StringUtils.isNotBlank(submission.getGrade()) ? SubmissionStatus.GRADED : SubmissionStatus.COMMENTED; - } else { - return SubmissionStatus.UNGRADED; + if (StringUtils.isNotBlank(submission.getGrade())) { + return SubmissionStatus.GRADED; + } else if (StringUtils.isNotBlank(submission.getFeedbackComment())) { + return SubmissionStatus.COMMENTED; + } + } else if (StringUtils.isNotBlank(submission.getFeedbackComment())) { + return SubmissionStatus.COMMENTED; } } else { if (submission.getReturned()) { return SubmissionStatus.RETURNED; } else if (submission.getGraded()) { - return StringUtils.isNotBlank(submission.getGrade()) ? SubmissionStatus.GRADED : SubmissionStatus.COMMENTED; + if (StringUtils.isNotBlank(submission.getGrade())) { + return SubmissionStatus.GRADED; + } else if (StringUtils.isNotBlank(submission.getFeedbackComment())) { + return SubmissionStatus.COMMENTED; + } + } else if (StringUtils.isNotBlank(submission.getFeedbackComment())) { + return SubmissionStatus.COMMENTED; } else { return SubmissionStatus.NO_SUBMISSION; } @@ -1968,12 +1978,17 @@ private AssignmentConstants.SubmissionStatus getGradersCanonicalSubmissionStatus return SubmissionStatus.RETURNED; } else { // grade saved but not release yet, show this to graders - return StringUtils.isNotBlank(submission.getGrade()) ? AssignmentConstants.SubmissionStatus.GRADED : AssignmentConstants.SubmissionStatus.COMMENTED; + if (StringUtils.isNotBlank(submission.getGrade())) { + return SubmissionStatus.GRADED; + } else if (StringUtils.isNotBlank(submission.getFeedbackComment())) { + return SubmissionStatus.COMMENTED; + } } - } else { - return SubmissionStatus.UNGRADED; + } else if (StringUtils.isNotBlank(submission.getFeedbackComment())) { + return SubmissionStatus.COMMENTED; } } + return SubmissionStatus.UNGRADED; } private AssignmentConstants.SubmissionStatus getSubmittersCanonicalSubmissionStatus(AssignmentSubmission submission) { @@ -2936,8 +2951,6 @@ public boolean isGradeOverridden(AssignmentSubmission submission, String submitt * Contains logic to consistently output a String based version of a grade * Interprets the grade using the scale for display * - * This should probably be moved to a static utility class - ern - * * @param grade * @param typeOfGrade * @param scaleFactor diff --git a/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentServiceTest.java b/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentServiceTest.java index 769aebae8660..b233648c9ffb 100644 --- a/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentServiceTest.java +++ b/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentServiceTest.java @@ -833,15 +833,17 @@ public void submissionCanonicalStatus() { assignment.setDueDate(null); Assert.assertEquals(AssignmentConstants.SubmissionStatus.GRADED, assignmentService.getSubmissionCanonicalStatus(submission, true)); - // submission is Submitted | DateSubmitted exists | submission not Returned | submission is Graded | User can Grade | Grade not exists = COMMENTED + // submission is Submitted | DateSubmitted exists | submission not Returned | submission is Graded | User can Grade | Comment exists | Grade not exists = COMMENTED submission.setSubmitted(true); submission.setDateSubmitted(now); submission.setReturned(false); submission.setDateReturned(null); submission.setGraded(true); submission.setGrade(null); + submission.setFeedbackComment("Graders comment"); assignment.setDueDate(null); Assert.assertEquals(AssignmentConstants.SubmissionStatus.COMMENTED, assignmentService.getSubmissionCanonicalStatus(submission, true)); + submission.setFeedbackComment(null); // submission is Submitted | DateSubmitted exists | submission not Returned | User can't Grade = SUBMITTED submission.setSubmitted(true); @@ -884,15 +886,17 @@ public void submissionCanonicalStatus() { assignment.setDueDate(null); Assert.assertEquals(AssignmentConstants.SubmissionStatus.GRADED, assignmentService.getSubmissionCanonicalStatus(submission, true)); - // submission is Submitted | DateSubmitted not exists | submission not Returned | submission is Graded | User can Grade | Grade not exists = COMMENTED + // submission is Submitted | DateSubmitted not exists | submission not Returned | submission is Graded | User can Grade | Comment exists | Grade not exists = COMMENTED submission.setSubmitted(true); submission.setDateSubmitted(null); submission.setReturned(false); submission.setDateReturned(null); submission.setGraded(true); submission.setGrade(null); + submission.setFeedbackComment("Graders comment"); assignment.setDueDate(null); Assert.assertEquals(AssignmentConstants.SubmissionStatus.COMMENTED, assignmentService.getSubmissionCanonicalStatus(submission, true)); + submission.setFeedbackComment(null); // submission is Submitted | DateSubmitted not exists | submission not Returned | submission not Graded | User can't Grade | Assignment is HonorPledge | Submission is HonorPledge = HONOR_ACCEPTED submission.setSubmitted(true); @@ -991,12 +995,14 @@ public void submissionCanonicalStatus() { submission.setGrade("1000"); Assert.assertEquals(AssignmentConstants.SubmissionStatus.GRADED, assignmentService.getSubmissionCanonicalStatus(submission, true)); - // submission not Submitted | submission Graded | submission not Returned | User can Grade | Grade not exists = COMMENTED + // submission not Submitted | submission Graded | submission not Returned | User can Grade | Comment exists | Grade not exists = COMMENTED submission.setSubmitted(false); submission.setReturned(false); submission.setGraded(true); + submission.setFeedbackComment("Graders comment"); submission.setGrade(null); Assert.assertEquals(AssignmentConstants.SubmissionStatus.COMMENTED, assignmentService.getSubmissionCanonicalStatus(submission, true)); + submission.setFeedbackComment(null); // submission not Submitted | submission Graded | submission not Returned | User can't Grade = IN_PROGRESS submission.setSubmitted(false); diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java b/assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java index ee2fa382ef0c..87cf0c0d8f0c 100644 --- a/assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java +++ b/assignment/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java @@ -1161,10 +1161,16 @@ public ActionReturn setGrade(Map params) { throw new EntityException("You don't have permission to set grades", "", HttpServletResponse.SC_FORBIDDEN); } - if (assignment.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { - grade = assignmentToolUtils.scalePointGrade(grade, assignment.getScaleFactor(), alerts); - } else if (assignment.getTypeOfGrade() == Assignment.GradeType.PASS_FAIL_GRADE_TYPE && grade.equals(AssignmentConstants.UNGRADED_GRADE_STRING)) { - grade = null; + switch (assignment.getTypeOfGrade()) { + case SCORE_GRADE_TYPE: + grade = assignmentToolUtils.scalePointGrade(grade, assignment.getScaleFactor(), alerts); + break; + case UNGRADED_GRADE_TYPE: + grade = ASSN_GRADE_TYPE_NOGRADE_PROP; + break; + case PASS_FAIL_GRADE_TYPE: + if (AssignmentConstants.UNGRADED_GRADE_STRING.equals(grade)) grade = null; + default: } Map options = new HashMap<>(); @@ -1187,7 +1193,6 @@ public ActionReturn setGrade(Map params) { options.put(GRADE_SUBMISSION_FEEDBACK_TEXT, feedbackText); options.put(GRADE_SUBMISSION_FEEDBACK_COMMENT, feedbackComment); options.put(GRADE_SUBMISSION_PRIVATE_NOTES, privateNotes); - options.put(WITH_GRADES, true); options.put(ALLOW_RESUBMIT_NUMBER, resubmitNumber); if (StringUtils.isNotBlank(resubmitDate)) { diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java index cbaab70dcbe3..30cc0c5fa8ad 100644 --- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java +++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java @@ -47,13 +47,6 @@ import static org.sakaiproject.assignment.api.AssignmentServiceConstants.PROP_ASSIGNMENT_GROUP_FILTER_ENABLED; import static org.sakaiproject.assignment.api.AssignmentServiceConstants.REFERENCE_ROOT; import static org.sakaiproject.assignment.api.AssignmentServiceConstants.SECURE_UPDATE_ASSIGNMENT; -import static org.sakaiproject.assignment.api.model.Assignment.GradeType.CHECK_GRADE_TYPE; -import static org.sakaiproject.assignment.api.model.Assignment.GradeType.GRADE_TYPE_NONE; -import static org.sakaiproject.assignment.api.model.Assignment.GradeType.LETTER_GRADE_TYPE; -import static org.sakaiproject.assignment.api.model.Assignment.GradeType.PASS_FAIL_GRADE_TYPE; -import static org.sakaiproject.assignment.api.model.Assignment.GradeType.SCORE_GRADE_TYPE; -import static org.sakaiproject.assignment.api.model.Assignment.GradeType.UNGRADED_GRADE_TYPE; -import static org.sakaiproject.assignment.api.model.Assignment.GradeType.values; import org.sakaiproject.util.CalendarUtil; @@ -956,10 +949,6 @@ public class AssignmentAction extends PagedResourceActionII { * The selected view */ private static final String STATE_SELECTED_VIEW = "state_selected_view"; - /** - * The configuration choice of with grading option or not - */ - private static final String WITH_GRADES = "with_grades"; /** * The configuration choice of showing or hiding the number of submissions column */ @@ -1378,9 +1367,6 @@ public String buildMainPanelContext(VelocityPortlet portlet, Context context, Ru context.put("peerAssessmentUse", rb.getFormattedMessage("peerAssessmentUse")); } - // grading option - context.put("withGrade", state.getAttribute(WITH_GRADES)); - // the grade type table context.put("gradeTypeTable", gradeTypeTable()); @@ -3276,7 +3262,7 @@ protected void setAssignmentFormContext(SessionState state, Context context) { anonGrading = (Boolean) state.getAttribute(NEW_ASSIGNMENT_CHECK_ANONYMOUS_GRADING); } - Assignment.GradeType gradeType = values()[(Integer) state.getAttribute(NEW_ASSIGNMENT_GRADE_TYPE)]; + Assignment.GradeType gradeType = Assignment.GradeType.values()[(Integer) state.getAttribute(NEW_ASSIGNMENT_GRADE_TYPE)]; String maxGrade = (String) state.getAttribute(NEW_ASSIGNMENT_GRADE_POINTS); context.put("value_GradeType", gradeType.ordinal()); context.put("value_GradePoints", assignmentService.getGradeDisplay(maxGrade, gradeType, scaleFactor)); @@ -3846,7 +3832,7 @@ private String build_instructor_preview_assignment_context(VelocityPortlet portl context.put("gradeName", getGradeName(a, assignmentId)); context.put("value_CheckAnonymousGrading", assignmentService.assignmentUsesAnonymousGrading(a)); context.put("isDraft", a.getDraft()); - if (a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { String maxGrade = (String) state.getAttribute(NEW_ASSIGNMENT_GRADE_POINTS); context.put("value_GradePoints", displayGrade(state, maxGrade, a.getScaleFactor())); } @@ -3904,7 +3890,7 @@ protected String build_instructor_delete_assignment_context(VelocityPortlet port * build the instructor view to grade an submission */ protected String build_instructor_grade_submission_context(VelocityPortlet portlet, Context context, RunData data, SessionState state) { - Assignment.GradeType gradeType = GRADE_TYPE_NONE; + Assignment.GradeType gradeType = Assignment.GradeType.GRADE_TYPE_NONE; Integer scaleFactor = assignmentService.getScaleFactor(); // need to show the alert for grading drafts? @@ -3952,7 +3938,7 @@ protected String build_instructor_grade_submission_context(VelocityPortlet portl a.getAttachments().forEach(r -> attachmentReferences.put(r, entityManager.newReference(r))); context.put("assignmentAttachmentReferences", attachmentReferences); - if (a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { context.put("value_grade", displayGrade(state, (String) state.getAttribute(GRADE_SUBMISSION_GRADE), scaleFactor)); } } @@ -4774,7 +4760,7 @@ private String build_instructor_preview_grade_submission_context(VelocityPortlet // format to show "factor" decimal places String grade = (String) state.getAttribute(GRADE_SUBMISSION_GRADE); - if (assignment.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (assignment.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { grade = displayGrade(state, grade, assignment.getScaleFactor()); } context.put("grade", grade); @@ -4839,7 +4825,7 @@ private String build_instructor_grade_assignment_context(VelocityPortlet portlet Assignment.GradeType gradeType = assignment.getTypeOfGrade(); context.put("typeOfGrade", gradeType.ordinal()); context.put("typeOfGradeString", getTypeOfGradeString(gradeType)); - if (gradeType.equals(SCORE_GRADE_TYPE)) { + if (gradeType.equals(Assignment.GradeType.SCORE_GRADE_TYPE)) { Integer scaleFactor = assignment.getScaleFactor() != null ? assignment.getScaleFactor() : assignmentService.getScaleFactor(); context.put("maxGradePointString", assignmentService.getMaxPointGradeDisplay(scaleFactor, assignment.getMaxGradePoint())); } @@ -5178,7 +5164,7 @@ private String build_instructor_view_assignment_context(VelocityPortlet portlet, putCreatorIntoContext(context, assignment); context.put("typeOfGradeString", getTypeOfGradeString(assignment.getTypeOfGrade())); - if (assignment.getTypeOfGrade().equals(SCORE_GRADE_TYPE)) { + if (assignment.getTypeOfGrade().equals(Assignment.GradeType.SCORE_GRADE_TYPE)) { Integer scaleFactor = assignment.getScaleFactor() != null ? assignment.getScaleFactor() : assignmentService.getScaleFactor(); context.put("maxGradePointString", assignmentService.getMaxPointGradeDisplay(scaleFactor, assignment.getMaxGradePoint())); } @@ -5307,7 +5293,7 @@ private String build_instructor_reorder_assignment_context(VelocityPortlet portl } // build_instructor_reorder_assignment_context private String build_student_review_edit_context(VelocityPortlet portlet, Context context, RunData data, SessionState state) { - Assignment.GradeType gradeType = GRADE_TYPE_NONE; + Assignment.GradeType gradeType = Assignment.GradeType.GRADE_TYPE_NONE; context.put("context", state.getAttribute(STATE_CONTEXT_STRING)); List peerAssessmentItems = (List) state.getAttribute(PEER_ASSESSMENT_ITEMS); String assignmentId = (String) state.getAttribute(VIEW_ASSIGNMENT_ID); @@ -6115,14 +6101,16 @@ public void doView_submission_list_option(RunData data) { ParameterParser params = data.getParameters(); String option = params.getString("option"); - if ("upload".equals(option)) { - // go to upload all page - doPrep_upload_all(data); - } else if ("releaseGrades".equals(option)) { - // release all grades - doRelease_grades(data); + switch (option) { + case "releaseCommented": + case "releaseGrades": + doRelease_grades(data); + break; + case "upload": + doPrep_upload_all(data); + break; + default: } - } // doView_submission_list_option public void doView_submission_list_search(RunData data) @@ -6987,7 +6975,7 @@ private void post_save_submission(RunData data, boolean post) { if (StringUtils.isBlank(previousGrades)) { previousGrades = properties.get(ResourceProperties.PROP_SUBMISSION_PREVIOUS_GRADES); if (StringUtils.isNotBlank(previousGrades)) { - if (a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { // point grade assignment type // some old unscaled grades, need to scale the number and remove the old property String[] grades = StringUtils.split(previousGrades, " "); @@ -7583,21 +7571,17 @@ private void setNewAssignmentParameters(RunData data, boolean validify) { // ------------------- BEGIN GRADING PARAMS ------------------- - Assignment.GradeType gradeType = GRADE_TYPE_NONE; - // grade type and grade points - if (state.getAttribute(WITH_GRADES) != null && (Boolean) state.getAttribute(WITH_GRADES)) { - boolean gradeAssignment = params.getBoolean(NEW_ASSIGNMENT_GRADE_ASSIGNMENT); - state.setAttribute(NEW_ASSIGNMENT_GRADE_ASSIGNMENT, gradeAssignment); - int gType = gradeAssignment ? params.getInt(NEW_ASSIGNMENT_GRADE_TYPE) : UNGRADED_GRADE_TYPE.ordinal(); - gradeType = values()[gType]; - state.setAttribute(NEW_ASSIGNMENT_GRADE_TYPE, gradeType.ordinal()); - } + boolean gradeAssignment = params.getBoolean(NEW_ASSIGNMENT_GRADE_ASSIGNMENT); + state.setAttribute(NEW_ASSIGNMENT_GRADE_ASSIGNMENT, gradeAssignment); + int gType = gradeAssignment ? params.getInt(NEW_ASSIGNMENT_GRADE_TYPE) : Assignment.GradeType.UNGRADED_GRADE_TYPE.ordinal(); + Assignment.GradeType gradeType = Assignment.GradeType.values()[gType]; + state.setAttribute(NEW_ASSIGNMENT_GRADE_TYPE, gradeType.ordinal()); // check if grade type is switching and prompt for confirmation if graded submissions exist if (StringUtils.isNotBlank(assignmentRef)) { Assignment asn = getAssignment(assignmentRef, "setNewAssignmentParameters", state); - if (asn != null && gradeType != GRADE_TYPE_NONE && asn.getTypeOfGrade() != gradeType) { + if (asn != null && gradeType != Assignment.GradeType.GRADE_TYPE_NONE && asn.getTypeOfGrade() != gradeType) { state.setAttribute(NEW_ASSIGNMENT_GRADE_TYPE_SWITCHING, Boolean.TRUE); Set submissions = assignmentService.getSubmissions(asn); if (submissions.stream().anyMatch(s -> s.getGraded())) { @@ -7635,7 +7619,7 @@ private void setNewAssignmentParameters(RunData data, boolean validify) { String associateAssignment = params.getString(PROP_ASSIGNMENT_ASSOCIATE_GRADEBOOK_ASSIGNMENT); Double droppedCategoryPoints = -1D; - if (grading != null && gradeType != UNGRADED_GRADE_TYPE) { + if (grading != null && gradeType != Assignment.GradeType.UNGRADED_GRADE_TYPE) { if (grading.equals(GRADEBOOK_INTEGRATION_ASSOCIATE)) { state.setAttribute(PROP_ASSIGNMENT_ASSOCIATE_GRADEBOOK_ASSIGNMENT, associateAssignment); } else { @@ -7644,7 +7628,7 @@ private void setNewAssignmentParameters(RunData data, boolean validify) { if (!grading.equals(GRADEBOOK_INTEGRATION_NO)) { // gradebook integration only available to point-grade assignment - if (gradeType != SCORE_GRADE_TYPE) { + if (gradeType != Assignment.GradeType.SCORE_GRADE_TYPE) { addAlert(state, rb.getString("addtogradebook.wrongGradeScale")); } @@ -7724,7 +7708,7 @@ private void setNewAssignmentParameters(RunData data, boolean validify) { //Peer Assessment boolean peerAssessment = false; - if (gradeType == SCORE_GRADE_TYPE && params.getBoolean(NEW_ASSIGNMENT_USE_PEER_ASSESSMENT)) { + if (gradeType == Assignment.GradeType.SCORE_GRADE_TYPE && params.getBoolean(NEW_ASSIGNMENT_USE_PEER_ASSESSMENT)) { state.setAttribute(NEW_ASSIGNMENT_USE_PEER_ASSESSMENT, Boolean.TRUE.toString()); peerAssessment = true; } else { @@ -8028,11 +8012,11 @@ private void setNewAssignmentParameters(RunData data, boolean validify) { String option = params.get("option"); - if (!"attach".equals(option) && state.getAttribute(WITH_GRADES) != null && (Boolean) state.getAttribute(WITH_GRADES)) { + if (!"attach".equals(option)) { // the grade point String gradePoints = params.getString(NEW_ASSIGNMENT_GRADE_POINTS); state.setAttribute(NEW_ASSIGNMENT_GRADE_POINTS, gradePoints); - if (gradePoints != null && gradeType == SCORE_GRADE_TYPE) { + if (gradePoints != null && gradeType == Assignment.GradeType.SCORE_GRADE_TYPE) { if (gradePoints.length() == 0) { // in case of point grade assignment, user must specify maximum grade point addAlert(state, rb.getString("plespethe3")); @@ -8604,7 +8588,7 @@ private void post_save_assignment(RunData data, String postOrSave) { Assignment.SubmissionType submissionType = Assignment.SubmissionType.values()[(Integer) state.getAttribute(NEW_ASSIGNMENT_SUBMISSION_TYPE)]; - Assignment.GradeType gradeType = values()[(Integer) state.getAttribute(NEW_ASSIGNMENT_GRADE_TYPE)]; + Assignment.GradeType gradeType = Assignment.GradeType.values()[(Integer) state.getAttribute(NEW_ASSIGNMENT_GRADE_TYPE)]; String gradePoints = (String) state.getAttribute(NEW_ASSIGNMENT_GRADE_POINTS); @@ -9225,7 +9209,7 @@ private void initIntegrateWithGradebook(SessionState state, String siteId, Strin addUpdateRemoveAssignment = "update"; } - if (!"remove".equals(addUpdateRemoveAssignment) && gradeType == SCORE_GRADE_TYPE) { + if (!"remove".equals(addUpdateRemoveAssignment) && gradeType == Assignment.GradeType.SCORE_GRADE_TYPE) { try { addAlerts(state, assignmentToolUtils.integrateGradebook(stateToMap(state), assignmentReference, associateGradebookAssignment, addUpdateRemoveAssignment, aOldTitle, title, Integer.parseInt(gradePoints), dueTime, null, null, category)); @@ -9725,7 +9709,7 @@ private void commitAssignment(SessionState state, // post the assignment if appropriate a.setDraft(!post); - if (gradeType == SCORE_GRADE_TYPE) { + if (gradeType == Assignment.GradeType.SCORE_GRADE_TYPE) { if (a.getScaleFactor() == null) { // only set the default scale factor if the assignment does not have one a.setScaleFactor(assignmentService.getScaleFactor()); @@ -10219,7 +10203,7 @@ public void doEdit_assignment(RunData data) { state.setAttribute(NEW_ASSIGNMENT_SUBMISSION_TYPE, a.getTypeOfSubmission().ordinal()); state.setAttribute(NEW_ASSIGNMENT_CATEGORY, 0); state.setAttribute(NEW_ASSIGNMENT_GRADE_TYPE, a.getTypeOfGrade().ordinal()); - if (a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { state.setAttribute(NEW_ASSIGNMENT_GRADE_POINTS, a.getMaxGradePoint().toString()); } state.setAttribute(NEW_ASSIGNMENT_DESCRIPTION, a.getInstructions()); @@ -10875,18 +10859,12 @@ public void doRelease_grades(RunData data) { for (AssignmentSubmission s : submissions) { String grade = s.getGrade(); if (s.getGraded() || StringUtils.isNotBlank(grade)) { - boolean withGrade = state.getAttribute(WITH_GRADES) != null ? (Boolean) state.getAttribute(WITH_GRADES) : false; - if (withGrade) { - // for the assignment tool with grade option, a valide grade is needed - if (StringUtils.isNotBlank(grade)) { - s.setGradeReleased(true); - if (!s.getGraded()) { - s.setGraded(true); - } - } - } else { - // for the assignment tool without grade option, no grade is needed + // for the assignment tool with grade option, a valide grade is needed + if (StringUtils.isNotBlank(grade)) { s.setGradeReleased(true); + if (!s.getGraded()) { + s.setGraded(true); + } } // also set the return status @@ -11740,7 +11718,6 @@ public boolean readGradeForm(RunData data, SessionState state, String gradeOptio // security check for allowing grading submission or not if (assignmentService.allowGradeSubmission(sId)) { - boolean withGrade = state.getAttribute(WITH_GRADES) != null ? (Boolean) state.getAttribute(WITH_GRADES) : false; String feedbackComment = processFormattedTextFromBrowser(state, params.getCleanString(GRADE_SUBMISSION_FEEDBACK_COMMENT), true); // comment value changed? @@ -11782,120 +11759,117 @@ public boolean readGradeForm(RunData data, SessionState state, String gradeOptio int factor = a.getScaleFactor() != null ? a.getScaleFactor() : assignmentService.getScaleFactor(); Assignment.GradeType typeOfGrade = a.getTypeOfGrade(); - if (withGrade) { - // any change in grade. Do not check for ungraded assignment type - if (!hasChange && typeOfGrade != UNGRADED_GRADE_TYPE) { - if (typeOfGrade == SCORE_GRADE_TYPE) { - String currentGrade = submission.getGrade(); + // any change in grade. Do not check for ungraded assignment type + if (!hasChange && typeOfGrade != Assignment.GradeType.UNGRADED_GRADE_TYPE) { + if (typeOfGrade == Assignment.GradeType.SCORE_GRADE_TYPE) { + String currentGrade = submission.getGrade(); - String decSeparator = formattedText.getDecimalSeparator(); + String decSeparator = formattedText.getDecimalSeparator(); - if (currentGrade != null && currentGrade.contains(decSeparator)) { - currentGrade = scalePointGrade(state, submission.getGrade(), factor); - } - hasChange = valueDiffFromStateAttribute(state, scalePointGrade(state, g, factor), currentGrade); - } else { - hasChange = valueDiffFromStateAttribute(state, g, submission.getGrade()); + if (currentGrade != null && currentGrade.contains(decSeparator)) { + currentGrade = scalePointGrade(state, submission.getGrade(), factor); } - } - if (g != null) { - state.setAttribute(GRADE_SUBMISSION_GRADE, g); + hasChange = valueDiffFromStateAttribute(state, scalePointGrade(state, g, factor), currentGrade); } else { - state.removeAttribute(GRADE_SUBMISSION_GRADE); + hasChange = valueDiffFromStateAttribute(state, g, submission.getGrade()); } + } + if (g != null) { + state.setAttribute(GRADE_SUBMISSION_GRADE, g); + } else { + state.removeAttribute(GRADE_SUBMISSION_GRADE); + } - // for points grading, one have to enter number as the points - String grade = (String) state.getAttribute(GRADE_SUBMISSION_GRADE); - - // do grade validation only for Assignment with Grade tool - if (typeOfGrade == SCORE_GRADE_TYPE) { - if ((grade != null)) { - // the preview grade process might already scaled up the grade by "factor" - if (!((String) state.getAttribute(STATE_MODE)).equals(MODE_INSTRUCTOR_PREVIEW_GRADE_SUBMISSION)) { - if (state.getAttribute(STATE_MESSAGE) == null) { - validPointGrade(state, grade, factor); - int maxGrade = a.getMaxGradePoint(); - try { - if (state.getAttribute(STATE_MESSAGE) == null && Integer.parseInt(scalePointGrade(state, grade, factor)) > maxGrade) { - if (state.getAttribute(GRADE_GREATER_THAN_MAX_ALERT) == null) { - // alert user first when he enters grade bigger than max scale - addAlert(state, rb.getFormattedMessage("grad2", grade, displayGrade(state, String.valueOf(maxGrade), factor))); - state.setAttribute(GRADE_GREATER_THAN_MAX_ALERT, Boolean.TRUE); - } else { - // remove the alert once user confirms he wants to give student higher grade - state.removeAttribute(GRADE_GREATER_THAN_MAX_ALERT); - } + // for points grading, one have to enter number as the points + String grade = (String) state.getAttribute(GRADE_SUBMISSION_GRADE); + + // do grade validation only for Assignment with Grade tool + if (typeOfGrade == Assignment.GradeType.SCORE_GRADE_TYPE) { + if ((grade != null)) { + // the preview grade process might already scaled up the grade by "factor" + if (!((String) state.getAttribute(STATE_MODE)).equals(MODE_INSTRUCTOR_PREVIEW_GRADE_SUBMISSION)) { + if (state.getAttribute(STATE_MESSAGE) == null) { + validPointGrade(state, grade, factor); + int maxGrade = a.getMaxGradePoint(); + try { + if (state.getAttribute(STATE_MESSAGE) == null && Integer.parseInt(scalePointGrade(state, grade, factor)) > maxGrade) { + if (state.getAttribute(GRADE_GREATER_THAN_MAX_ALERT) == null) { + // alert user first when he enters grade bigger than max scale + addAlert(state, rb.getFormattedMessage("grad2", grade, displayGrade(state, String.valueOf(maxGrade), factor))); + state.setAttribute(GRADE_GREATER_THAN_MAX_ALERT, Boolean.TRUE); + } else { + // remove the alert once user confirms he wants to give student higher grade + state.removeAttribute(GRADE_GREATER_THAN_MAX_ALERT); } - } catch (NumberFormatException e) { - alertInvalidPoint(state, grade, factor); - log.warn(this + ":readGradeForm " + e.getMessage()); } + } catch (NumberFormatException e) { + alertInvalidPoint(state, grade, factor); + log.warn(this + ":readGradeForm " + e.getMessage()); } - - state.setAttribute(GRADE_SUBMISSION_GRADE, grade); } + + state.setAttribute(GRADE_SUBMISSION_GRADE, grade); } } + } - // if ungraded and grade type is not "ungraded" type - if ((grade == null || UNGRADED_GRADE_STRING.equals(grade)) && (typeOfGrade != UNGRADED_GRADE_TYPE) && "release".equals(gradeOption)) { - addAlert(state, rb.getString("plespethe2")); - } + // if ungraded and grade type is not "ungraded" type + if ((grade == null || UNGRADED_GRADE_STRING.equals(grade)) && (typeOfGrade != Assignment.GradeType.UNGRADED_GRADE_TYPE) && "release".equals(gradeOption)) { + addAlert(state, rb.getString("plespethe2")); + } - // check for grade overrides - if (a.getIsGroup()) { - HashMap scaledValues = new HashMap(); - Set submitters = submission.getSubmitters(); - for (AssignmentSubmissionSubmitter submitter : submitters) { - String ug = StringUtils.trimToNull(params.getCleanString(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter())); - if ("null".equals(ug)) ug = null; - if (!hasChange && typeOfGrade != UNGRADED_GRADE_TYPE) { - hasChange = valueDiffFromStateAttribute(state, ug, submitter.getGrade()); - } - if (ug == null) { - state.removeAttribute(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter()); - } else { - state.setAttribute(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter(), ug); - } - // for points grading, one have to enter number as the points - String ugrade = (String) state.getAttribute(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter()); - // do grade validation only for Assignment with Grade tool - if (typeOfGrade == SCORE_GRADE_TYPE) { - if (ugrade != null && !(ugrade.equals("null"))) { - // the preview grade process might already scaled up the grade by "factor" - if (!((String) state.getAttribute(STATE_MODE)).equals(MODE_INSTRUCTOR_PREVIEW_GRADE_SUBMISSION)) { - validPointGrade(state, ugrade, factor); - if (state.getAttribute(STATE_MESSAGE) == null) { - int maxGrade = a.getMaxGradePoint(); - try { - if (Integer.parseInt(scalePointGrade(state, ugrade, factor)) > maxGrade) { - if (state.getAttribute(GRADE_GREATER_THAN_MAX_ALERT) == null) { - // alert user first when he enters grade bigger than max scale - addAlert(state, rb.getFormattedMessage("grad2", ugrade, displayGrade(state, String.valueOf(maxGrade), factor))); - state.setAttribute(GRADE_GREATER_THAN_MAX_ALERT, Boolean.TRUE); - } else { - // remove the alert once user confirms he wants to give student higher grade - state.removeAttribute(GRADE_GREATER_THAN_MAX_ALERT); - } + // check for grade overrides + if (a.getIsGroup()) { + HashMap scaledValues = new HashMap(); + Set submitters = submission.getSubmitters(); + for (AssignmentSubmissionSubmitter submitter : submitters) { + String ug = StringUtils.trimToNull(params.getCleanString(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter())); + if ("null".equals(ug)) ug = null; + if (!hasChange && typeOfGrade != Assignment.GradeType.UNGRADED_GRADE_TYPE) { + hasChange = valueDiffFromStateAttribute(state, ug, submitter.getGrade()); + } + if (ug == null) { + state.removeAttribute(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter()); + } else { + state.setAttribute(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter(), ug); + } + // for points grading, one have to enter number as the points + String ugrade = (String) state.getAttribute(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter()); + // do grade validation only for Assignment with Grade tool + if (typeOfGrade == Assignment.GradeType.SCORE_GRADE_TYPE) { + if (ugrade != null && !(ugrade.equals("null"))) { + // the preview grade process might already scaled up the grade by "factor" + if (!((String) state.getAttribute(STATE_MODE)).equals(MODE_INSTRUCTOR_PREVIEW_GRADE_SUBMISSION)) { + validPointGrade(state, ugrade, factor); + if (state.getAttribute(STATE_MESSAGE) == null) { + int maxGrade = a.getMaxGradePoint(); + try { + if (Integer.parseInt(scalePointGrade(state, ugrade, factor)) > maxGrade) { + if (state.getAttribute(GRADE_GREATER_THAN_MAX_ALERT) == null) { + // alert user first when he enters grade bigger than max scale + addAlert(state, rb.getFormattedMessage("grad2", ugrade, displayGrade(state, String.valueOf(maxGrade), factor))); + state.setAttribute(GRADE_GREATER_THAN_MAX_ALERT, Boolean.TRUE); + } else { + // remove the alert once user confirms he wants to give student higher grade + state.removeAttribute(GRADE_GREATER_THAN_MAX_ALERT); } - } catch (NumberFormatException e) { - alertInvalidPoint(state, ugrade, factor); - log.warn(this + ":readGradeForm User " + e.getMessage()); } + } catch (NumberFormatException e) { + alertInvalidPoint(state, ugrade, factor); + log.warn(this + ":readGradeForm User " + e.getMessage()); } - scaledValues.put(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter(), scalePointGrade(state, ugrade, factor)); } + scaledValues.put(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter(), scalePointGrade(state, ugrade, factor)); } } } - // SAK-28182 If all grades are right place scaled values in state - if (state.getAttribute(STATE_MESSAGE) == null) { - for (Map.Entry entry : scaledValues.entrySet()) { - state.setAttribute(entry.getKey(), entry.getValue()); - } + } + // SAK-28182 If all grades are right place scaled values in state + if (state.getAttribute(STATE_MESSAGE) == null) { + for (Map.Entry entry : scaledValues.entrySet()) { + state.setAttribute(entry.getKey(), entry.getValue()); } } - } // allow resubmit number and due time @@ -11922,8 +11896,7 @@ public boolean readGradeForm(RunData data, SessionState state, String gradeOptio hasChange = hasChange || change_resubmit_option(state, submission.getProperties()); hasChange = hasChange || propertyValueChanged(state, submission.getProperties(), AssignmentConstants.ALLOW_EXTENSION_CLOSETIME); //same for Extension. if (state.getAttribute(STATE_MESSAGE) == null) { - String grade = (String) state.getAttribute(GRADE_SUBMISSION_GRADE); - grade = (typeOfGrade == SCORE_GRADE_TYPE) ? scalePointGrade(state, grade, factor) : grade; + grade = (typeOfGrade == Assignment.GradeType.SCORE_GRADE_TYPE) ? scalePointGrade(state, grade, factor) : grade; state.setAttribute(GRADE_SUBMISSION_GRADE, grade); } } @@ -12229,15 +12202,6 @@ protected void initState(SessionState state, VelocityPortlet portlet, JetspeedRu state.setAttribute(STATE_TOP_PAGE_MESSAGE, 0); } - if (state.getAttribute(WITH_GRADES) == null) { - PortletConfig config = portlet.getPortletConfig(); - String withGrades = StringUtils.trimToNull(config.getInitParameter("withGrades")); - if (withGrades == null) { - withGrades = Boolean.FALSE.toString(); - } - state.setAttribute(WITH_GRADES, Boolean.valueOf(withGrades)); - } - // whether to display the number of submission/ungraded submission column // default to show if (state.getAttribute(SHOW_NUMBER_SUBMISSION_COLUMN) == null) { @@ -12418,8 +12382,7 @@ private void initializeAssignment(SessionState state) { state.setAttribute(NEW_ASSIGNMENT_SUBMISSION_TYPE, Assignment.SubmissionType.TEXT_AND_ATTACHMENT_ASSIGNMENT_SUBMISSION.ordinal()); Boolean withGradesConfig = serverConfigurationService.getBoolean("assignment.grade.default", Boolean.TRUE); if (withGradesConfig) { - state.setAttribute(WITH_GRADES, Boolean.TRUE); - state.setAttribute(NEW_ASSIGNMENT_GRADE_TYPE, SCORE_GRADE_TYPE.ordinal()); + state.setAttribute(NEW_ASSIGNMENT_GRADE_TYPE, Assignment.GradeType.SCORE_GRADE_TYPE.ordinal()); String defaultPointsConfig = serverConfigurationService.getString("assignment.points.default", ""); if (NumberUtils.isParsable(defaultPointsConfig)) { float defaultPoints = NumberUtils.createFloat(defaultPointsConfig); @@ -12428,7 +12391,7 @@ private void initializeAssignment(SessionState state) { state.setAttribute(NEW_ASSIGNMENT_GRADE_POINTS, ""); } } else { - state.setAttribute(NEW_ASSIGNMENT_GRADE_TYPE, UNGRADED_GRADE_TYPE.ordinal()); + state.setAttribute(NEW_ASSIGNMENT_GRADE_TYPE, Assignment.GradeType.UNGRADED_GRADE_TYPE.ordinal()); state.setAttribute(NEW_ASSIGNMENT_GRADE_POINTS, ""); } state.setAttribute(NEW_ASSIGNMENT_CONTENT_ID, null); @@ -13555,7 +13518,7 @@ public void doSet_defaultNotGradedNonElectronicScore(RunData data) { String assignmentId = (String) state.getAttribute(EXPORT_ASSIGNMENT_REF); Assignment a = getAssignment(assignmentId, "doSet_defaultNotGradedNonElectronicScore", state); if (a != null) { - if (a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { //for point-based grades if (a.getScaleFactor() == null) a.setScaleFactor(assignmentService.getScaleFactor()); validPointGrade(state, grade, a.getScaleFactor()); @@ -13594,7 +13557,7 @@ public void doSet_defaultNotGradedNonElectronicScore(RunData data) { if (grade != null && state.getAttribute(STATE_MESSAGE) == null) { - if (a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { grade = scalePointGrade(state, grade, a.getScaleFactor()); } @@ -13641,7 +13604,7 @@ public void doSet_defaultNoSubmissionScore(RunData data) { String assignmentId = (String) state.getAttribute(EXPORT_ASSIGNMENT_REF); Assignment a = getAssignment(assignmentId, "doSet_defaultNoSubmissionScore", state); if (a != null) { - if (a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { //for point-based grades if (a.getScaleFactor() == null) a.setScaleFactor(assignmentService.getScaleFactor()); validPointGrade(state, grade, a.getScaleFactor()); @@ -13679,7 +13642,7 @@ public void doSet_defaultNoSubmissionScore(RunData data) { if (grade != null && state.getAttribute(STATE_MESSAGE) == null) { - if (a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { grade = scalePointGrade(state, grade, a.getScaleFactor()); } @@ -13952,16 +13915,16 @@ private Map uploadAll_parseZipFile(SessionState stat if (w != null) { String itemString = assignment.getIsGroup() ? items[3] : items[4]; Assignment.GradeType gradeType = assignment.getTypeOfGrade(); - if (gradeType == SCORE_GRADE_TYPE) { + if (gradeType == Assignment.GradeType.SCORE_GRADE_TYPE) { validPointGrade(state, itemString, assignment.getScaleFactor()); } // SAK-24199 - Applied patch provided with a few additional modifications. - else if (gradeType == PASS_FAIL_GRADE_TYPE) { + else if (gradeType == Assignment.GradeType.PASS_FAIL_GRADE_TYPE) { itemString = validatePassFailGradeValue(state, itemString); } else { validLetterGrade(state, itemString); } if (state.getAttribute(STATE_MESSAGE) == null) { - w.setGrade(gradeType == SCORE_GRADE_TYPE ? scalePointGrade(state, itemString, assignment.getScaleFactor()) : itemString); + w.setGrade(gradeType == Assignment.GradeType.SCORE_GRADE_TYPE ? scalePointGrade(state, itemString, assignment.getScaleFactor()) : itemString); submissionTable.put(eid, w); } } @@ -14008,7 +13971,7 @@ else if (gradeType == PASS_FAIL_GRADE_TYPE) { if (w != null) { itemString = assignment.getIsGroup() ? hssfRow.getCell(3).toString() : hssfRow.getCell(4).toString(); Assignment.GradeType gradeType = assignment.getTypeOfGrade(); - if (gradeType == SCORE_GRADE_TYPE) { + if (gradeType == Assignment.GradeType.SCORE_GRADE_TYPE) { //Parse the string to double using the locale format try { itemString = assignment.getIsGroup() ? hssfRow.getCell(3).getStringCellValue() : hssfRow.getCell(4).getStringCellValue(); @@ -14032,13 +13995,13 @@ else if (gradeType == PASS_FAIL_GRADE_TYPE) { } validPointGrade(state, itemString, assignment.getScaleFactor()); - } else if (gradeType == PASS_FAIL_GRADE_TYPE) { + } else if (gradeType == Assignment.GradeType.PASS_FAIL_GRADE_TYPE) { itemString = validatePassFailGradeValue(state, itemString); } else { validLetterGrade(state, itemString); } if (state.getAttribute(STATE_MESSAGE) == null) { - w.setGrade(gradeType == SCORE_GRADE_TYPE ? scalePointGrade(state, itemString, assignment.getScaleFactor()) : itemString); + w.setGrade(gradeType == Assignment.GradeType.SCORE_GRADE_TYPE ? scalePointGrade(state, itemString, assignment.getScaleFactor()) : itemString); submissionTable.put(eid, w); } } @@ -14355,12 +14318,17 @@ private void uploadAll_updateSubmissions(SessionState state, } // the feedback comment - if (hasComment) { + if (hasComment && StringUtils.isNotBlank(w.getComment())) { submission.setFeedbackComment(w.getComment()); + // ungraded assignments are considered graded when a comment is entered + if (assignment.getTypeOfGrade() == Assignment.GradeType.UNGRADED_GRADE_TYPE) { + submission.setGrade(null); + submission.setGraded(true); + } } // the grade file - if (hasGradeFile) { + if (hasGradeFile && assignment.getTypeOfGrade() != Assignment.GradeType.UNGRADED_GRADE_TYPE) { // set grade String grade = StringUtils.trimToNull(w.getGrade()); submission.setGrade(grade); @@ -14370,8 +14338,8 @@ private void uploadAll_updateSubmissions(SessionState state, } } - // release or not - If it's graded or if there were feedback comments provided - if (submission.getGraded() || (submission.getFeedbackComment() != null && !"".equals(submission.getFeedbackComment()))) { + // release or not depending on if it's graded + if (submission.getGraded()) { submission.setGradeReleased(releaseGrades); submission.setReturned(releaseGrades); } else { @@ -14885,6 +14853,10 @@ public void doSave_send_feedback(RunData data) { newFeedbackComment = ( submission.getFeedbackComment() == null ? "" : submission.getFeedbackComment() ) + comment + "
"; } submission.setFeedbackComment(newFeedbackComment); + if (assignment.getTypeOfGrade() == Assignment.GradeType.UNGRADED_GRADE_TYPE) { + submission.setGrade(null); + submission.setGraded(true); + } if (returnToStudents != null) { submission.setReturned(true); submission.setDateReturned(Instant.now()); @@ -15359,7 +15331,7 @@ private String getAssignmentStatus(String assignmentId, SessionState state) { */ protected void setScoringAgentProperties(Context context, Assignment assignment, AssignmentSubmission submission, boolean gradeView) { String associatedGbItem = assignment.getProperties().get(PROP_ASSIGNMENT_ASSOCIATE_GRADEBOOK_ASSIGNMENT); - if (!assignment.getIsGroup() && submission != null && StringUtils.isNotBlank(associatedGbItem) && assignment.getTypeOfGrade() == SCORE_GRADE_TYPE) { + if (!assignment.getIsGroup() && submission != null && StringUtils.isNotBlank(associatedGbItem) && assignment.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { ScoringService scoringService = (ScoringService) ComponentManager.get("org.sakaiproject.scoringservice.api.ScoringService"); ScoringAgent scoringAgent = scoringService.getDefaultScoringAgent(); @@ -15965,8 +15937,8 @@ else if (m_criteria.equals(SORTED_GRADE_SUBMISSION_CONTENTREVIEW)) { } // if scale is points - if ((s1.getAssignment().getTypeOfGrade() == SCORE_GRADE_TYPE) - && ((s2.getAssignment().getTypeOfGrade() == SCORE_GRADE_TYPE))) { + if ((s1.getAssignment().getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) + && ((s2.getAssignment().getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE))) { if ("".equals(grade1)) { result = -1; } else if ("".equals(grade2)) { @@ -16070,8 +16042,8 @@ else if (m_criteria.equals(SORTED_SUBMISSION_BY_LASTNAME)) { } // if scale is points - if ((((AssignmentSubmission) o1).getAssignment().getTypeOfGrade() == SCORE_GRADE_TYPE) - && ((((AssignmentSubmission) o2).getAssignment().getTypeOfGrade() == SCORE_GRADE_TYPE))) { + if ((((AssignmentSubmission) o1).getAssignment().getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) + && ((((AssignmentSubmission) o2).getAssignment().getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE))) { if ("".equals(grade1)) { result = -1; } else if ("".equals(grade2)) { @@ -16094,8 +16066,8 @@ else if (m_criteria.equals(SORTED_SUBMISSION_BY_LASTNAME)) { } // if scale is points - if ((((AssignmentSubmission) o1).getAssignment().getTypeOfGrade() == SCORE_GRADE_TYPE) - && ((((AssignmentSubmission) o2).getAssignment().getTypeOfGrade() == SCORE_GRADE_TYPE))) { + if ((((AssignmentSubmission) o1).getAssignment().getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) + && ((((AssignmentSubmission) o2).getAssignment().getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE))) { if ("".equals(grade1)) { result = -1; } else if ("".equals(grade2)) { @@ -16276,22 +16248,22 @@ private int compareInstant(Instant t1, Instant t2) { private String maxGrade(Assignment.GradeType gradeType, Assignment a) { String maxGrade = ""; - if (gradeType == GRADE_TYPE_NONE) { + if (gradeType == Assignment.GradeType.GRADE_TYPE_NONE) { // Grade type not set maxGrade = rb.getString("granotset"); - } else if (gradeType == UNGRADED_GRADE_TYPE) { + } else if (gradeType == Assignment.GradeType.UNGRADED_GRADE_TYPE) { // Ungraded grade type maxGrade = rb.getString("gen.nograd"); - } else if (gradeType == LETTER_GRADE_TYPE) { + } else if (gradeType == Assignment.GradeType.LETTER_GRADE_TYPE) { // Letter grade type maxGrade = "A"; - } else if (gradeType == SCORE_GRADE_TYPE) { + } else if (gradeType == Assignment.GradeType.SCORE_GRADE_TYPE) { // Score based grade type maxGrade = Integer.toString(a.getMaxGradePoint()); - } else if (gradeType == PASS_FAIL_GRADE_TYPE) { + } else if (gradeType == Assignment.GradeType.PASS_FAIL_GRADE_TYPE) { // Pass/fail grade type maxGrade = rb.getString("pass"); - } else if (gradeType == CHECK_GRADE_TYPE) { + } else if (gradeType == Assignment.GradeType.CHECK_GRADE_TYPE) { // Grade type that only requires a check maxGrade = rb.getString("check"); } diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentToolUtils.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentToolUtils.java index b20864511391..63947a960cc7 100644 --- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentToolUtils.java +++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentToolUtils.java @@ -16,7 +16,6 @@ package org.sakaiproject.assignment.tool; import static org.sakaiproject.assignment.api.AssignmentConstants.*; -import static org.sakaiproject.assignment.api.model.Assignment.GradeType.*; import java.text.DecimalFormat; import java.text.NumberFormat; @@ -38,6 +37,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.sakaiproject.assignment.api.AssignmentReferenceReckoner; import org.sakaiproject.assignment.api.AssignmentService; @@ -275,32 +275,46 @@ public List alertInvalidPoint(String grade, int factor) { public void gradeSubmission(AssignmentSubmission submission, String gradeOption, Map options, List alerts) { if (submission != null) { - boolean withGrade = options.get(WITH_GRADES) != null && (Boolean) options.get(WITH_GRADES); - String grade = (String) options.get(GRADE_SUBMISSION_GRADE); - boolean gradeChanged = false; - if (!StringUtils.equals(StringUtils.trimToNull(submission.getGrade()), StringUtils.trimToNull(grade))) { - //one is null the other isn't - gradeChanged = true; - } Assignment a = submission.getAssignment(); - if (!withGrade) { - // no grade input needed for the without-grade version of assignment tool - submission.setGraded(true); - if (gradeChanged) { - submission.setGradedBy(userDirectoryService.getCurrentUser() == null ? null : userDirectoryService.getCurrentUser().getId()); + String grade = (String) options.get(GRADE_SUBMISSION_GRADE); + + boolean gradeChanged = !StringUtils.equals(StringUtils.trimToNull(submission.getGrade()), StringUtils.trimToNull(grade)); + + // the instructor feedback comment + String submittedfeedbackComment = StringUtils.trimToNull((String) options.get(GRADE_SUBMISSION_FEEDBACK_COMMENT)); + submission.setFeedbackComment(submittedfeedbackComment); + + // the instructor inline feedback + submission.setFeedbackText(StringUtils.trimToNull((String) options.get(GRADE_SUBMISSION_FEEDBACK_TEXT))); + + List submittedfeedbackAttachments = (List) options.get(GRADE_SUBMISSION_FEEDBACK_ATTACHMENT); + if (submittedfeedbackAttachments != null) { + // clear the old attachments first + Set feedbackAttachments = submission.getFeedbackAttachments(); + if (BooleanUtils.isFalse((Boolean) options.get(GRADE_SUBMISSION_DONT_CLEAR_CURRENT_ATTACHMENTS))) { + feedbackAttachments.clear(); } - if (SUBMISSION_OPTION_RETURN.equals(gradeOption) || SUBMISSION_OPTION_RELEASE.equals(gradeOption)) { - submission.setGradeReleased(true); + for (Reference attachment : submittedfeedbackAttachments) { + feedbackAttachments.add(attachment.getReference()); } + } + + submission.setPrivateNotes(StringUtils.trimToNull((String) options.get(GRADE_SUBMISSION_PRIVATE_NOTES))); + + // determine if the submission is graded + if (a.getTypeOfGrade().equals(Assignment.GradeType.UNGRADED_GRADE_TYPE)) { + submission.setGrade(null); + submission.setGraded(submittedfeedbackComment != null); } else { - //If the grade is not blank if (StringUtils.isNotBlank(grade)) { - submission.setGrade(grade); + // if there is a grade then the submission is graded submission.setGraded(true); + submission.setGrade(grade); if (gradeChanged) { submission.setGradedBy(userDirectoryService.getCurrentUser() == null ? null : userDirectoryService.getCurrentUser().getId()); } } else { + // if no grade or feedback left then it is not graded submission.setGrade(null); submission.setGraded(false); if (gradeChanged) { @@ -309,29 +323,22 @@ public void gradeSubmission(AssignmentSubmission submission, String gradeOption, } } - // iterate through submitters and look for grade overrides... - if (withGrade && a.getIsGroup()) { + if (a.getIsGroup()) { + // group project only set a grade override for submitters for (AssignmentSubmissionSubmitter submitter : submission.getSubmitters()) { - String g = (String) options.get(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter()); - if (g != submitter.getGrade()) submitter.setGrade(g); + String submitterGradeOverride = StringUtils.trimToNull((String) options.get(GRADE_SUBMISSION_GRADE + "_" + submitter.getSubmitter())); + if (!StringUtils.equals(submitterGradeOverride, submitter.getGrade())) { + submitter.setGrade(submitterGradeOverride); + } } } if (SUBMISSION_OPTION_RELEASE.equals(gradeOption)) { submission.setGradeReleased(true); - submission.setGraded(true); - if (gradeChanged) { - submission.setGradedBy(userDirectoryService.getCurrentUser() == null ? null : userDirectoryService.getCurrentUser().getId()); - } - // clear the returned flag submission.setReturned(false); submission.setDateReturned(null); } else if (SUBMISSION_OPTION_RETURN.equals(gradeOption)) { submission.setGradeReleased(true); - submission.setGraded(true); - if (gradeChanged) { - submission.setGradedBy(userDirectoryService.getCurrentUser() == null ? null : userDirectoryService.getCurrentUser().getId()); - } submission.setReturned(true); submission.setDateReturned(Instant.now()); } else if (SUBMISSION_OPTION_RETRACT.equals(gradeOption)) { @@ -369,41 +376,6 @@ public void gradeSubmission(AssignmentSubmission submission, String gradeOption, properties.remove(ALLOW_EXTENSION_CLOSETIME); } - // the instructor comment - String feedbackCommentString = StringUtils.trimToNull((String) options.get(GRADE_SUBMISSION_FEEDBACK_COMMENT)); - if (feedbackCommentString != null) { - submission.setFeedbackComment(feedbackCommentString); - } else { - submission.setFeedbackComment(""); - } - - // the instructor inline feedback - String feedbackTextString = (String) options.get(GRADE_SUBMISSION_FEEDBACK_TEXT); - if (feedbackTextString != null) { - submission.setFeedbackText(feedbackTextString); - } - - List v = (List) options.get(GRADE_SUBMISSION_FEEDBACK_ATTACHMENT); - if (v != null) { - - // clear the old attachments first - Set feedbackAttachments = submission.getFeedbackAttachments(); - - boolean clear = !(options.get(GRADE_SUBMISSION_DONT_CLEAR_CURRENT_ATTACHMENTS) != null - && (Boolean) options.get(GRADE_SUBMISSION_DONT_CLEAR_CURRENT_ATTACHMENTS)); - if (clear) { - feedbackAttachments.clear(); - } - - for (Reference aV : v) { - feedbackAttachments.add(aV.getReference()); - } - } - - if (options.get(GRADE_SUBMISSION_PRIVATE_NOTES) != null) { - submission.setPrivateNotes((String) options.get(GRADE_SUBMISSION_PRIVATE_NOTES)); - } - String sReference = AssignmentReferenceReckoner.reckoner().submission(submission).reckon().getReference(); // save a timestamp for this grading process @@ -545,7 +517,7 @@ else if ("remove".equals(addUpdateRemoveAssignment)) { if ("update".equals(updateRemoveSubmission) && (StringUtils.equals(propAddToGradebook, GRADEBOOK_INTEGRATION_ADD) || StringUtils.equals(propAddToGradebook, GRADEBOOK_INTEGRATION_ASSOCIATE)) - && a.getTypeOfGrade() == SCORE_GRADE_TYPE) { + && a.getTypeOfGrade() == Assignment.GradeType.SCORE_GRADE_TYPE) { if (submissionRef == null) { //Assignment scores map @@ -799,7 +771,7 @@ public boolean isDraftSubmission(AssignmentSubmission s) { } private String displayGrade(String grade, Integer factor) { - return assignmentService.getGradeDisplay(grade, SCORE_GRADE_TYPE, factor); + return assignmentService.getGradeDisplay(grade, Assignment.GradeType.SCORE_GRADE_TYPE, factor); } private void removeNonAssociatedExternalGradebookEntry(String context, String assignmentReference, String associateGradebookAssignment, String gradebookUid) { diff --git a/assignment/tool/src/webapp/WEB-INF/tools/sakai.assignment.grades.xml b/assignment/tool/src/webapp/WEB-INF/tools/sakai.assignment.grades.xml index baf820a107ac..168a7097f945 100644 --- a/assignment/tool/src/webapp/WEB-INF/tools/sakai.assignment.grades.xml +++ b/assignment/tool/src/webapp/WEB-INF/tools/sakai.assignment.grades.xml @@ -12,7 +12,6 @@ - diff --git a/assignment/tool/src/webapp/js/assignments.js b/assignment/tool/src/webapp/js/assignments.js index c34097b3d89d..fc5478365100 100755 --- a/assignment/tool/src/webapp/js/assignments.js +++ b/assignment/tool/src/webapp/js/assignments.js @@ -1078,6 +1078,11 @@ $(document).ready(() => { [...document.getElementsByTagName("sakai-rubric-student-button")].forEach(b => promises.push(b.releaseEvaluation())); Promise.all(promises).then(() => ASN.submitForm('viewForm', 'releaseGrades', null, null)); }); + + const releaseCommented = document.getElementById("releaseCommented"); + releaseCommented && releaseCommented.addEventListener("click", ev => + ASN.submitForm('viewForm', 'releaseCommented', null, null)); + const confirmButton = document.getElementById("confirm"); confirmButton && confirmButton.addEventListener("click", saveRubric); const postButton = document.getElementById("post"); diff --git a/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm b/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm index eb276b9d5786..092b1efac840 100644 --- a/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm +++ b/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm @@ -92,7 +92,7 @@ #end ## Macro for the top nav bar HREF and #toolLink/#toolLinkParam -#macro( navBarHREF $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view $current ) +#macro( navBarHREF $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view $current )
    #set( $prevAction = false )
  • @@ -122,7 +122,7 @@ #end
    • - #if( $withGrade && $!allowGradeSubmission ) + #if($!allowGradeSubmission )
  • #if( !$!view.equals( "grarep" ) ) @@ -225,7 +225,7 @@ #end ## Macro for the top nav bar using onclick JavaScript -#macro( navBarOnClick $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view $formID $current ) +#macro( navBarOnClick $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view $formID $current )
      #set( $prevAction = false ) #if( !$!view.equals( "lisofass1" ) ) @@ -277,7 +277,7 @@ $!tlang.getString( "lisofass2" ) #end - #if( $withGrade && $!allowGradeSubmission ) + #if( $!allowGradeSubmission )
    • #if( $current == "gradeReport" ) $!tlang.getString( "gen.grarep" ) diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm index a33b8f498b79..0755a7ef4de6 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm @@ -30,7 +30,7 @@
      #set($gradeType = $assignment.TypeOfGrade.ordinal()) - #navBarOnClick( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "gradeForm" "") + #navBarOnClick( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "gradeForm" "") ## confirmation #if ($!gradingDone)
      @@ -54,14 +54,10 @@ $formattedText.escapeHtml($!assignment.Title) #assignmentIcons($!assignment) - - #if ($withGrade) - #if (!$!submission.Graded) - $tlang.getString("gen.grading") - #else - $tlang.getString("gen.regrading") - #end + #if (!$!submission.Graded) + $tlang.getString("gen.grading") #else - $tlang.getString("gen.reviewing") + $tlang.getString("gen.regrading") #end @@ -179,16 +175,14 @@ #end - #if ($withGrade) - - - $tlang.getString("gen.status") - - - $!submissionStatus - - - #end + + + $tlang.getString("gen.status") + + + $!submissionStatus + + ## Content Review #if($allowReviewService && $assignment.ContentReview) @@ -455,190 +449,188 @@ #end - #if ($withGrade) -
      - #if ($allowToGrade) - #if ($gradeType == 1) -

      - - - $tlang.getString("gen.nograd") -

      - #elseif ($gradeType == 2) -

      - - -

      - #elseif ($gradeType == 3) -

      - - #if($assignment.getAllowPeerAssessment()) - +

      + #if ($allowToGrade) + #if ($gradeType == 1) +

      + + + $tlang.getString("gen.nograd") +

      + #elseif ($gradeType == 2) +

      + + - ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) + +

      + #elseif ($gradeType == 3) +

      + + #if($assignment.getAllowPeerAssessment()) + + #end + + ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) - - #if($scoringComponentEnabled) - #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + + #if($scoringComponentEnabled) + #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + #end +

      + + #elseif ($gradeType == 4) +

      + + - - #foreach ($i in ["pass", "fail"]) - + +

      + #elseif ($gradeType == 5) +

      +

      - #elseif ($gradeType == 5) -

      - -

      - #end + id="gradeChecked"/> + $tlang.getString("gen.gra2") $tlang.getString("gen.checked") + +

      + #end - #if ($assignment.IsGroup) -
      - 0) checked="checked"#end - name="allowGradeOverrideToggle" - onclick="if(checked){document.getElementById('gradeOverridePanel').style.display='block';ASN.resizeFrame();}else{document.getElementById('gradeOverridePanel').style.display = 'none';}"/> - -
      -
      - ## replace it with submitter sort names - #foreach ($submitter in $submission.submitters) - #set($submitterName = $users.get($submitter.getSubmitter()).getDisplayName()) - #set($submitterId = $users.get($submitter.getSubmitter()).getDisplayId()) - #if ($!submitterId) - ##attach the displayId - #set($submitterName=$submitterName.concat(" (").concat($submitterId).concat(")")) - #end - #set ($group_name_grade = $name_grade.concat("_").concat($submitter.getSubmitter())) - #set ($group_value_grade = "") - #set ($group_value_grade = $value_grades.get($submitter.getSubmitter())) - #if ($gradeType == 2) -
      - -
      - - -
      + #if ($assignment.IsGroup) +
      + 0) checked="checked"#end + name="allowGradeOverrideToggle" + onclick="if(checked){document.getElementById('gradeOverridePanel').style.display='block';ASN.resizeFrame();}else{document.getElementById('gradeOverridePanel').style.display = 'none';}"/> + +
      +
      + ## replace it with submitter sort names + #foreach ($submitter in $submission.submitters) + #set($submitterName = $users.get($submitter.getSubmitter()).getDisplayName()) + #set($submitterId = $users.get($submitter.getSubmitter()).getDisplayId()) + #if ($!submitterId) + ##attach the displayId + #set($submitterName=$submitterName.concat(" (").concat($submitterId).concat(")")) + #end + #set ($group_name_grade = $name_grade.concat("_").concat($submitter.getSubmitter())) + #set ($group_value_grade = "") + #set ($group_value_grade = $value_grades.get($submitter.getSubmitter())) + #if ($gradeType == 2) +
      + +
      + +
      - #elseif ($gradeType == 3) -
      - -
      - $tlang.getString("gen.grade.override") - - ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) -
      +
      + #elseif ($gradeType == 3) +
      + +
      + $tlang.getString("gen.grade.override") + + ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint))
      - #elseif ($gradeType == 4) -
      - -
      - $tlang.getString("gen.grade.override") - + + #foreach ($i in ["Pass", "Fail"]) + - #foreach ($i in ["Pass", "Fail"]) - - #end - -
      + #end +
      - #elseif ($gradeType == 5) -
      - -
      - $tlang.getString("gen.grade.override") - -
      +
      + #elseif ($gradeType == 5) +
      + +
      + $tlang.getString("gen.grade.override") +
      - #end +
      #end -
      - #end - #else - ## if not allowed to grade, show the current grade instead - -
      $!notAllowedToGradeWarning
      - - $!value_grade + #end +
      #end -
      - ## the previous grades - #set ($previousGrades = $submission.Properties.get($NamePropSubmissionScaledPreviousGrades)) - #if ($previousGrades && $previousGrades.length() > 0 ) -

      - expand - collapse - $tlang.getString("gradingsub.pregra") -

      -
      - $previousGrades -
      + #else + ## if not allowed to grade, show the current grade instead + +
      $!notAllowedToGradeWarning
      + + $!value_grade #end +
      + ## the previous grades + #set ($previousGrades = $submission.Properties.get($NamePropSubmissionScaledPreviousGrades)) + #if ($previousGrades && $previousGrades.length() > 0 ) +

      + expand + collapse + $tlang.getString("gradingsub.pregra") +

      +
      + $previousGrades +
      #end

      $tlang.getString("gen.instrcomment") @@ -670,11 +662,7 @@

      #end

      - #if ($withGrade) - $tlang.getString("gen.atttoret") - #else - $tlang.getString("gen.atttoret2") - #end + $tlang.getString("gen.atttoret")

      #set ($size = 0) #set ($props = false) diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_deleted_assignments.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_deleted_assignments.vm index eae1784adac1..758cfc4e1214 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_deleted_assignments.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_deleted_assignments.vm @@ -1,6 +1,6 @@
      - #navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "Assignment.mode_list_removed_assignments" ) + #navBarHREF( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "Assignment.mode_list_removed_assignments" ) #if ($alertMessage)
      $tlang.getString("gen.alert") $alertMessage
      #end
      diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm index 332101e17d9e..843c7a2546a6 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm @@ -18,9 +18,11 @@ function printView(url) { #set ($submissionType = $assignment.TypeOfSubmission.ordinal()) +## prohibit instructor from grading during student peer assessment +#set ($disableGrading = $!typeOfGrade > 1 && $assignment.AllowPeerAssessment && !$!isPeerAssessmentClosed)
      - #navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" ) + #navBarHREF( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )

      @@ -53,61 +55,63 @@ function printView(url) { #set ($showMsg = false) #set ($showMsg = $!allMsgNumber) #if ($!showMsg || $showMsg != 0) -
      -
      - #set ($gradeType = $typeOfGrade) - #if(!$disableGrade) -
      - -
      - $!form_label - ##for non-point-based grading, choose the default grade from drop-down -
      - - -
      -
      - #if ($!gradeType != 3) - +
      + $!form_label + ##for non-point-based grading, choose the default grade from drop-down +
      + + +
      +
      + #if ($!typeOfGrade != 3) + + #else + ## instructor needs to type in default points in point-based-grading + #end - - #else - ## instructor needs to type in default points in point-based-grading - - #end - - -
      -
      - - #end + + +
      +
      + + #end +
      -

      + #end
      - #set($disableGrade=false) - #if($assignment.AllowPeerAssessment && !$isPeerAssessmentClosed) - #set($disableGrade=true) - #end #set ($showMsg = false) #set ($showMsg = $!allMsgNumber) #if (!$!showMsg || $showMsg == 0) @@ -117,17 +121,16 @@ function printView(url) { #else
      ## download all - $!tlang.getString('downall') - #if(!$disableGrade) + $!tlang.getString('downall') + #if (!$disableGrading) ## upload all $!tlang.getString('uploadall.title') - $!tlang.getString('relgrad') + #if ($!typeOfGrade == 1) + ## release commented + $!tlang.getString('relcommented') #else - title="$!tlang.getString('relcommented')">$!tlang.getString('relcommented') + ## release grades + $!tlang.getString('relgrad') #end #end #if ($taggable) @@ -140,7 +143,6 @@ function printView(url) { #end #end
      - #set ($gradeType = $typeOfGrade) #end
      @@ -182,7 +184,10 @@ function printView(url) {
      $tlang.getFormattedMessage("sendFeedback.overwrite",$tlang.getString("gen.instrcomment") )
      - $tlang.getString("sendFeedback.returnToStudents")
      + $tlang.getString("sendFeedback.returnToStudents") + #if (!$!typeOfGrade == 1) + $tlang.getString("sendFeedback.returnToStudents.note") + #end
      @@ -249,7 +254,7 @@ function printView(url) { $tlang.getString("assignment.print") $tlang.getString("assignment.additional.notes.export.title") #end - #if($disableGrade) + #if($disableGrading)
      $tlang.getFormattedMessage("peerassessment.cantgradewithdate", $!service.getUsersLocalDateTimeString($assignment.PeerAssessmentPeriodDate))
      #end
      @@ -342,17 +347,17 @@ function printView(url) { $tlang.getString("peerassessment.reviewergrade") #end - #if ($withGrade) + #if ($gradeTypeTable.get($!typeOfGrade) != $!tlang.getString("gen.nograd")) $tlang.getString("gen.gra") - #if ($sortedBy.equals($!sort_submitGrade)) - #if ($sortedAsc.equals("true")) + #if ($sortedBy.equals($!sort_submitGrade)) + #if ($sortedAsc.equals("true")) - #else + #else - #end - #end + #end + #end #end @@ -382,18 +387,18 @@ function printView(url) { #end #end - + #end $tlang.getString("gen.relea") - #if ($sortedBy.equals($!sort_submitReleased)) - #if ($sortedAsc.equals("true")) + #if ($sortedBy.equals($!sort_submitReleased)) + #if ($sortedAsc.equals("true")) - #else + #else - #end - #end + #end + #end @@ -476,7 +481,7 @@ function printView(url) { #end
      #end - #if(!$disableGrade) + #if(!$disableGrading)
      $!tlang.getString("gen.assign.gra"):#if($value_CheckAnonymousGrading)$anonymousSubmissionId#else$formattedText.escapeHtml($submitterName)#end #foreach ($provider in $providers) @@ -490,7 +495,7 @@ function printView(url) {
      #end #else - #if(!$disableGrade) + #if(!$disableGrading) #if ($value_CheckAnonymousGrading) $anonymousSubmissionId @@ -504,9 +509,9 @@ function printView(url) { $anonymousSubmissionId #else $formattedText.escapeHtml($submitterName) + #end #end #end - #end
      @@ -597,7 +602,7 @@ function printView(url) { #end #end - #if ($withGrade) + #if ($gradeTypeTable.get($!typeOfGrade) != $!tlang.getString("gen.nograd")) #if ($assignment.IsGroup) $!service.getGradeDisplay($submission.Grade, $assignment.TypeOfGrade, $assignment.ScaleFactor) @@ -617,7 +622,7 @@ function printView(url) { #end - #end + #end #if ($isTimesheet && $assignment.Estimate && !$assignment.Estimate.equals("")) $!userSubmission.getTimeSpent() @@ -653,19 +658,17 @@ function printView(url) { $tlang.getString("listsub.nosub") - #if ($withGrade) - -   - + #if ($gradeTypeTable.get($!typeOfGrade) != $!tlang.getString("gen.nograd")) + #end #if ($isTimesheet && $assignment.Estimate && !$assignment.Estimate.equals(""))   #end - -   - + #if ($gradeTypeTable.get($!typeOfGrade) != $!tlang.getString("gen.nograd")) +   + #end #end #end @@ -746,7 +749,7 @@ function printView(url) { ## get gradeScale #set ($gradeScale = $typeOfGradeString) $gradeScale - #if ($gradeTypeTable.get($assignment.TypeOfGrade.ordinal()) == $!tlang.getString("points")) + #if ($gradeTypeTable.get($!typeOfGrade) == $!tlang.getString("points")) ($tlang.getString("grade.max") $maxGradePointString) #end diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm index 9c5863b1c751..5d7744ffa178 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm @@ -144,7 +144,7 @@ #javascript("/sakai-assignment-tool/js/instructorNewEdit.js")
      - #navBarOnClick( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "newAssignmentForm" "new" ) + #navBarOnClick( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "newAssignmentForm" "new" )

      @@ -1106,7 +1106,7 @@ function showExternalIframe(title, doreload) {

      #end - #if(($!withGrade && $!withGradebook) || ($enableAnonGrading || $value_CheckAnonymousGrading)) + #if($enableAnonGrading || $value_CheckAnonymousGrading)

      $!tlang.getString('grading')

      #end diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_assignment.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_assignment.vm index 4bab6174cc37..1ce38de83f54 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_assignment.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_assignment.vm @@ -1,6 +1,6 @@
      - #navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" ) + #navBarHREF( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )

      $tlang.getString("prevassig.preass")

      @@ -70,27 +70,25 @@ #end - #if ($withGrade) - - - $tlang.getString("gen.stusub") - - - $submissionTypeTable.get($value_SubmissionType) - - - - - $tlang.getString("gen.grasca") - - - $gradeTypeTable.get($value_GradeType) - #if ($gradeTypeTable.get($value_GradeType) == $!tlang.getString("points")) - ($tlang.getString("grade.max") $value_GradePoints) - #end - - - #end + + + $tlang.getString("gen.stusub") + + + $submissionTypeTable.get($value_SubmissionType) + + + + + $tlang.getString("gen.grasca") + + + $gradeTypeTable.get($value_GradeType) + #if ($gradeTypeTable.get($value_GradeType) == $!tlang.getString("points")) + ($tlang.getString("grade.max") $value_GradePoints) + #end + + #if ($assignment.Estimate && !$assignment.Estimate.equals("")) @@ -138,16 +136,14 @@ #end - #if ($!withGrade) - - - $!tlang.getString('addtogradebook') - - - $formattedText.escapeHtml($!gradeName) - - - #end + + + $!tlang.getString('addtogradebook') + + + $formattedText.escapeHtml($!gradeName) + +

      $tlang.getString("gen.assinf") @@ -211,35 +207,33 @@ $!service.getUsersLocalDateTimeString($value_DueDate)
      - #if ($withGrade) - - - $tlang.getString("gen.status") - - - #if ($value_OpenDate.isAfter($currentTime)) - $tlang.getString("gen.notope") - #elseif ($value_DueDate.isAfter($currentTime)) - $tlang.getString("gen.open") - #elseif ($value_CloseDate && $value_CloseDate.isBefore($currentTime)) - $tlang.getString("gen.closed") - #else - $tlang.getString("gen.due") - #end - - - - - $tlang.getString("gen.grasca") - - - $gradeTypeTable.get($value_GradeType) - #if ($gradeTypeTable.get($value_GradeType) == $!tlang.getString("points")) - ($tlang.getString("grade.max") $value_GradePoints) - #end - - - #end + + + $tlang.getString("gen.status") + + + #if ($value_OpenDate.isAfter($currentTime)) + $tlang.getString("gen.notope") + #elseif ($value_DueDate.isAfter($currentTime)) + $tlang.getString("gen.open") + #elseif ($value_CloseDate && $value_CloseDate.isBefore($currentTime)) + $tlang.getString("gen.closed") + #else + $tlang.getString("gen.due") + #end + + + + + $tlang.getString("gen.grasca") + + + $gradeTypeTable.get($value_GradeType) + #if ($gradeTypeTable.get($value_GradeType) == $!tlang.getString("points")) + ($tlang.getString("grade.max") $value_GradePoints) + #end + + #if ($assignment.Estimate && !$assignment.Estimate.equals("")) diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm index 2b90b556330d..487309da27c4 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm @@ -1,6 +1,6 @@
      - #navBarHREF($allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "") + #navBarHREF($allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "")

      $tlang.getString("gen.pre") $tlang.getString("gen.instrcomment") $tlang.getString("gen.to") diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_reorder_assignment.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_reorder_assignment.vm index f45764f7091a..b6d9fd2a6ffa 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_reorder_assignment.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_reorder_assignment.vm @@ -1,8 +1,8 @@
      - #if ($allowAddAssignment || ($withGrade && $!allowGradeSubmission)) + #if ($allowAddAssignment || $!allowGradeSubmission) ## for user who cannot create assignment nor grade submission, no need to show "Assignment List" link at all since there is really no other toolbar choices - #navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "reorder" ) + #navBarHREF( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "reorder" ) #end #if ($alertMessage)
      $tlang.getString("gen.alert") $alertMessage
      #end diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm index 00462d4fd100..e7ef4683e7a3 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm @@ -1,6 +1,6 @@
      - #navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" ) + #navBarHREF( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" ) #if ($alertMessage)
      $tlang.getString("gen.alert") $alertMessage
      #end diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm index ac5869b1e1e5..c52bea7b7da3 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm @@ -1,6 +1,6 @@
      - #navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" ) + #navBarHREF( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )

      $!tlang.getString('lisofass2') @@ -65,11 +65,9 @@ $tlang.getString("gen.spenttime") #end - #if ($withGrade) - - $tlang.getString("gen.gra") - - #end + + $tlang.getString("gen.gra") + #foreach ($member in $studentMembers) #set($submitterName=$!member.sortName) @@ -199,26 +197,24 @@   #end - #if ($withGrade) - - #set($grade = $!service.getGradeForSubmitter($submission, $!member.getId())) - #if ($assignment.TypeOfGrade.ordinal() == 1) - $tlang.getString("gen.nograd") - #elseif ($assignment.TypeOfGrade.ordinal() == 3) - #if ($assignment.IsGroup) - #if ($grade) - $grade ($!service.getGradeDisplay($!submission.Grade, $assignment.TypeOfGrade, $assignment.ScaleFactor)) - #else - $tlang.getString("gen.nograd") - #end + + #set($grade = $!service.getGradeForSubmitter($submission, $!member.getId())) + #if ($assignment.TypeOfGrade.ordinal() == 1) + $tlang.getString("gen.nograd") + #elseif ($assignment.TypeOfGrade.ordinal() == 3) + #if ($assignment.IsGroup) + #if ($grade) + $grade ($!service.getGradeDisplay($!submission.Grade, $assignment.TypeOfGrade, $assignment.ScaleFactor)) #else - $!grade + $tlang.getString("gen.nograd") #end #else $!grade #end - - #end + #else + $!grade + #end + #end #end diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm index 360e84ba0900..ef0f2d0c0827 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm @@ -40,9 +40,9 @@
      - #if ($allowAddAssignment || ($withGrade && $!allowGradeSubmission)) + #if ($allowAddAssignment || $!allowGradeSubmission) ## for user who cannot create assignment nor grade submission, no need to show "Assignment List" link at all since there is really no other toolbar choices - #navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" ) + #navBarHREF( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" ) #end #if ($alertMessage)
      $tlang.getString("gen.alert") $alertMessage
      #end @@ -274,7 +274,7 @@ #end #end #end - #if ($withGrade && $!allowGradeSubmission) + #if ($!allowGradeSubmission) $tlang.getString("gen.sca") @@ -370,7 +370,7 @@ #if (!$assignment.Draft && $!service.allowGradeSubmission($assignmentReference))#if($prevAction) |#end #set ($gradeScale = $assignment.TypeOfGrade.ordinal()) ## show "view submissions" link for ungraded type of assignment - #if ($withGrade && $gradeScale != 1)$!tlang.getString("gen.assign.gra")#else$!tlang.getString("viewsubmissions")#end $formattedText.escapeHtml($!assignment.getTitle()) +       #if ($gradeScale != 1)$!tlang.getString("gen.assign.gra")#else$!tlang.getString("viewsubmissions")#end $formattedText.escapeHtml($!assignment.getTitle()) #end
      @@ -653,7 +653,7 @@ #set($totalNumber = $!service.countSubmissions($assignmentReference, null))
      - #if ($withGrade && $gradeScale != 1)$!tlang.getString("gen.assign.gra")#else$!tlang.getString("viewsubmissions")#end : $formattedText.escapeHtml($!assignment.Title). $!tlang.getString("gen.subm2"): $!totalNumber/$!tlang.getString("ungra"): $!ungradedNumber + #if ($gradeScale != 1)$!tlang.getString("gen.assign.gra")#else$!tlang.getString("viewsubmissions")#end : $formattedText.escapeHtml($!assignment.Title). $!tlang.getString("gen.subm2"): $!totalNumber/$!tlang.getString("ungra"): $!ungradedNumber
      #end @@ -661,7 +661,7 @@ #end #end #end - #if ($withGrade && $!allowGradeSubmission) + #if ($!allowGradeSubmission) #set ($gradeScale = $assignment.TypeOfGrade.ordinal()) #if ($gradeScale == 0) @@ -790,7 +790,7 @@ #end #end #end - #if ($withGrade && $!allowGradeSubmission) + #if ($!allowGradeSubmission) #end @@ -863,7 +863,7 @@ #end #end #end - #if ($withGrade && $!allowGradeSubmission) + #if ($!allowGradeSubmission) #end diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_options.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_options.vm index e2f16e1f3042..4a3faa8685fb 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_options.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_options.vm @@ -4,7 +4,7 @@
      - #navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "options" ) + #navBarHREF( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "options" )

      diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_confirm_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_confirm_submission.vm index dbdf2ba3ca2e..e47324d91187 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_confirm_submission.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_confirm_submission.vm @@ -72,38 +72,36 @@ #end #end - #if ($withGrade) - - - $tlang.getString("gen.status") - - - #if ($!submission) - $!service.getSubmissionStatus($!submission.Id, true) - #else - $tlang.getString("gen.notsta") - #end - - - - - $tlang.getString("gen.grasca") - - - #set ($gradeScale = $!typeOfGradeString) - $gradeScale - #if ($!assignment.TypeOfGrade.ordinal() == 3) - ($tlang.getString("stupresub.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) - #end + + + $tlang.getString("gen.status") + + + #if ($!submission) + $!service.getSubmissionStatus($!submission.Id, true) + #else + $tlang.getString("gen.notsta") + #end + + + + + $tlang.getString("gen.grasca") + + + #set ($gradeScale = $!typeOfGradeString) + $gradeScale + #if ($!assignment.TypeOfGrade.ordinal() == 3) + ($tlang.getString("stupresub.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) + #end - ## for grading via an external scoring service, if enabled for an associated gradebook item - #if($scoringComponentEnabled) - #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") - #end + ## for grading via an external scoring service, if enabled for an associated gradebook item + #if($scoringComponentEnabled) + #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + #end - - - #end + + #if ($isTimesheet && $assignment.Estimate && !$assignment.Estimate.equals("")) diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm index 3c2ad45ebe67..410afe5cbaf6 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_preview_submission.vm @@ -54,38 +54,36 @@ #end #end - #if ($withGrade) - - - $tlang.getString("gen.status") - - - #if ($!submission) - $!service.getSubmissionStatus($!submission.Id, true) - #else - $tlang.getString("gen.notsta") - #end - - - - - $tlang.getString("gen.grasca") - - - #set ($gradeScale = $!typeOfGradeString) - $gradeScale - #if ($!assignment.TypeOfGrade.ordinal() == 3) - ($tlang.getString("stupresub.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) - #end + + + $tlang.getString("gen.status") + + + #if ($!submission) + $!service.getSubmissionStatus($!submission.Id, true) + #else + $tlang.getString("gen.notsta") + #end + + + + + $tlang.getString("gen.grasca") + + + #set ($gradeScale = $!typeOfGradeString) + $gradeScale + #if ($!assignment.TypeOfGrade.ordinal() == 3) + ($tlang.getString("stupresub.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) + #end - ## for grading via an external scoring service, if enabled for an associated gradebook item - #if($scoringComponentEnabled) - #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") - #end + ## for grading via an external scoring service, if enabled for an associated gradebook item + #if($scoringComponentEnabled) + #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + #end - - - #end + + #if ($isTimesheet && $assignment.Estimate && !$assignment.Estimate.equals("")) diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm index 4b2843ec1bb9..bb7858d1b95e 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm @@ -15,9 +15,9 @@ });
      - #if ($allowAddAssignment || ($withGrade && $!allowGradeSubmission)) + #if ($allowAddAssignment || $!allowGradeSubmission) ## for user who cannot create assignment nor grade submission, no need to show "Assignment List" link at all since there is really no other toolbar choices - #navBarOnClick( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "gradeForm" "" ) + #navBarOnClick( $allowAddAssignment $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "gradeForm" "" ) #end ## confirmation #if ($!gradingDone) @@ -175,46 +175,42 @@ #end #end #end + #if ($!hasAssociatedRubric) + #if ($!view_only) + + > + #else + + evaluated-item-owner-id="$submitterId" #end - #end + > + #end
      #set ($gradeType = $assignment.TypeOfGrade.ordinal()) diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm index b2f137e47014..479075a60b17 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm @@ -112,44 +112,25 @@ #end #end - #if ($withGrade) - #set ($gradeScale = $!typeOfGradeString) - #if ($!submission.Graded && $!submission.GradeReleased) - - - $tlang.getString("gen.gra") - - - - #if ($!assignment.TypeOfGrade.ordinal() != 1) - #if ($!grade == $tlang.getString("pass") || $!grade == $tlang.getString("gen.checked")) - $!grade - #elseif ($!grade == $tlang.getString("fail")) - $!grade - #else - $!grade - #end + #set ($gradeScale = $!typeOfGradeString) + #if ($!submission.Graded && $!submission.GradeReleased) + + + $tlang.getString("gen.gra") + + + + #if ($!assignment.TypeOfGrade.ordinal() != 1) + #if ($!grade == $tlang.getString("pass") || $!grade == $tlang.getString("gen.checked")) + $!grade + #elseif ($!grade == $tlang.getString("fail")) + $!grade #else - $tlang.getString("gen.nograd") + $!grade #end - #if ($!assignment.TypeOfGrade.ordinal() == 3) - ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) - - ## for grading via an external scoring service, if enabled for an associated gradebook item - #if($scoringComponentEnabled) - #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") - #end - #end - - - - #else - - - $tlang.getString("gen.grasca") - - - $gradeScale + #else + $tlang.getString("gen.nograd") + #end #if ($!assignment.TypeOfGrade.ordinal() == 3) ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) @@ -158,9 +139,26 @@ #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") #end #end - - - #end + + + + #else + + + $tlang.getString("gen.grasca") + + + $gradeScale + #if ($!assignment.TypeOfGrade.ordinal() == 3) + ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) + + ## for grading via an external scoring service, if enabled for an associated gradebook item + #if($scoringComponentEnabled) + #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + #end + #end + + #end ## Display content-review results when appropriate. If the assignment is non-electronic, we show content-review results if they exist diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm index 2928559dadf3..72595574b0f6 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm @@ -288,59 +288,57 @@ $(document).ready(function(){
      #end - #if ($withGrade) - #set ($gradeScale = $assignment.TypeOfGrade.ordinal()) - #if ($submission.Graded && $submission.GradeReleased) -
      -
      -
      $tlang.getString("gen.gra")
      -
      -
      -
      - - #if ($gradeScale != 1) - #if ($!grade == $tlang.getString("pass") || $!grade == $tlang.getString("gen.checked")) - $!grade - #elseif ($!grade == $tlang.getString("fail")) - $!grade - #else - $!grade - #end + #set ($gradeScale = $assignment.TypeOfGrade.ordinal()) + #if ($submission.Graded && $submission.GradeReleased) +
      +
      +
      $tlang.getString("gen.gra")
      +
      +
      +
      + + #if ($gradeScale != 1) + #if ($!grade == $tlang.getString("pass") || $!grade == $tlang.getString("gen.checked")) + $!grade + #elseif ($!grade == $tlang.getString("fail")) + $!grade #else - $tlang.getString("gen.nograd") - #end - #if ($gradeTypeTable.get($gradeScale) == $!tlang.getString("points")) - ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) + $!grade #end - - - - #if($scoringComponentEnabled) - #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + #else + $tlang.getString("gen.nograd") #end -
      -
      -
      - #else -
      -
      -
      $tlang.getString("gen.grasca")
      -
      -
      -
      - $gradeTypeTable.get($gradeScale) #if ($gradeTypeTable.get($gradeScale) == $!tlang.getString("points")) - ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) - #end - - - #if($scoringComponentEnabled) - #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) #end -
      +       + + + #if($scoringComponentEnabled) + #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + #end
      - #end +
      + #else +
      +
      +
      $tlang.getString("gen.grasca")
      +
      +
      +
      + $gradeTypeTable.get($gradeScale) + #if ($gradeTypeTable.get($gradeScale) == $!tlang.getString("points")) + ($tlang.getString("grade.max") $!service.getMaxPointGradeDisplay($!assignment.ScaleFactor, $!assignment.MaxGradePoint)) + #end + + + #if($scoringComponentEnabled) + #parse ("/vm/assignment/chef_assignments_scoring_agent.vm") + #end +
      +
      +
      #end #if ($isTimesheet && $assignment.Estimate && !$assignment.Estimate.equals(""))
      @@ -1055,16 +1053,14 @@ $(document).ready(function(){
      #end #end - #if ($withGrade) - #set ($previousGrades = $!submission.Properties.get($NamePropSubmissionScaledPreviousGrades)) - #if ($previousGrades && $previousGrades.length() > 0 ) -

      expandcollapse - $tlang.getString("gradingsub.pregra") -

      -
      - $!previousGrades -
      - #end + #set ($previousGrades = $!submission.Properties.get($NamePropSubmissionScaledPreviousGrades)) + #if ($previousGrades && $previousGrades.length() > 0 ) +

      expandcollapse + $tlang.getString("gradingsub.pregra") +

      +
      + $!previousGrades +
      #end
      #end - #if ($withGrade && $submission.getGraded() && $submission.getGradeReleased()) + #if ($submission.getGraded() && $submission.getGradeReleased()) #if ($submission.getGradeReleased() &&($!submission.FeedbackComment) && ($submission.FeedbackComment.trim().length()>0))
      $tlang.getString("gen.addinst")
      $formattedText.escapeHtmlFormattedText($submission.FeedbackComment)
      @@ -1182,20 +1178,18 @@ $(document).ready(function(){ #end #parse ("/vm/assignment/chef_assignments_student_view_feedback_attachments.vm") #end - #if ($withGrade) - #set ($previousGrades = $!submission.Properties.get($NamePropSubmissionScaledPreviousGrades)) - #if ($!previousGrades.length() == 0 ) - #set ($previousGrades = $!submission.Properties.get($NamePropSubmissionScaledPreviousGrades)) - #end - #if ($!previousGrades && $!previousGrades.length() > 0 ) -

      expandcollapse - $tlang.getString("gradingsub.pregra") -

      -
      - $!previousGrades.length()$!previousGrades -
      - #end - #end + #set ($previousGrades = $!submission.Properties.get($NamePropSubmissionScaledPreviousGrades)) + #if ($!previousGrades.length() == 0 ) + #set ($previousGrades = $!submission.Properties.get($NamePropSubmissionScaledPreviousGrades)) + #end + #if ($!previousGrades && $!previousGrades.length() > 0 ) +

      expandcollapse + $tlang.getString("gradingsub.pregra") +

      +
      + $!previousGrades.length()$!previousGrades +
      + #end #if (!$!linkInvoked)

      From feec4d7255fe9f002fab21da43f873beb43c082d Mon Sep 17 00:00:00 2001 From: Earle Nietzel Date: Thu, 29 Feb 2024 14:24:02 -0500 Subject: [PATCH 2/4] releasing comments were not showing as released --- .../assignment/tool/AssignmentAction.java | 24 ++++++++----------- ...assignments_instructor_list_submissions.vm | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java index 30cc0c5fa8ad..bfc06ff286a8 100644 --- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java +++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java @@ -10854,27 +10854,23 @@ public void doRelease_grades(RunData data) { if (a != null) { String aReference = AssignmentReferenceReckoner.reckoner().assignment(a).reckon().getReference(); - List submissions = getFilteredSubmitters(state, aReference); for (AssignmentSubmission s : submissions) { - String grade = s.getGrade(); - if (s.getGraded() || StringUtils.isNotBlank(grade)) { - // for the assignment tool with grade option, a valide grade is needed - if (StringUtils.isNotBlank(grade)) { - s.setGradeReleased(true); - if (!s.getGraded()) { - s.setGraded(true); - } - } - - // also set the return status + // if the submission is not already released + // if the assignment type is either + // UNGRADED and comments have been left on the submission + // GRADED and a grade exists on the submission + if (!s.getGradeReleased() + && (a.getTypeOfGrade() == Assignment.GradeType.UNGRADED_GRADE_TYPE && StringUtils.isNotBlank(s.getFeedbackComment()) + || ((a.getTypeOfGrade() != Assignment.GradeType.UNGRADED_GRADE_TYPE) && StringUtils.isNotBlank(s.getGrade())))) { + s.setGraded(true); + s.setGradeReleased(true); s.setReturned(true); s.setDateReturned(Instant.now()); - try { assignmentService.updateSubmission(s); } catch (PermissionException e) { - log.warn("Failed to update submission while releasing grades, {}", e.getMessage()); + log.warn("Failed to update submissions for assignment [{}] while releasing grades, {}", assignmentId, e.toString()); } } } diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm index 843c7a2546a6..b15ca3a0d7a4 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm @@ -185,7 +185,7 @@ function printView(url) {

      $tlang.getFormattedMessage("sendFeedback.overwrite",$tlang.getString("gen.instrcomment") )
      $tlang.getString("sendFeedback.returnToStudents") - #if (!$!typeOfGrade == 1) + #if ($!typeOfGrade != 1) $tlang.getString("sendFeedback.returnToStudents.note") #end
      From 64de856759f488319d13e5cf617b22c696228b04 Mon Sep 17 00:00:00 2001 From: Earle Nietzel Date: Thu, 29 Feb 2024 14:25:32 -0500 Subject: [PATCH 3/4] updated log message --- .../java/org/sakaiproject/assignment/tool/AssignmentAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java index bfc06ff286a8..5bcb0c03f1c2 100644 --- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java +++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java @@ -10870,7 +10870,7 @@ public void doRelease_grades(RunData data) { try { assignmentService.updateSubmission(s); } catch (PermissionException e) { - log.warn("Failed to update submissions for assignment [{}] while releasing grades, {}", assignmentId, e.toString()); + log.warn("Failed to update submission [{}] while releasing grades, {}", s.getId(), e.toString()); } } } From a847b4005bcf1b57ca01e3f98a00d6cdfaca7a0d Mon Sep 17 00:00:00 2001 From: Earle Nietzel Date: Thu, 29 Feb 2024 14:56:43 -0500 Subject: [PATCH 4/4] Remove option return comments now from send feedback to multiple students --- assignment/api/src/resources/assignment.properties | 2 -- assignment/api/src/resources/assignment_ar.properties | 1 - assignment/api/src/resources/assignment_bg.properties | 1 - assignment/api/src/resources/assignment_ca.properties | 1 - assignment/api/src/resources/assignment_de_DE.properties | 1 - assignment/api/src/resources/assignment_es.properties | 1 - assignment/api/src/resources/assignment_eu.properties | 1 - assignment/api/src/resources/assignment_fa_IR.properties | 1 - assignment/api/src/resources/assignment_fr_FR.properties | 1 - assignment/api/src/resources/assignment_ja.properties | 1 - assignment/api/src/resources/assignment_ro_RO.properties | 1 - assignment/api/src/resources/assignment_sr.properties | 1 - assignment/api/src/resources/assignment_tr_TR.properties | 1 - assignment/api/src/resources/assignment_zh_CN.properties | 3 +-- .../org/sakaiproject/assignment/tool/AssignmentAction.java | 6 ------ .../chef_assignments_instructor_list_submissions.vm | 4 ---- 16 files changed, 1 insertion(+), 26 deletions(-) diff --git a/assignment/api/src/resources/assignment.properties b/assignment/api/src/resources/assignment.properties index fe3af62979df..0f25f356dcc0 100644 --- a/assignment/api/src/resources/assignment.properties +++ b/assignment/api/src/resources/assignment.properties @@ -1060,8 +1060,6 @@ sendFeedback.label = Send Feedback to Multiple Students sendFeedback.instruction = Select students from the table below. Write your feedback in the following text area, select any additional feedback options, and then click "Update" to save. sendFeedback.options = Feedback options sendFeedback.overwrite = Replace existing "Instructor Summary Comments" feedback for selected students. -sendFeedback.returnToStudents = Return feedback to selected students now -sendFeedback.returnToStudents.note = (NOTE: Only the feedback will be released, if you want to release the grades you must click on "Release Grades") sendFeedback.nouser = Please choose at least one student to send feedback. sendFeedback.nocomment = Please enter a feedback comment. sendFeedback.savedow = Feedback has been replaced and saved successfully. diff --git a/assignment/api/src/resources/assignment_ar.properties b/assignment/api/src/resources/assignment_ar.properties index 24b9f43716cb..a7f59eb02286 100644 --- a/assignment/api/src/resources/assignment_ar.properties +++ b/assignment/api/src/resources/assignment_ar.properties @@ -1020,7 +1020,6 @@ sendFeedback.label=\u0625\u0631\u0633\u0627\u0644 \u0645\u0644\u0627\u062d\u0638 sendFeedback.instruction=\u062d\u062f\u062f \u0627\u0644\u0637\u0644\u0627\u0628 \u0645\u0646 \u0627\u0644\u062c\u062f\u0648\u0644 \u0623\u062f\u0646\u0627\u0647. \u0627\u0643\u062a\u0628 \u0645\u0644\u0627\u062d\u0638\u0627\u062a\u0643 \u0641\u064a \u0645\u0646\u0637\u0642\u0629 \u0627\u0644\u0646\u0635 \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u060c \u0648\u062d\u062f\u062f \u0623\u064a \u062e\u064a\u0627\u0631\u0627\u062a \u0625\u0636\u0627\u0641\u064a\u0629 \u0644\u0644\u062a\u0639\u0644\u064a\u0642\u0627\u062a \u060c \u062b\u0645 \u0627\u0646\u0642\u0631 \u0641\u0648\u0642 "\u062a\u062d\u062f\u064a\u062b" \u0644\u0644\u062d\u0641\u0638. sendFeedback.options=\u062e\u064a\u0627\u0631\u0627\u062a \u0627\u0644\u0645\u0644\u0627\u062d\u0638\u0627\u062a sendFeedback.overwrite=\u0627\u0633\u062a\u0628\u062f\u0644 \u062a\u0639\u0644\u064a\u0642\u0627\u062a "\u062a\u0639\u0644\u064a\u0642\u0627\u062a \u0645\u0644\u062e\u0635 \u0627\u0644\u0645\u062f\u0631\u0628" \u0627\u0644\u0645\u0648\u062c\u0648\u062f\u0629 \u0644\u0644\u0637\u0644\u0627\u0628 \u0627\u0644\u0645\u062e\u062a\u0627\u0631\u064a\u0646. -sendFeedback.returnToStudents=\u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u0645\u0644\u0627\u062d\u0638\u0627\u062a \u0644\u0644\u0637\u0644\u0627\u0628 \u0627\u0644\u0645\u062e\u062a\u0627\u0631\u064a\u0646 \u0627\u0644\u0622\u0646. (\u0645\u0644\u0627\u062d\u0638\u0629\: \u0633\u064a\u0624\u062f\u064a \u0630\u0644\u0643 \u0625\u0644\u0649 \u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0645\u0644\u0627\u062d\u0638\u0627\u062a \u0641\u0642\u0637 \u060c \u0648\u0644\u064a\u0633 \u0627\u0644\u062f\u0631\u062c\u0627\u062a.) sendFeedback.nouser=\u064a\u064f\u0631\u062c\u0649 \u0627\u062e\u062a\u064a\u0627\u0631 \u0637\u0627\u0644\u0628 \u0648\u0627\u062d\u062f \u0639\u0644\u0649 \u0627\u0644\u0623\u0642\u0644 \u0644\u0625\u0631\u0633\u0627\u0644 \u0627\u0644\u062a\u0639\u0644\u064a\u0642\u0627\u062a. sendFeedback.nocomment=\u064a\u0631\u062c\u0649 \u0625\u062f\u062e\u0627\u0644 \u062a\u0639\u0644\u064a\u0642 \u0645\u0644\u0627\u062d\u0638\u0627\u062a. sendFeedback.savedow=\u062a\u0645 \u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0627\u0644\u062a\u0639\u0644\u064a\u0642\u0627\u062a \u0648\u062d\u0641\u0638\u0647\u0627 \u0628\u0646\u062c\u0627\u062d. diff --git a/assignment/api/src/resources/assignment_bg.properties b/assignment/api/src/resources/assignment_bg.properties index 8e7ff058594d..9836ee8694be 100644 --- a/assignment/api/src/resources/assignment_bg.properties +++ b/assignment/api/src/resources/assignment_bg.properties @@ -1059,7 +1059,6 @@ sendFeedback.label=\u0418\u0437\u043f\u0440\u0430\u0449\u0430\u043d\u0435 \u043d sendFeedback.instruction=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0441\u0442\u0443\u0434\u0435\u043d\u0442\u0438 \u043e\u0442 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430 \u043f\u043e-\u0434\u043e\u043b\u0443. \u041d\u0430\u043f\u0438\u0448\u0435\u0442\u0435 \u043e\u0431\u0440\u0430\u0442\u043d\u0430\u0442\u0430 \u0441\u0438 \u0432\u0440\u044a\u0437\u043a\u0430 \u0432 \u0441\u043b\u0435\u0434\u0432\u0430\u0449o\u0442o \u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e \u043f\u043e\u043b\u0435, \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043e\u043f\u0446\u0438\u0438\u0442\u0435 \u0437\u0430 \u0432\u0441\u044f\u043a\u043e \u0434\u043e\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b\u043d\u043e \u043c\u043d\u0435\u043d\u0438\u0435 \u0438 \u0441\u043b\u0435\u0434 \u0442\u043e\u0432\u0430 \u0449\u0440\u0430\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0435", \u0437\u0430 \u0434\u0430 \u0437\u0430\u043f\u0430\u0437\u0438\u0442\u0435. sendFeedback.options=\u041e\u043f\u0446\u0438\u0438 \u0437\u0430 \u043e\u0431\u0440\u0430\u0442\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 sendFeedback.overwrite=\u0417\u0430\u043c\u0435\u043d\u0435\u0442\u0435 \u0441\u044a\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430\u0449\u0430\u0442\u0430 \u043e\u0431\u0440\u0430\u0442\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 "\u041e\u0431\u043e\u0431\u0449\u0435\u043d\u0438 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440\u0438 \u043d\u0430 \u043f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044f" \u0437\u0430 \u0438\u0437\u0431\u0440\u0430\u043d\u0438 \u0441\u0442\u0443\u0434\u0435\u043d\u0442\u0438. -sendFeedback.returnToStudents=\u0412\u044a\u0440\u043d\u0435\u0442\u0435 \u043e\u0431\u0440\u0430\u0442\u043d\u0430\u0442\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u043d\u0430 \u0438\u0437\u0431\u0440\u0430\u043d\u0438\u0442\u0435 \u0441\u0442\u0443\u0434\u0435\u043d\u0442\u0438. (\u0417\u0410\u0411\u0415\u041b\u0415\u0416\u041a\u0410\: \u0422\u043e\u0432\u0430 \u0449\u0435 \u043e\u0441\u0432\u043e\u0431\u043e\u0434\u0438 \u0441\u0430\u043c\u043e \u043e\u0431\u0440\u0430\u0442\u043d\u0430\u0442\u0430 \u0432\u0440\u044a\u0437\u043a\u0430, \u0430 \u043d\u0435 \u043e\u0446\u0435\u043d\u043a\u0438\u0442\u0435.) sendFeedback.nouser=\u041c\u043e\u043b\u044f, \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043f\u043e\u043d\u0435 \u0435\u0434\u0438\u043d \u0441\u0442\u0443\u0434\u0435\u043d\u0442, \u043d\u0430 \u043a\u043e\u0433\u043e\u0442\u043e \u0434\u0430 \u0438\u0437\u043f\u0440\u0430\u0442\u0438\u0442\u0435 \u043e\u0431\u0440\u0430\u0442\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430. sendFeedback.nocomment=\u041c\u043e\u043b\u044f, \u0432\u044a\u0432\u0435\u0434\u0435\u0442\u0435 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 \u0437\u0430 \u043e\u0431\u0440\u0430\u0442\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430. sendFeedback.savedow=\u041e\u0431\u0440\u0430\u0442\u043d\u0430\u0442\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u0435 \u0432\u044a\u0440\u043d\u0430\u0442\u0430 \u0438 \u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e. diff --git a/assignment/api/src/resources/assignment_ca.properties b/assignment/api/src/resources/assignment_ca.properties index 0cf3d2dae9d5..53a6fd1cb48e 100644 --- a/assignment/api/src/resources/assignment_ca.properties +++ b/assignment/api/src/resources/assignment_ca.properties @@ -1059,7 +1059,6 @@ sendFeedback.label=Envia comentaris a diversos estudiants alhora sendFeedback.instruction=Seleccioneu els estudiants de la taula que apareix a sota. Escriviu els comentaris a l\u2019\u00e0rea de text, seleccioneu qualsevol opci\u00f3 de comentari addicional que vulgueu i finalment feu clic sobre el bot\u00f3 d\u2019actualitzar per desar els canvis. sendFeedback.options=Opcions d\u2019enviament de comentaris sendFeedback.overwrite=Substitueix els comentaris existents com a resum dels comentaris del professor per als estudiants seleccionats. -sendFeedback.returnToStudents=Publica els comentaris per als estudiants seleccionats (NOTA\: Les qualificacions no es publicaran, nom\u00e9s els comentaris) sendFeedback.nouser=Cal que escolliu almenys un estudiant a qui enviar els comentaris. sendFeedback.nocomment=Cal que introdu\u00efu un comentari. sendFeedback.savedow=Els comentaris s\u2019han modificat i s\u2019han desat correctament. diff --git a/assignment/api/src/resources/assignment_de_DE.properties b/assignment/api/src/resources/assignment_de_DE.properties index 484ac96be1a8..cb9bf4d91157 100644 --- a/assignment/api/src/resources/assignment_de_DE.properties +++ b/assignment/api/src/resources/assignment_de_DE.properties @@ -792,7 +792,6 @@ sendFeedback.label=R\u00fcckmeldungen an mehrere Studierende senden sendFeedback.instruction=W\u00f6hlen Sie Studierende aus der unteren Tabelle aus. Schreiben Sie die R\u00fcckmeldung in das folgende Textfeld. W\u00e4hlen Sie zus\u00e4tzliche Optionen zur R\u00fcckmeldung und w\u00e4hlen Sie "Aktualisieren" aus, um zu speichern. sendFeedback.options=Optionen zur R\u00fcckmeldung sendFeedback.overwrite=F\u00fcr ausgew\u00e4hlte Studierende die Sammelr\u00fcckmeldung ersetzen. -sendFeedback.returnToStudents=R\u00fcckmeldung an ausgew\u00e4hlte Studierende jetzt absenden. (HINWEIS\: Nur die R\u00fcckmeldung wird versendet, nicht die Bewertungen.) sendFeedback.nouser=W\u00e4hlen Sie zumindest einen Studierenden aus, um die R\u00fcckmeldung zu senden. sendFeedback.nocomment=Geben Sie einen Kommentar f\u00fcr die R\u00fcckmeldung ein. sendFeedback.savedow=Die R\u00fcckmeldung wurde erfolgreich ersetzt und gespeichert. diff --git a/assignment/api/src/resources/assignment_es.properties b/assignment/api/src/resources/assignment_es.properties index e349eaad0db9..b93d6aeff51c 100644 --- a/assignment/api/src/resources/assignment_es.properties +++ b/assignment/api/src/resources/assignment_es.properties @@ -1050,7 +1050,6 @@ sendFeedback.label=Enviar feedback a m\u00faltiples estudiantes sendFeedback.instruction=Seleccionar estudiantes en la tabla de abajo. Escriba su feedback en la siguiente \u00e1rea de texto, seleccione cualquier otra opci\u00f3n adicional de feedback y haga clic en "Actualizar" para guardarlo. sendFeedback.options=Opciones de env\u00edo de comentarios sendFeedback.overwrite=Sustituya el actual feedback de "comentarios del profesorado" para quienes haya seleccionado. -sendFeedback.returnToStudents=Devolver ahora el feedback a quienes haya seleccionado. (Nota\: esta acci\u00f3n publica solamente el feedback, no las notas). sendFeedback.nouser=Por lo menos hay que seleccionar una persona para poder enviar el feedback. sendFeedback.nocomment=Introduzca el comentario del feedback por favor. sendFeedback.savedow=El feedback ha sido sustituido y guardado correctamente. diff --git a/assignment/api/src/resources/assignment_eu.properties b/assignment/api/src/resources/assignment_eu.properties index be49951522af..7ee5c09efefd 100644 --- a/assignment/api/src/resources/assignment_eu.properties +++ b/assignment/api/src/resources/assignment_eu.properties @@ -1060,7 +1060,6 @@ sendFeedback.label=Bidali feedback-a zenbait ikasleri sendFeedback.instruction=Hautatu ikasleak beheko zerrendan daudenen artean. Idatzi zure feedback-a honako testu eremu honetan, hautatu aukera gehigarriak eta egin klik \u201cEguneratu\u201d botoian gordetzeko. sendFeedback.options=Feedback aukerak sendFeedback.overwrite=Ordeztu "Irakaslearen oharretan" dagoen feedback-a hautatu ikasleei. -sendFeedback.returnToStudents=Bidali feedbacka hautatu ikasleei orain (Oharra\: feedback hori soilik ikusiko dute, ez kalifikazioak) sendFeedback.nouser=Aukeratu gutxienez ikasle bat feedbacka bidaltzeko sendFeedback.nocomment=Idatzi feedback iruzkin bat sendFeedback.savedow=Feedbacka ongi ordeztu eta gorde da. diff --git a/assignment/api/src/resources/assignment_fa_IR.properties b/assignment/api/src/resources/assignment_fa_IR.properties index e422c927adb0..12a866ff5254 100644 --- a/assignment/api/src/resources/assignment_fa_IR.properties +++ b/assignment/api/src/resources/assignment_fa_IR.properties @@ -927,7 +927,6 @@ sendFeedback.label=\u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0627\u0631\u0628 sendFeedback.instruction=\u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0627\u0631\u0628\u0631(\u0647\u0627) \u0648 \u0646\u0648\u0634\u062a\u0646 \u0628\u0627\u0632\u062e\u0648\u0631\u062f \u062f\u0631 \u0628\u062e\u0634\u06cc \u0645\u062a\u0646\u06cc \u0632\u06cc\u0631 sendFeedback.options=\u06af\u0632\u06cc\u0646\u0647 \u0647\u0627\u06cc \u0628\u0627\u0632\u062e\u0648\u0631\u062f sendFeedback.overwrite=\u0644\u063a\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc \u0628\u0627\u0632\u062e\u0648\u0631\u062f \u0641\u0639\u0644\u06cc (\u062a\u0648\u062c\u0647\: \u0628\u0647 \u0635\u0648\u0631\u062a \u067e\u06cc\u0634 \u0641\u0631\u0636 \u0644\u063a\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u0646\u0645\u06cc\u0634\u0648\u062f). -sendFeedback.returnToStudents=\u0628\u0627\u0632\u06af\u0634\u062a \u0628\u0627\u0632\u062e\u0648\u0631\u062f \u0628\u0647 \u062f\u0627\u0646\u0634 \u0622\u0645\u0648\u0632\u0627\u0646 \u0627\u0646\u062a\u062e\u0627\u0628 \u0634\u062f\u0647 (\u062a\u0648\u062c\u0647\: \u0627\u06cc\u0646 \u06af\u0632\u06cc\u0646\u0647 \u062a\u0646\u0647\u0627 \u0628\u0627\u0632\u062e\u0648\u0631\u062f \u0631\u0627 \u0628\u0627\u0632\u06af\u0634\u062a \u0645\u06cc\u062f\u0647\u062f. \u0627\u06af\u0631 \u0645\u06cc\u062e\u0648\u0627\u0647\u06cc\u062f \u0646\u0645\u0631\u0627\u062a \u0631\u0627 \u0645\u0646\u062a\u0634\u0631 \u06a9\u0646\u06cc\u062f\u060c \u0628\u0627\u06cc\u062f \u0628\u0631 \u0631\u0648\u06cc \u06af\u0632\u06cc\u0646\u0647 "\u0627\u0646\u062a\u0634\u0627\u0631 \u0646\u0645\u0631\u0627\u062a" \u06a9\u0644\u06cc\u06a9 \u06a9\u0646\u06cc\u062f). sendFeedback.nouser=\u0644\u0637\u0641\u0627\u064b \u062d\u062f\u0627\u0642\u0644 \u06cc\u06a9 \u06a9\u0627\u0631\u0628\u0631 \u0628\u0631\u0627\u06cc \u0627\u0631\u0633\u0627\u0644 \u0628\u0627\u0632\u062e\u0648\u0631\u062f \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f. sendFeedback.nocomment=\u0644\u0637\u0641\u0627\u064b \u0646\u0638\u0631 \u0628\u0627\u0632\u062e\u0648\u0631\u062f \u0631\u0627 \u0627\u0631\u0627\u0626\u0647 \u062f\u0647\u06cc\u062f. sendFeedback.savedow=\u0628\u0627\u0632\u062e\u0648\u0631\u062f \u062c\u062f\u06cc\u062f \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u0634\u062f\u0647 \u0648 \u0628\u0627 \u0645\u0648\u0641\u0642\u06cc\u062a \u0630\u062e\u06cc\u0631\u0647 \u0634\u062f\u0647 \u0627\u0633\u062a. diff --git a/assignment/api/src/resources/assignment_fr_FR.properties b/assignment/api/src/resources/assignment_fr_FR.properties index 310ca85524a3..7b6ea870f97d 100644 --- a/assignment/api/src/resources/assignment_fr_FR.properties +++ b/assignment/api/src/resources/assignment_fr_FR.properties @@ -990,7 +990,6 @@ sendFeedback.label=Send Feedback to Multiple Students sendFeedback.instruction=Select students from the table below. Write your feedback in the following text area, select any additional feedback options, and then click "Update" to save. sendFeedback.options=Feedback options sendFeedback.overwrite=Replace existing "Instructor Summary Comments" feedback for selected students. -sendFeedback.returnToStudents=Return feedback to selected students now. (NOTE\: This will release the feedback only, not grades.) sendFeedback.nouser=Please choose at least one student to send feedback. sendFeedback.nocomment=Please enter a feedback comment. sendFeedback.savedow=Feedback has been replaced and saved successfully. diff --git a/assignment/api/src/resources/assignment_ja.properties b/assignment/api/src/resources/assignment_ja.properties index 539c7da66d10..05e75398cd49 100644 --- a/assignment/api/src/resources/assignment_ja.properties +++ b/assignment/api/src/resources/assignment_ja.properties @@ -735,7 +735,6 @@ sendFeedback.label=\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u9001\u4fe1\ sendFeedback.instruction=\u30e6\u30fc\u30b6\u3092\u9078\u629e\u3057\u4e0b\u306e\u30c6\u30ad\u30b9\u30c8\u30a8\u30ea\u30a2\u306b\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u66f8\u3044\u3066\u4e0b\u3055\u3044 sendFeedback.options=\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u30aa\u30d7\u30b7\u30e7\u30f3 sendFeedback.overwrite=\u73fe\u5728\u306e\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u4e0a\u66f8\u304d\u3059\u308b(\u6ce8\u610f\uff1a\u30c7\u30d5\u30a9\u30eb\u30c8\u306f\u4e0a\u66f8\u304d\u3057\u307e\u305b\u3093)\uff0e -sendFeedback.returnToStudents=\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u9078\u629e\u3057\u305f\u53d7\u8b1b\u8005\u306b\u8fd4\u5374\u3059\u308b\uff08\u6ce8\u610f\uff1a\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u8fd4\u5374\u3059\u308b\u3060\u3051\u3067\u3059\uff0e\u3082\u3057\u6210\u7e3e\u3092\u516c\u958b\u3057\u305f\u3044\u5834\u5408\u306b\u306f\u300c\u6210\u7e3e\u3092\u516c\u958b\u300d\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\uff0e\uff09\uff0e sendFeedback.nouser=\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u3092\u9001\u4fe1\u3059\u308b\u30e6\u30fc\u30b6\u3092\u5c11\u306a\u304f\u3068\u3082\u4e00\u4eba\u9078\u3093\u3067\u4e0b\u3055\u3044\uff0e sendFeedback.nocomment=\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u30b3\u30e1\u30f3\u30c8\u3092\u8a18\u5165\u3057\u3066\u304f\u3060\u3055\u3044\uff0e sendFeedback.savedow=\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u304c\u4e0a\u66f8\u304d\u3055\u308c\u6b63\u5e38\u306b\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\uff0e diff --git a/assignment/api/src/resources/assignment_ro_RO.properties b/assignment/api/src/resources/assignment_ro_RO.properties index b4152c572a52..5bbb6f7b80e4 100644 --- a/assignment/api/src/resources/assignment_ro_RO.properties +++ b/assignment/api/src/resources/assignment_ro_RO.properties @@ -1059,7 +1059,6 @@ sendFeedback.label=Trimite feedback catre mai multi studenti sendFeedback.instruction=Selectati studenti din tabelul de mai jos. Scrieti-va feedback-ul in urmatoarea caseta de text, selectati optiunile pentru orice parere suplimentara, apoi faceti click pe "Actualizati" pentru a salva. sendFeedback.options=Optiuni feedback sendFeedback.overwrite=Inlocuiti feedback-ul existent "Comentarii sumarizate ale instructorului" pentru studentii selectati. -sendFeedback.returnToStudents=Returnati acum feedback-ul catre studentii selectati. (NOTA\: acest lucru va publica doar feedback-ul, nu si notele.) sendFeedback.nouser=Va rugam sa alegeti cel putin un pentru a trimite feedback. sendFeedback.nocomment=Va rog introduceti un comentariu de feedback. sendFeedback.savedow=Feedback-ul a fost returnat si salvat cu succes. diff --git a/assignment/api/src/resources/assignment_sr.properties b/assignment/api/src/resources/assignment_sr.properties index a04dc749e4fa..01480a2f2679 100644 --- a/assignment/api/src/resources/assignment_sr.properties +++ b/assignment/api/src/resources/assignment_sr.properties @@ -1059,7 +1059,6 @@ sendFeedback.label=Po\u0161alji povratne informacije za vi\u0161e studenata sendFeedback.instruction=Izaberi studente iz tabele u nastavku. Napi\u0161i povratnu informaciju u slede\u0107em tekstualnom polju, izaberi bilo koje dodatne opcije povratnih informacija, a zatim klikni na \u201eA\u017euriraj\u201c da sa\u010duva\u0161. sendFeedback.options=Opcije povratnih informacija sendFeedback.overwrite=Zameni postoje\u0107e povratne informacije kod \u201eSa\u017eetih komentara instruktora\u201c za izabrane studente. -sendFeedback.returnToStudents=Odmah vrati povratne informacije izabranim studentima. (NAPOMENA\: Samo povratne informacije \u0107e biti objavljene, ako \u017eeli\u0161 da objavi\u0161 ocene, mora\u0161 da klikne\u0161 na \u201eObjavi ocene\u201c). sendFeedback.nouser=Molimo izaberi najmanje jednog studenta kojem \u0107e\u0161 poslati povratne informacije. sendFeedback.nocomment=Molimo unesi komentar na povratnu informaciju. sendFeedback.savedow=Povratne informacije su uspe\u0161no zamenjene i sa\u010duvane. diff --git a/assignment/api/src/resources/assignment_tr_TR.properties b/assignment/api/src/resources/assignment_tr_TR.properties index 33177967558f..26b0a2793f4c 100644 --- a/assignment/api/src/resources/assignment_tr_TR.properties +++ b/assignment/api/src/resources/assignment_tr_TR.properties @@ -804,7 +804,6 @@ sendFeedback.label=\u00c7oklu \u00d6\u011frencilere Geri Bildirim G\u00f6nderin sendFeedback.instruction=\u00d6\u011frencileri a\u015fa\u011f\u0131daki tablodan se\u00e7iniz. A\u015fa\u011f\u0131daki metin alan\u0131na geri bildiriminizi yaz\u0131n\u0131z, ek olarak herhangi bir geri bildirim se\u00e7ene\u011fi se\u00e7iniz, ve sonra kaydetmek i\u00e7in ''g\u00fcncelle''ye t\u0131klayn\u0131z. sendFeedback.options=Geri bildirim se\u00e7enekleri sendFeedback.overwrite=Se\u00e7ili \u00f6\u011frenci i\u00e7in var olan "K\u0131sa E\u011fitmen Yorumlar\u0131" geri bildirimini de\u011fi\u015ftir. -sendFeedback.returnToStudents=Se\u00e7ili \u00f6\u011frencilere \u015fimdi geri bildirim g\u00f6nderin. (NOT\: Bu tercih yaln\u0131zca geri bildirimi g\u00f6nderir, notlar\u0131 de\u011fil.) sendFeedback.nouser=L\u00fctfen geri bildirim g\u00f6ndermek i\u00e7in en az bir \u00f6\u011frenci se\u00e7iniz. sendFeedback.nocomment=L\u00fctfen bir geri bildirim yorumu girin. sendFeedback.savedow=Geri bildirim ba\u015far\u0131yla de\u011fi\u015ftirildi ve kaydedildi. diff --git a/assignment/api/src/resources/assignment_zh_CN.properties b/assignment/api/src/resources/assignment_zh_CN.properties index c1a85493b49a..10a16e0684ee 100644 --- a/assignment/api/src/resources/assignment_zh_CN.properties +++ b/assignment/api/src/resources/assignment_zh_CN.properties @@ -914,7 +914,6 @@ sendFeedback.label=\u9009\u62E9\u8981\u53D1\u9001\u53CD\u9988\u7684\u7528\u6237 sendFeedback.instruction=\u9009\u62E9\u7528\u6237\uFF0C\u7136\u540E\u5728\u4E0B\u9762\u7684\u6587\u672C\u6846\u4E2D\u8F93\u5165\u53CD\u9988\u4FE1\u606F sendFeedback.options=\u53CD\u9988\u9009\u9879 sendFeedback.overwrite=\u8986\u76D6\u5F53\u524D\u7684\u53CD\u9988\uFF08\u6CE8\u610F\uFF1A\u9ED8\u8BA4\u4E0D\u8986\u76D6\uFF09\u3002 -sendFeedback.returnToStudents=\u73B0\u5728\u53D1\u9001\u53CD\u9988\u5230\u9009\u4E2D\u7684\u5B66\u751F\uFF08\u6CE8\u610F\uFF1A\u6B64\u9009\u9879\u4EC5\u53D1\u9001\u53CD\u9988\uFF0C\u5982\u679C\u60A8\u5E0C\u671B\u53D1\u5E03\u6210\u7EE9\uFF0C\u60A8\u9700\u8981\u70B9\u51FB\u201C\u53D1\u5E03\u6210\u7EE9\u201D\uFF09\u3002 sendFeedback.nouser=\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u53D1\u9001\u53CD\u9988\u4FE1\u606F\u7684\u7528\u6237\u3002 sendFeedback.nocomment=\u8BF7\u8F93\u5165\u53CD\u9988\u5185\u5BB9\u3002 sendFeedback.savedow=\u53CD\u9988\u88AB\u8986\u76D6\u5E76\u4FDD\u5B58\u6210\u529F\u3002 @@ -1032,4 +1031,4 @@ review.report.urkund.optoutlink = \u4ECE Urkund \u8C41\u514D review.store.inst.index = \u5C06\u8BBA\u6587\u5B58\u50A8\u5728\u673A\u6784\u7D22\u5F15\u4E2D review.store.inst.index.help = \u4E3A\u63D0\u4EA4\u81F3\u6B64\u4F5C\u4E1A\u7684\u6240\u6709\u62A5\u544A\u8BBE\u7F6E\u9ED8\u8BA4\u503C\u3002\u5982\u679C\u60A8\u9009\u62E9\u4E0D\u5C06\u62A5\u544A\u5B58\u50A8\u5728\u673A\u6784\u7D22\u5F15\u4E2D\uFF0C\u5219\u8FD9\u4E9B\u62A5\u544A\u5C06\u4E0D\u4F1A\u7528\u4E8E\u5BF9\u7167\u673A\u6784\u4E2D\u7684\u5176\u4ED6\u5B66\u751F\u62A5\u544A\u8FDB\u884C\u6284\u88AD\u68C0\u67E5\u3002\u4E00\u65E6\u63D0\u4EA4\u62A5\u544A\uFF0C\u60A8\u5C06\u65E0\u6CD5\u4E3A\u8BE5\u62A5\u544A\u66F4\u6539\u6B64\u9009\u9879\u3002 review.studentPreview = \u542F\u7528\u5B66\u751F\u9884\u89C8 -review.studentPreview.help = \u5982\u679C\u60A8\u9009\u62E9\u542F\u7528\u5B66\u751F\u9884\u89C8\uFF0C\u7528\u6237\u5C06\u80FD\u591F\u5728\u622A\u6B62\u65E5\u671F\u4E4B\u524D\u5BA1\u67E5\u5E76\u91CD\u65B0\u63D0\u4EA4\u5176\u8BBA\u6587\u3002\u5BFC\u5E08\u53EA\u80FD\u67E5\u770B\u6700\u7EC8\u63D0\u4EA4\u7684\u5185\u5BB9\uFF0C\u4F46\u6BCF\u4EFD\u8BBA\u6587\u7684\u5206\u6570\u8BB0\u5F55\u5C06\u663E\u793A\u5728\u62A5\u544A\u65E5\u5FD7\u4E2D\u3002 \u5982\u679C\u4F5C\u4E1A\u6709\u622A\u6B62\u65E5\u671F\uFF0C\u800C\u5B66\u751F\u6700\u8FD1\u6CA1\u6709\u63D0\u4EA4\u6587\u4EF6\uFF0C\u5219\u7CFB\u7EDF\u5C06\u81EA\u52A8\u63D0\u4EA4\u5B66\u751F\u6700\u8FD1\u7684\u8349\u7A3F\u3002\u5EFA\u8BAE\u60A8\u4E3A\u6B64\u4F5C\u4E1A\u8BBE\u7F6E\u622A\u6B62\u65E5\u671F\u5E76\u5141\u8BB8\u5B66\u751F\u67E5\u770B\u5176\u62A5\u544A\u3002 \ No newline at end of file +review.studentPreview.help = \u5982\u679C\u60A8\u9009\u62E9\u542F\u7528\u5B66\u751F\u9884\u89C8\uFF0C\u7528\u6237\u5C06\u80FD\u591F\u5728\u622A\u6B62\u65E5\u671F\u4E4B\u524D\u5BA1\u67E5\u5E76\u91CD\u65B0\u63D0\u4EA4\u5176\u8BBA\u6587\u3002\u5BFC\u5E08\u53EA\u80FD\u67E5\u770B\u6700\u7EC8\u63D0\u4EA4\u7684\u5185\u5BB9\uFF0C\u4F46\u6BCF\u4EFD\u8BBA\u6587\u7684\u5206\u6570\u8BB0\u5F55\u5C06\u663E\u793A\u5728\u62A5\u544A\u65E5\u5FD7\u4E2D\u3002 \u5982\u679C\u4F5C\u4E1A\u6709\u622A\u6B62\u65E5\u671F\uFF0C\u800C\u5B66\u751F\u6700\u8FD1\u6CA1\u6709\u63D0\u4EA4\u6587\u4EF6\uFF0C\u5219\u7CFB\u7EDF\u5C06\u81EA\u52A8\u63D0\u4EA4\u5B66\u751F\u6700\u8FD1\u7684\u8349\u7A3F\u3002\u5EFA\u8BAE\u60A8\u4E3A\u6B64\u4F5C\u4E1A\u8BBE\u7F6E\u622A\u6B62\u65E5\u671F\u5E76\u5141\u8BB8\u5B66\u751F\u67E5\u770B\u5176\u62A5\u544A\u3002 diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java index 5bcb0c03f1c2..09cec3d3da81 100644 --- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java +++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java @@ -14826,7 +14826,6 @@ public void doSave_send_feedback(RunData data) { String[] userIds = params.getStrings("selectedAllowResubmit"); String comment = processFormattedTextFromBrowser(state, params.getCleanString("commentFeedback"), true); String overwrite = params.getString("overWrite"); - String returnToStudents = params.getString("returnToStudents"); if (userIds == null || userIds.length == 0) { addAlert(state, rb.getString("sendFeedback.nouser")); @@ -14853,11 +14852,6 @@ public void doSave_send_feedback(RunData data) { submission.setGrade(null); submission.setGraded(true); } - if (returnToStudents != null) { - submission.setReturned(true); - submission.setDateReturned(Instant.now()); - state.setAttribute(RETURNED_FEEDBACK, Boolean.TRUE); - } assignmentService.updateSubmission(submission); state.setAttribute(SAVED_FEEDBACK, Boolean.TRUE); } diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm index b15ca3a0d7a4..aaf74cd66420 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm @@ -184,10 +184,6 @@ function printView(url) {
      $tlang.getFormattedMessage("sendFeedback.overwrite",$tlang.getString("gen.instrcomment") )
      - $tlang.getString("sendFeedback.returnToStudents") - #if ($!typeOfGrade != 1) - $tlang.getString("sendFeedback.returnToStudents.note") - #end