Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

S2U-31 Assignments: Grades in the main view of assignments that have already been evaluated - MASTER #11963

Merged
merged 1 commit into from
Oct 3, 2023
Merged

S2U-31 Assignments: Grades in the main view of assignments that have already been evaluated - MASTER #11963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion assignment/api/src/resources/assignment.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ gen.hideduedate = Hide due date from students
grad2 = Grade entered ''{0}'' is larger than the maximum grade allowed ''{1}''. Please make a correction or click the original button again to save the entered value ''{0}''.

grad3 = Graded

grade.title=Grades
gradingsub.belisthe = Below is the submission from a student. You can insert comments into this text by clicking in the box, then type your comments. Comments surrounded by double curly braces, {{<span class="highlight">like this</span>}}, will appear red to the student.
gradingsub.nosubmittedtext = There is no student submitted text.
gradingsub.opecliass = Open, click to close assignment instruction
Expand Down Expand Up @@ -496,6 +496,7 @@ theisnostudent = There is no student.
thiasshas = This assignment has no instructions. Please make a correction or click the original button to proceed.

ungra = Ungraded
unchecked=Unchecked
fail = Fail
viewassig.datcre = Date created
viewassig.datmod = Date modified
Expand Down
3 changes: 2 additions & 1 deletion assignment/api/src/resources/assignment_ca.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ gen.hideduedate=Amaga als estudiants la data de lliurament
grad2=La qualificaci\u00f3 introdu\u00efda \u2019{0}\u2019 \u00e9s m\u00e9s gran que la m\u00e0xima permesa \u2019{1}\u2019. Corregiu-ho o feu clic altre cop sobre el bot\u00f3 per desar la qualificaci\u00f3 introdu\u00efda \u2019{0}\u2019.

grad3=Qualificada

grade.title=Qualificacions
gradingsub.belisthe=A continuaci\u00f3 hi ha el lliurament d\u2019un estudiant. Fent clic sobre el quadre es poden introduir comentaris. Els comentaris inclosos entre doble clau, {{<span class\="highlight">exemple</span>}}, apareixeran en color vermell.
gradingsub.nosubmittedtext=L\u2019alumne no ha introdu\u00eft cap text.
gradingsub.opecliass=Obriu, i feu clic per tancar la instrucci\u00f3 de l\u2019activitat
Expand Down Expand Up @@ -495,6 +495,7 @@ theisnostudent=No hi ha estudiant.
thiasshas=Aquesta activitat no t\u00e9 instruccions. Corregiu-ho o feu clic sobre el bot\u00f3 per continuar.

ungra=Sense qualificar
unchecked=Desmarcat
fail=Susp\u00e9s
viewassig.datcre=Data de creaci\u00f3
viewassig.datmod=Data de la modificaci\u00f3
Expand Down
3 changes: 2 additions & 1 deletion assignment/api/src/resources/assignment_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ gen.hideduedate=Ocultar fecha de entrega a estudiantes
grad2=La calificaci\u00f3n introducida, ''{0}'', es mayor que la puntuaci\u00f3n m\u00e1xima permitida, ''{1}''. Realice la correcci\u00f3n o, de lo contrario, vuelva a pulsar el bot\u00f3n para confirmar el valor introducido, ''{0}''.

grad3=Corregida

grade.title=Calificaciones
gradingsub.belisthe=A continuaci\u00f3n se encuentra el env\u00edo. Puede insertar comentarios pulsando en el \u00e1rea de texto y simplemente escribi\u00e9ndolos. Los comentarios delimitados por una doble llave, {{<span class\="highlight">ejemplo</span>}}, se mostrar\u00e1n en rojo.
gradingsub.nosubmittedtext=No se ha enviado texto.
gradingsub.opecliass=Abrir, hacer clic para cerrar la tarea
Expand Down Expand Up @@ -490,6 +490,7 @@ theisnostudent=No hay estudiantes.
thiasshas=Esta tarea no tiene instrucciones. \u00bfEst\u00e1 seguro?

ungra=Sin calificar
unchecked=Desmarcado
fail=Suspendido
viewassig.datcre=Fecha de creaci\u00f3n
viewassig.datmod=Fecha de modificaci\u00f3n
Expand Down
2 changes: 2 additions & 0 deletions assignment/api/src/resources/assignment_eu.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ gen.hideduedate=Ezkutatu emateko data ikasleei
grad2=Idatzi duzun "{0}" kalifikazioak gainditu egiten du "{1}" kalifikazio maximoa. Alda ezazu edo egin klik berriz jatorrizko botoian idatzi duzun "{0}" balioa gordetzeko..

grad3=Kalifikatu da
grade.title=Kalifikazioak

gradingsub.belisthe=Ikasle baten bidalketa duzu behean. Testuan iruzkinak txertatzeko modua izanen duzu koadroan klik eginez eta barnean idatziz, Parentesi karratuen artean azalduko dira iruzkinak {{honela}}, eta ikasleari gorriz azalduko zaizkio.
gradingsub.nosubmittedtext=Ez da ezein ikasleren testurik
Expand Down Expand Up @@ -495,6 +496,7 @@ theisnostudent=Ez dago ikaslerik.
thiasshas=Zeregin honetan ez duzu jarraibiderik idatzi. Gehitu testua edo aurrera egin Bidali botoia sakatuz.

ungra=Kalifikatu gabe dago
unchecked=Markatu gabe
fail=Ez du gainditu
viewassig.datcre=Noiz sortua\:
viewassig.datmod=Noiz aldatua\:
Expand Down
27 changes: 27 additions & 0 deletions assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@
#end
</a>
</th>
#if ($allowAddAssignment == false)
<th id="grade" scope="col">
$tlang.getString("grade.title")
</th>
#end
<th id="openDate" scope="col" class="d-none d-sm-table-cell">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=opendate")'; return false;" title="$tlang.getString("listassig.sorbyope")">
$tlang.getString("newassig.opedat")
Expand Down Expand Up @@ -537,6 +542,26 @@
#end
#end
</td>
#if ($allowAddAssignment == false)
<td headers="grade">
#if ($submission.Graded && ($submission.GradeReleased || $submission.Returned))
#if ((($service.getSubmissionStatus($submission.Id, false) == $tlang.getString("gen.returned")) || ($service.getSubmissionStatus($submission.Id, false) == $tlang.getString("gen.pending_resubmit"))) && $submission.grade)
#if ($service.getGradeForSubmitter($submission, $user.getId()).equals(""))
<span>$tlang.getString("unchecked")</span>
<span>$service.getGradeForSubmitter($submission, $user.getId())</span>
#else
<span>$service.getGradeForSubmitter($submission, $user.getId())#if ($assignment.TypeOfGrade.ordinal() == 3)/$service.getMaxPointGradeDisplay($assignment.ScaleFactor, $assignment.MaxGradePoint)#end</span>
#end
#else
#if ($service.getGradeForSubmitter($submission, $user.getId()).equals("") || ($service.getSubmissionStatus($submission.Id) == $tlang.getString("gen.notsta")))
<span>-#if ($assignment.TypeOfGrade.ordinal() == 3)/$service.getMaxPointGradeDisplay($assignment.ScaleFactor, $assignment.MaxGradePoint)#end</span>
#else
<span>$service.getGradeForSubmitter($submission, $user.getId())#if ($assignment.TypeOfGrade.ordinal() == 3)/$service.getMaxPointGradeDisplay($assignment.ScaleFactor, $assignment.MaxGradePoint)#end</span>
#end
#end
#end
</td>
#end
<td headers="openDate" class="d-none d-sm-table-cell">
$!service.getUsersLocalDateTimeString($!assignment.OpenDate)
</td>
Expand Down Expand Up @@ -695,6 +720,7 @@
$tlang.getString("peerassessment.submissionReq")
#end
</td>
<td>-</td>
<!-- open col -->
<td>
$!service.getUsersLocalDateTimeString($!assignment.CloseDate)
Expand Down Expand Up @@ -756,6 +782,7 @@
$tlang.getString("peerassessment.notStarted")
#end
</td>
<td>-</td>
<!-- open col -->
<td>
</td>
Expand Down
Loading