S2U-34 Assignments add rubric support for peer review (#11950)

assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java

@@ -627,10 +627,10 @@ public interface AssignmentService extends EntityProducer {
      * Given an Assignment and a User, rationalize who the submitter should be taking into account the assignment configuration
      * Will check the assignments access and group configuration to determine the submitter id
      * @param assignment The assignment
-     * @param user The user
+     * @param userId The user id
      * @return the correct submitter id to use for creating a submission or null if one can't be determined
      */
-    String getSubmitterIdForAssignment(Assignment assignment, User user);
+    String getSubmitterIdForAssignment(Assignment assignment, String userId);
 
     /**
      * Retrieves the selected group users based on the given parameters.

assignment/api/src/resources/assignment.properties

@@ -1071,14 +1071,13 @@ sendFeedback.error = Error returning feedback to {0} students.
 # Peer Review
 peerAssessmentSavedGrading=Comments and/or grade have been saved but not submitted. If you don't submit your review before the due date, it will be submitted for you.
 peerAssessmentSavedSubmission=Comments and/or grade have been saved and submitted.
-peerAssessmentName=Peer Assessment - Students assess each other
+peerAssessmentName=Peer Assessment - {0}
 
 noAdditionalOptionsName=No additional assignment options
 
 additionalOptionsName=Additional Assignment Options
 
 peerAssessmentUse=Use peer assessment
-peerassessment.warn.nogroup=(Peer assessment cannot be used with group assignments. To enable this option, switch to one of the individual assignment options in the "Assign To" section.)
 peerassessment.periodfinishes=Evaluation Period Finishes:
 peerassessment.anonymousEvaluation=Anonymous evaluation
 peerassessment.studentViewReviews=Allow students to see reviews of their submissions
@@ -1132,7 +1131,6 @@ settings.access.selectedGroupsGoneNoGroups = Note - The previously selected grou
 settings.access.selectedGroupsGoneOtherGroupsPresent = Note - The previously selected groups no longer exist. "{0}" has been selected as the "Assign To" option for this assignment. You may post this as an individual assignment for the entire site, or change the group selections.
 settings.access.selectGroups = Select one or more groups
 settings.access.noMembersInCommon=Group assignments require that the selected groups don't have any participants in common.
-settings.access.noGroupAssignmentPeerInUse=(This option is not available because peer assessment has been enabled.)
 settings.access.checkNow=Check Now
 settings.access.checkSuccess=Success! There are no students who are members of more than one of the selected groups.
 settings.access.checkError=The following students are members of multiple selected groups:
@@ -1169,8 +1167,6 @@ option.pointsoverride=Adjust individual student scores
 option.hidepoints=Hide point values (feedback only)
 option.studentpreview=Hide Rubric from student
 grading_rubric=Grading Rubric
-asn.list.userubric=This assignment could be graded using a Rubric
-rubrics.use=Use rubric
 
 # table toolbar common messages
 view.label=View
@@ -1262,3 +1258,20 @@ ts.rem.err.userId=You need to be logged in to add time sheet entry
 ts.rem.err.empty=Selected time sheet must be provided
 ts.rem.err.submitterId=You need to supply the submissionId and ref
 ts.rem.err.permission=You can't modify this sumbitter
+
+#S2U-34
+peerAssessmentStudents=Students assess each other
+peerAssessmentGroups=Groups assess each other
+peerassessment.group=Group {0}
+option.selfreport=Allow students to self-report their work
+option.selfreport.must=Student must complete all self-report criterions to complete the submission
+option.selfreport.partialmust=Student must complete at least one self-report criterion to complete the submission
+option.selfreport.notamust=Student does not need to complete the self-report to complete the submission
+youmustrubric=This is a self-report assignment. You must use the following rubric to grade your work before submitting.
+youhavetorubric=This is a self-report assignment. You must use the following rubric to grade your work before submitting. You must complete the entire rubric in order to submit the task.
+youhavetorubricone=This is a self-report assignment. You must use the following rubric to grade your work before submitting. You must complete at least one criterion of the rubric in order to submit the task.
+studentrubric=This is a self-report assignment. You can check the self-report of submitter before grading.
+autoevaluation=Autoevaluation:
+instructor_grading=Instructor Grading:
+reviewrubric=This is a self-report assignment. You can check your self-report before grading.
+reviewrubricreport=This is your self-report.

assignment/api/src/resources/assignment_ar.properties

@@ -1038,7 +1038,6 @@ noAdditionalOptionsName=\u0644\u0627 \u062a\u0648\u062c\u062f \u062e\u064a\u0627
 additionalOptionsName=\u062e\u064a\u0627\u0631\u0627\u062a \u0627\u0644\u062a\u0639\u064a\u064a\u0646 \u0627\u0644\u0625\u0636\u0627\u0641\u064a\u0629
 
 peerAssessmentUse=\u0627\u0633\u062a\u062e\u062f\u0645 \u062a\u0642\u064a\u064a\u0645 \u0627\u0644\u0623\u0642\u0631\u0627\u0646
-peerassessment.warn.nogroup=(\u0644\u0627 \u064a\u0645\u0643\u0646 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u062a\u0642\u064a\u064a\u0645 \u0627\u0644\u0623\u0642\u0631\u0627\u0646 \u0645\u0639 \u062a\u0639\u064a\u064a\u0646\u0627\u062a \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629. \u0644\u062a\u0645\u0643\u064a\u0646 \u0647\u0630\u0627 \u0627\u0644\u062e\u064a\u0627\u0631 \u060c \u0642\u0645 \u0628\u0627\u0644\u062a\u0628\u062f\u064a\u0644 \u0625\u0644\u0649 \u0623\u062d\u062f \u062e\u064a\u0627\u0631\u0627\u062a \u0627\u0644\u062a\u0639\u064a\u064a\u0646 \u0627\u0644\u0641\u0631\u062f\u064a\u0629 \u0641\u064a \u0642\u0633\u0645 "\u062a\u0639\u064a\u064a\u0646 \u0625\u0644\u0649".)
 peerassessment.periodfinishes=\u0627\u0646\u062a\u0647\u0627\u0621 \u0641\u062a\u0631\u0629 \u0627\u0644\u062a\u0642\u064a\u064a\u0645\:
 peerassessment.anonymousEvaluation=\u062a\u0642\u064a\u064a\u0645 \u0645\u062c\u0647\u0648\u0644
 peerassessment.studentViewReviews=\u0627\u0644\u0633\u0645\u0627\u062d \u0644\u0644\u0637\u0644\u0627\u0628 \u0628\u0645\u0634\u0627\u0647\u062f\u0629 \u0627\u0644\u0645\u0631\u0627\u062c\u0639\u0627\u062a \u0627\u0644\u062e\u0627\u0635\u0629 \u0628\u0647\u0645
@@ -1092,7 +1091,6 @@ settings.access.selectedGroupsGoneNoGroups=\u0645\u0644\u0627\u062d\u0638\u0629
 settings.access.selectedGroupsGoneOtherGroupsPresent=\u0645\u0644\u0627\u062d\u0638\u0629 - \u0644\u0645 \u062a\u0639\u062f \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0627\u0644\u0645\u062d\u062f\u062f\u0629 \u0645\u0633\u0628\u0642\u064b\u0627 \u0645\u0648\u062c\u0648\u062f\u0629. \u062a\u0645 \u062a\u062d\u062f\u064a\u062f "{0}" \u0643\u062e\u064a\u0627\u0631 "\u062a\u0639\u064a\u064a\u0646 \u0625\u0644\u0649" \u0644\u0647\u0630\u0647 \u0627\u0644\u0645\u0647\u0645\u0629. \u064a\u0645\u0643\u0646\u0643 \u0646\u0634\u0631 \u0647\u0630\u0627 \u0643\u0645\u0647\u0645\u0629 \u0641\u0631\u062f\u064a\u0629 \u0644\u0644\u0645\u0648\u0642\u0639 \u0628\u0623\u0643\u0645\u0644\u0647 \u060c \u0623\u0648 \u062a\u063a\u064a\u064a\u0631 \u0627\u062e\u062a\u064a\u0627\u0631\u0627\u062a \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629.
 settings.access.selectGroups=\u062d\u062f\u062f \u0645\u062c\u0645\u0648\u0639\u0629 \u0648\u0627\u062d\u062f\u0629 \u0623\u0648 \u0623\u0643\u062b\u0631
 settings.access.noMembersInCommon=\u062a\u062a\u0637\u0644\u0628 \u0645\u0647\u0627\u0645 \u0627\u0644\u0645\u062c\u0645\u0648\u0639\u0629 \u0623\u0644\u0627 \u064a\u0643\u0648\u0646 \u0644\u0644\u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0627\u0644\u0645\u062d\u062f\u062f\u0629 \u0623\u064a \u0645\u0634\u062a\u0631\u0643\u064a\u0646 \u0645\u0634\u062a\u0631\u0643\u064a\u0646.
-settings.access.noGroupAssignmentPeerInUse=(\u0647\u0630\u0627 \u0627\u0644\u062e\u064a\u0627\u0631 \u063a\u064a\u0631 \u0645\u062a\u0627\u062d \u0644\u0623\u0646\u0647 \u062a\u0645 \u062a\u0645\u0643\u064a\u0646 \u062a\u0642\u064a\u064a\u0645 \u0627\u0644\u0623\u0642\u0631\u0627\u0646.)
 settings.access.checkNow=\u062a\u0623\u0643\u062f \u0627\u0644\u0627\u0646
 settings.access.checkSuccess=\u0646\u062c\u0627\u062d\! \u0644\u0627 \u064a\u0648\u062c\u062f \u0637\u0644\u0627\u0628 \u0623\u0639\u0636\u0627\u0621 \u0641\u064a \u0623\u0643\u062b\u0631 \u0645\u0646 \u0645\u062c\u0645\u0648\u0639\u0629 \u0645\u062e\u062a\u0627\u0631\u0629.
 settings.access.checkError=\u0627\u0644\u0637\u0644\u0627\u0628 \u0627\u0644\u062a\u0627\u0644\u0648\u0646 \u0623\u0639\u0636\u0627\u0621 \u0641\u064a \u0645\u062c\u0645\u0648\u0639\u0627\u062a \u0645\u062d\u062f\u062f\u0629 \u0645\u062a\u0639\u062f\u062f\u0629\:
@@ -1129,8 +1127,6 @@ option.pointsoverride=\u0627\u0636\u0628\u0637 \u062f\u0631\u062c\u0627\u062a \u
 option.hidepoints=\u0625\u062e\u0641\u0627\u0621 \u0642\u064a\u0645 \u0627\u0644\u0646\u0642\u0627\u0637 (\u0627\u0644\u062a\u0639\u0644\u064a\u0642\u0627\u062a \u0641\u0642\u0637)
 option.studentpreview=\u0625\u062e\u0641\u0627\u0621 \u0646\u0645\u0648\u0630\u062c \u0627\u0644\u062a\u0642\u064a\u064a\u0645 \u0639\u0646 \u0627\u0644\u0637\u0627\u0644\u0628
 grading_rubric=\u062a\u0642\u064a\u064a\u0645 \u0627\u0644\u0646\u0645\u0648\u0630\u062c
-asn.list.userubric=\u064a\u0645\u0643\u0646 \u062a\u0642\u062f\u064a\u0631 \u0647\u0630\u0627 \u0627\u0644\u0648\u0627\u062c\u0628 \u0628\u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0646\u0645\u0648\u0630\u062c \u062a\u0642\u064a\u064a\u0645
-rubrics.use=\u0627\u0633\u062a\u062e\u062f\u0645 \u0646\u0645\u0648\u0630\u062c \u0627\u0644\u062a\u0642\u064a\u064a\u0645
 
 # table toolbar common messages
 view.label=\ \u0645\u0634\u0627\u0647\u062f\u0629

assignment/api/src/resources/assignment_ca.properties

@@ -1070,14 +1070,13 @@ sendFeedback.error=S\u2019ha produ\u00eft un error al fer p\u00fablics els comen
 # Peer Review
 peerAssessmentSavedGrading=Els comentaris i/o les qualificacions s\u2019han desat per\u00f2 no s\u2019han enviat. Si no lliureu la revisi\u00f3 abans del termini, s\u2019enviar\u00e0 de manera autom\u00e0tica.
 peerAssessmentSavedSubmission=Els comentaris i/o les qualificacions s\u2019han desat i enviat.
-peerAssessmentName=Revisi\u00f3 per part dels companys - Els estudiants s\u2019avaluen entre ells
+peerAssessmentName=Revisi\u00f3 per part dels companys - {0}
 
 noAdditionalOptionsName=No hi ha opcions addicionals de l\u2019activitat
 
 additionalOptionsName=Opcions addicionals de l\u2019activitat
 
 peerAssessmentUse=Usa l\u2019avaluaci\u00f3 dels companys
-peerassessment.warn.nogroup=(L\u2019avaluaci\u00f3 per part dels companys no es pot usar en el cas d\u2019activitats de grup. Per habilitar aquesta opci\u00f3 cal que canvieu a una de les opcions d\u2019activitat individual que teniu a la secci\u00f3 per fer les assignacions.)
 peerassessment.periodfinishes=El per\u00edode d\u2019avaluaci\u00f3 acaba el\:
 peerassessment.anonymousEvaluation=Avaluaci\u00f3 an\u00f2nima
 peerassessment.studentViewReviews=Permet que els estudiants vegin les revisions dels seus lliuraments
@@ -1131,7 +1130,6 @@ settings.access.selectedGroupsGoneNoGroups=Nota - Els grups seleccionats pr\u00e
 settings.access.selectedGroupsGoneOtherGroupsPresent=Nota - Els grups seleccionats pr\u00e8viament ja no existeixen. S\u2019ha seleccionat  "{0}" com a l\u2019opci\u00f3 d\u2019assignaci\u00f3 per a aquesta activitat. Podeu publicar-la com a activitat individual per a l\u2019espai sencer o canviar la selecci\u00f3 de grups. 
 settings.access.selectGroups=Selecciona un o m\u00e9s grups
 settings.access.noMembersInCommon=Les activitats de grup requereixen que els grups seleccionats no tinguin cap participant en com\u00fa. 
-settings.access.noGroupAssignmentPeerInUse=(Aquesta opci\u00f3 no est\u00e0 disponible perqu\u00e8 l\u2019avaluaci\u00f3 per part dels companys est\u00e0 habilitada.)
 settings.access.checkNow=Comprova-ho ara
 settings.access.checkSuccess=S\u2019ha comprovat que no hi ha estudiants membres de m\u00e9s d\u2019un dels grups seleccionats.
 settings.access.checkError=Els estudiants seg\u00fcents s\u00f3n membres de m\u00e9s d\u2019un dels grups seleccionats\:
@@ -1168,8 +1166,6 @@ option.pointsoverride=Ajusta les puntuacions individuals dels estudiants
 option.hidepoints=Amaga les puntuacions (nom\u00e9s comentaris)
 option.studentpreview=Amaga la r\u00fabrica a  l\u2019estudiant
 grading_rubric=R\u00fabrica per a qualificar
-asn.list.userubric=Aquesta activitat es pot qualificar fent \u00fas d\u2019una r\u00fabrica
-rubrics.use=Usa la r\u00fabrica
 
 # table toolbar common messages
 view.label=Mostra
@@ -1260,3 +1256,20 @@ ts.rem.err.userId=Cal estar autenticat per a afegir un registre al control dels
 ts.rem.err.empty=Cal que seleccioneu un control de temps
 ts.rem.err.submitterId=Cal que proporcioneu un assignmentId i una ref
 ts.rem.err.permission=No podeu modificat qui ha fet el lliurament
+
+#S2U-34
+peerAssessmentStudents=Els estudiants s'avaluen entre ells
+peerAssessmentGroups=Els grups s'avaluen entre ells
+peerassessment.group=Grup {0}
+option.selfreport=Permetre que els estudiants s'autoavalu\u00EFn la seva tasca
+option.selfreport.must=Els estudiants han de completar sencera la seva autoavaluaci\u00F3 per poder realitzar l'enviament
+option.selfreport.partialmust=Els estudiants han de completar almenys un criteri de la seva autoavaluaci\u00F3 per poder realitzar l'enviament
+option.selfreport.notamust=Els estudiants no tenen per qu\u00E8 completar l'autoavaluaci\u00F3 per poder realitzar l'enviament
+youmustrubric=Aquesta tasca \u00E9s autoavaluable. Pots autoavaluar la teva tasca amb la r\u00FAbrica abans d'enviar-la.
+youhavetorubric=Aquesta tasca \u00fas autoavaluable. Has d'autoavaluar la teva tasca amb la r\u00FAbrica abans d'enviar-la. Has de completar sencera la r\u00FAbrica per fer l'enviament.
+youhavetorubricone=Aquesta tasca \u00fas autoavaluable. Has d'autoavaluar la teva tasca amb la r\u00FAbrica abans d'enviar-la. Has de completar almenys un criteri de la r\u00FAbrica per fer l'enviament.
+studentrubric=Aquesta tasca \u00E9s autoavaluable. Pots revisar l'autoavaluaci\u00F3 de l'estudiant abans de puntuar la tasca.
+autoevaluation=Autoevaluaci\u00f3:
+instructor_grading=Correcci\u00f3 del profesor:
+reviewrubric=Aquesta tasca \u00E9s autoavaluable. Pot revisar la autoavaluaci\u00F3 abans d'enviar-la.
+reviewrubricreport=Aquesta \u00E9s la teva autoavaluaci\u00F3.

assignment/api/src/resources/assignment_de_DE.properties

@@ -805,7 +805,6 @@ peerAssessmentName=Peer Bewertung - Studenten bewerten sich untereinander
 noAdditionalOptionsName=Keine weiteren Aufgaben-Optionen
 additionalOptionsName=Weitere Aufgaben-Optionen
 peerAssessmentUse=Peer-Bewertungen verwenden
-peerassessment.warn.nogroup=(Peer-Bewertungen k\u00f6nnen nicht in Gruppen-Aufgaben verwendet werden. Um dies zu erm\u00f6glichen, stellen Sie in den Aufgaben-Optionen auf "individuelle Aufgabe" um.)
 peerassessment.periodfinishes=Bewertungszeitraum endet\:
 peerassessment.anonymousEvaluation=Anonyme Bewertung
 peerassessment.studentViewReviews=Studierenden erlauben, die Peer-Bewertungen ihrer Einreichungen zu sehen
@@ -857,7 +856,6 @@ settings.access.selectedGroupsGoneNoGroups=Hinweis - Die vormals ausgew\u00e4hlt
 settings.access.selectedGroupsGoneOtherGroupsPresent=Hinweis - Die vormals ausgew\u00e4hlten Gruppen existieren nicht mehr. "{0}" wurde als Einstellung f\u00fcr diese Aufgabe gew\u00e4hlt. Sie k\u00f6nnen diese Aufgabe entweder individuell f\u00fcr die ganze Seite erstellen oder abbrechen und eine andere Gruppe ausw\u00e4hlen.
 settings.access.selectGroups=W\u00e4hlen Sie eine oder mehrere Gruppen aus
 settings.access.noMembersInCommon=Gruppenaufgaben verlangen, dass die gew\u00e4hlten Gruppen keine gemeinsamen Teilnehmer haben.
-settings.access.noGroupAssignmentPeerInUse=(Diese Einstellung ist nicht verf\u00fcgbar, da Peer-Bewertung ausgew\u00e4hlt wurde.)
 settings.access.checkNow=Jetzt \u00fcberpr\u00fcfen
 settings.access.checkSuccess=Erfolg\! Es sind keine Studierenden in mehr als einer der gew\u00e4hlten Gruppen.
 settings.access.checkError=Die folgenden Studierenden sind in mehr als einer der gew\u00e4htlen Gruppen Mitglieder\:
@@ -887,8 +885,6 @@ option.pointsoverride=Individuelle Bewertung der Studierenden anpassen
 option.hidepoints=Punktebewertung ausblenden(nur Kommentar anzeigen)
 option.studentpreview=Kategorie vor dem Studierenden verbergen
 grading_rubric=Rubrik der Benotung
-asn.list.userubric=Diese Aufgabe kann mit einer Rubrik benotet werden
-rubrics.use=Rubrik verwenden
 view.label=Anzeigen
 gen.viewing.phrase=Zeige {0} - {1} von {2} Elementen
 gen.show=Zeige {0} Elemente...